From 3e79d80267ed0ac4c57a3c06270002a331163eec Mon Sep 17 00:00:00 2001
From: Offray Luna <offray.luna@mutabit.com>
Date: Wed, 15 Sep 2021 13:07:48 -0500
Subject: [PATCH] Fixing API keys loading.

---
 Datanalitica.package/TwitterAPI.class/class/loadKeys.st  | 2 +-
 .../TwitterAPI.class/instance/bearerToken.st             | 2 +-
 Datanalitica.package/TwitterAPI.class/instance/keys.st   | 2 +-
 .../TwitterAPI.class/instance/loadKeys.st                | 2 +-
 .../TwitterAPI.class/instance/options..st                | 3 +++
 .../TwitterAPI.class/instance/options.st                 | 9 +++++++++
 Datanalitica.package/TwitterAPI.class/properties.json    | 4 +++-
 7 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 Datanalitica.package/TwitterAPI.class/instance/options..st
 create mode 100644 Datanalitica.package/TwitterAPI.class/instance/options.st

diff --git a/Datanalitica.package/TwitterAPI.class/class/loadKeys.st b/Datanalitica.package/TwitterAPI.class/class/loadKeys.st
index fd5fcbb..b14572b 100644
--- a/Datanalitica.package/TwitterAPI.class/class/loadKeys.st
+++ b/Datanalitica.package/TwitterAPI.class/class/loadKeys.st
@@ -1,4 +1,4 @@
 accessing
 loadKeys
 	keys := STONJSON fromString: self apiKeysFile contents.
-	^ self
\ No newline at end of file
+	^ keys
\ No newline at end of file
diff --git a/Datanalitica.package/TwitterAPI.class/instance/bearerToken.st b/Datanalitica.package/TwitterAPI.class/instance/bearerToken.st
index 6c8427f..4002900 100644
--- a/Datanalitica.package/TwitterAPI.class/instance/bearerToken.st
+++ b/Datanalitica.package/TwitterAPI.class/instance/bearerToken.st
@@ -1,3 +1,3 @@
 accessing
 bearerToken
-	^ self keys at: 'Bearer Token'
\ No newline at end of file
+	^ self class keys at: 'Bearer Token'
\ No newline at end of file
diff --git a/Datanalitica.package/TwitterAPI.class/instance/keys.st b/Datanalitica.package/TwitterAPI.class/instance/keys.st
index 03ed198..4289fa5 100644
--- a/Datanalitica.package/TwitterAPI.class/instance/keys.st
+++ b/Datanalitica.package/TwitterAPI.class/instance/keys.st
@@ -1,3 +1,3 @@
 accessing
 keys
-	^ keys ifNil: [ keys := Dictionary new]
\ No newline at end of file
+	^ keys ifNil: [ keys := self class loadKeys]
\ No newline at end of file
diff --git a/Datanalitica.package/TwitterAPI.class/instance/loadKeys.st b/Datanalitica.package/TwitterAPI.class/instance/loadKeys.st
index 68e3e7d..808d5f2 100644
--- a/Datanalitica.package/TwitterAPI.class/instance/loadKeys.st
+++ b/Datanalitica.package/TwitterAPI.class/instance/loadKeys.st
@@ -1,4 +1,4 @@
 accessing
 loadKeys
 	keys := self class loadKeys.
-	^ keys
\ No newline at end of file
+	^ self
\ No newline at end of file
diff --git a/Datanalitica.package/TwitterAPI.class/instance/options..st b/Datanalitica.package/TwitterAPI.class/instance/options..st
new file mode 100644
index 0000000..f7b81f6
--- /dev/null
+++ b/Datanalitica.package/TwitterAPI.class/instance/options..st
@@ -0,0 +1,3 @@
+accessing
+options: aDictionary
+	options := aDictionary
\ No newline at end of file
diff --git a/Datanalitica.package/TwitterAPI.class/instance/options.st b/Datanalitica.package/TwitterAPI.class/instance/options.st
new file mode 100644
index 0000000..ce9e2ab
--- /dev/null
+++ b/Datanalitica.package/TwitterAPI.class/instance/options.st
@@ -0,0 +1,9 @@
+accessing
+options
+	"Return the configuration options or define a default if they are not given"
+	^ options ifNil: [ 
+		options := Dictionary new
+			at: 'caching' put: true;
+			at: 'pagesPerRequest' put: '1';
+			yourself
+	  ]
\ No newline at end of file
diff --git a/Datanalitica.package/TwitterAPI.class/properties.json b/Datanalitica.package/TwitterAPI.class/properties.json
index 11ac87e..aea6015 100644
--- a/Datanalitica.package/TwitterAPI.class/properties.json
+++ b/Datanalitica.package/TwitterAPI.class/properties.json
@@ -9,7 +9,9 @@
 		"keys"
 	],
 	"instvars" : [
-		"storage"
+		"storage",
+		"options",
+		"keys"
 	],
 	"name" : "TwitterAPI",
 	"type" : "normal"