Add some more methods

Author: rossjrw

README.md

@@ -10,7 +10,8 @@ Create a wrapper for a given wiki and API version:
 ```python
 from scuttle import scuttle
 
-wiki = scuttle('en', 1)
+API_KEY = "eyJ0eXAiOiJKV1QiLC(...)" # Personal Access Token
+wiki = scuttle('en', API_KEY, 1)
 ```
 
 ## Testing

scuttle/versions/base.py

@@ -10,10 +10,10 @@ def __init__(self, domain, api_key):
         self.api_key = api_key
 
     def request(self, namespace, value=None):
-        response = requests.get("{}/{}/{}".format(
-            self.endpoint,
-            namespace,
-            "" if value is None else value),
+        response = requests.get(
+            "{}/{}".format(
+                self.endpoint,
+                namespace.format(value)),
             headers={"Authorization": "Bearer {}".format(self.api_key)})
+        print(response.text)
         return response.json()
-

scuttle/versions/v1.py

@@ -10,3 +10,24 @@ class Api(BaseApi):
 
     def wikis(self):
         return self.request("wikis")
+
+    def wiki(self):
+        return self.request("wiki")
+
+    def all_pages(self):
+        return self.request("page")
+
+    def page_by_id(self, page_id):
+        return self.request("page/{}", page_id)
+
+    def page_by_slug(self, page_slug):
+        return self.request("page/slug/{}", page_slug)
+
+    def page_revisions(self, page_id):
+        return self.request("page/{}/revisions", page_id)
+
+    def get_revision(self, revision_id):
+        return self.request("revision/{}", revision_id)
+
+    def get_full_revision(self, revision_id):
+        return self.request("revision/{}/full", revision_id)

test/test_api.py

@@ -14,15 +14,32 @@ def test_basic():
 
 def test_get_nonexistent_version():
     with pytest.raises(ModuleNotFoundError) as e:
-        wiki = scuttle.scuttle('en', None, 0)
+        scuttle.scuttle('en', None, 0)
     assert str(e.value) == "API version 0 does not exist."
 
 def test_get_default_version():
     wiki = scuttle.scuttle('en', None)
     assert wiki.version == 1
     assert isinstance(wiki.api, scuttle.versions.v1.Api)
 
-def test_get_wikis():
+def test_wiki():
     wiki = scuttle.scuttle('en', API_KEY, 1)
-    print(wiki.wikis())
-    assert False
+    assert wiki.wikis()[0]['subdomain'] == "admin"
+    assert wiki.wiki()['subdomain'] == "en"
+
+def test_page():
+    wiki = scuttle.scuttle('en', API_KEY, 1)
+    pages = wiki.all_pages()
+    assert set(pages[0].keys()) == {'id', 'slug', 'wd_page_id'}
+    page_id = pages[0]['id']
+    assert wiki.page_by_id(page_id)['id'] == page_id
+    assert wiki.page_by_slug("scp-1111")['metadata']['wikidot_metadata']['fullname'] == "scp-1111"
+
+def test_revisions():
+    wiki = scuttle.scuttle('en', API_KEY, 1)
+    page_id = wiki.all_pages()[0]['id']
+    revision_id = wiki.page_revisions(page_id)[0]['id']
+    assert wiki.get_revision(revision_id)['page_id'] == page_id
+    full_revision = wiki.get_full_revision(revision_id)
+    assert full_revision['page_id'] == page_id
+    assert 'content' in full_revision