Merge branch 'refactor' into 'master'

Refactor

See merge request !1

1 files changed, 24 insertions, 0 deletions

diff --git a/wikibania/api/Query.py b/wikibania/api/Query.py
new file mode 100644
index 0000000..0928478
--- /dev/null
+++ b/wikibania/api/Query.py
@@ -0,0 +1,24 @@
+import urllib.parse
+import urllib.request
+import json
+
+
+class Query:
+    def __init__(self, base_url="", params=None, encoding="utf8"):
+        if params is None:
+            params = {}
+
+        self.base_url = base_url
+        self.params = params
+        self.encoding = encoding
+
+    def fetch_raw_result(self):
+        post_query = urllib.parse.urlencode(self.params)
+        post_query = post_query.encode(self.encoding)
+        document = urllib.request.urlopen(self.base_url, post_query)
+        return document.read().decode(self.encoding)
+
+
+class JSONQuery(Query):
+    def fetch_result(self):
+        return json.loads(self.fetch_raw_result())