Merge pull request #3 from BradleyShaw/master

Update to work with the new API

Author: Yousef Sultan

README.md

@@ -4,19 +4,18 @@ This is obviously still in development.
 
 ## Example:
 ```python
-import codebottle
+from codebottle import CodeBottle
 
-#Results of a search
-search = codebottle.search(keywords="java").results
+cb = CodeBottle()
 
-#Get a snippet
-snippet = codebottle.get(id="373dcc67").data
+# Results of a search
+search = cb.snippets.get(keywords='java').data
 
-#Browse
-browse = codebottle.browse(limit=10).results
+# Get a snippet
+snippet = cb.snippets.get('91f98993c8').data
 
-#Verify secure
-secure = codebottle.verifysecure(secure_token="Some type of token here")
+# Get newest snippets
+browse = cb.snippets.new().data
 ```
 
 ## Installing

codebottle/__init__.py

@@ -1,41 +1,2 @@
-import requests
-
-api_version = "v1"
-api_url = "https://codebottle.io/api/{0}".format(api_version)
-
-api_search_url = "{0}/search.php".format(api_url)
-api_get_snippet_url = "{0}/get.php".format(api_url)
-api_browse_url = "{0}/browse.php".format(api_url)
-api_verifysecure_url = "{0}/verifysecure.php".format(api_url)
-
-
-class CodebottleError(Exception):
-	"""Exception to represent a error sent from the API"""
-	pass
-
-class Result(object):
-	"""A class with attributes of a codebottle API result"""
-	def __init__(self, r):
-		self.json = r.json()
-		if self.json["error"]:
-			raise CodebottleError(self.json["error"])
-
-		for k, v in self.json.items():
-			setattr(self, k, v)
-
-#Functions
-def search(**kwargs):
-	result = requests.get(api_search_url, params=kwargs)
-	return Result(result)
-
-def get(**kwargs):
-	result = requests.get(api_get_snippet_url, params=kwargs)
-	return Result(result)
-
-def browse(**kwargs):
-	result = requests.get(api_browse_url, params=kwargs)
-	return Result(result)
-
-def verifysecure(**kwargs):
-	result = requests.get(api_verifysecure_url, params=kwargs)
-	return Result(result)
+from .client import CodeBottle
+from .exceptions import CodebottleError

codebottle/auth.py

@@ -0,0 +1,12 @@
+from requests.auth import AuthBase
+
+
+class Token(AuthBase):
+
+    def __init__(self, token):
+        self.token = token
+
+    def __call__(self, r):
+        if self.token:
+            r.headers['Authorization'] = 'Bearer {0}'.format(self.token)
+        return r

codebottle/client.py

@@ -0,0 +1,66 @@
+import requests
+
+from .exceptions import CodebottleError
+from .auth import Token
+
+
+class Result(object):
+    '''A class with attributes of a codebottle API result'''
+    def __init__(self, r):
+        self.json = r.json()
+        if self.json.get('error'):
+            raise CodebottleError(self.json['error'])
+
+        for k, v in self.json.items():
+            setattr(self, k, v)
+
+
+class CodeBottle(object):
+
+    def __init__(self, token=None):
+        self.api_url = 'https://api.codebottle.io'
+        self.api_accept = 'application/vnd.codebottle.v1+json'
+        self.token = token
+        self.snippets = self.Snippets(self)
+
+    def _build_url(self, endpoint, *args):
+        url = '{0}/{1}'.format(self.api_url, endpoint)
+        if len(args) > 0:
+            args = [str(a) for a in args]
+            url = '{0}/{1}'.format(url, '/'.join(args))
+        return url
+
+    def _get(self, endpoint, *args, **kwargs):
+        url = self._build_url(endpoint, *args)
+        r = requests.get(url, params=kwargs, auth=Token(self.token),
+                         headers={'Accept': self.api_accept})
+        return Result(r)
+
+    def _post(self, endpoint, *args, **kwargs):
+        url = self._build_url(endpoint, *args)
+        r = requests.post(url, data=kwargs, auth=Token(self.token),
+                          headers={'Accept': self.api_accept})
+        return Result(r)
+
+    def languages(self, *args):
+        return self._get('languages', *args)
+
+    def categories(self, *args):
+        return self._get('categories', *args)
+
+    class Snippets(object):
+
+        def __init__(self, parent):
+            self.parent = parent
+
+        def get(self, *args, **kwargs):
+            return self.parent._get('snippets', *args, **kwargs)
+
+        def new(self):
+            return self.get('new')
+
+        def create(self, **kwargs):
+            return self.parent._post('snippets', **kwargs)
+
+        def vote(self, *args, **kwargs):
+            return self.parent._post('snippets', *args, **kwargs)

codebottle/exceptions.py

@@ -0,0 +1,3 @@
+class CodebottleError(Exception):
+    '''Exception to represent a error sent from the API'''
+    pass

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 setup(name='codebottle',
-      version='0.0.1',
+      version='0.1.0',
       description="A Python library to interact with CodeBottle's API",
       url='https://github.com/codebottle-io/codebottle-python',
       author='Luke J.',

tests/travis.py

@@ -1,13 +1,15 @@
-import codebottle
+from codebottle import CodeBottle
 
-#Results of a search
-search = codebottle.search(keywords="java").results
+cb = CodeBottle()
 
-#Get a snippet
-snippet = codebottle.get(id="373dcc67").data
+# Results of a search
+search = cb.snippets.get(keywords='java').data
 
-#Browse
-browse = codebottle.browse(limit=10).results
+# Get a snippet
+snippet = cb.snippets.get('91f98993c8').data
+
+# Browse
+browse = cb.snippets.new().data
 
 print(search)
 print(snippet)