Merge pull request #14 from calind/master

Better error handling and bugfixes

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='zipa',
-      version='0.1.3',
+      version='0.1.4',
       platforms='any',
       description='General purpose REST API client',
       author='Vlad Temian & Calin Don',

zipa/resource.py

@@ -1,7 +1,8 @@
 import json
-
 import requests
 
+from requests.exceptions import HTTPError
+
 from .entity import Entity
 from .utils import dict_merge
 
@@ -19,7 +20,8 @@ def __init__(self, url=None, name=None, params=None, config=None):
             'secure': True,
             'prefix': '/',
             'serializer': 'json',
-            'verify': True
+            'verify': True,
+            'append_slash': False
         }
 
         config = dict_merge(_config_defaults, _config)
@@ -39,6 +41,9 @@ def _get_url(self):
         if self.config.use_extensions:
             url += '.json'
 
+        if self.config.append_slash and not url.endswith('/'):
+            url += '/'
+
         return url
 
     def _expand_url(self, part):
@@ -53,24 +58,55 @@ def _prepare_data(self, **kwargs):
         else:
             return kwargs
 
+    def _prepare_entity(self, response):
+        try:
+            json = response.json()
+        except:
+            json = {}
+
+        http_error_msg = ''
+
+        if 400 <= response.status_code < 500:
+            http_error_msg = '%s Client Error: %s' % (response.status_code,
+                                                      response.reason)
+
+        elif 500 <= response.status_code < 600:
+            http_error_msg = '%s Server Error: %s' % (response.status_code,
+                                                      response.reason)
+
+        if http_error_msg:
+            raise HTTPError(http_error_msg, json, response=response)
+
+        return Entity(json)
+
     def create(self, **kwargs):
         data = self._prepare_data(**kwargs)
-        response = requests.put(self.url, data=data,
-                                auth=self.config['auth'],
-                                verify=self.config['verify'])
-        return Entity(response.json())
+        headers = {'content-type': 'application/json'}
+        response = requests.post(self.url, data=data,
+                                 auth=self.config['auth'],
+                                 verify=self.config['verify'],
+                                 headers=headers)
+
+        entity = self._prepare_entity(response)
+        return entity
 
     def update(self, **kwargs):
         data = self._prepare_data(**kwargs)
-        response = requests.post(self.url, data=data,
-                                 auth=self.config['auth'],
-                                 verify=self.config['verify'])
-        return Entity(response.json())
+        headers = {'content-type': 'application/json'}
+        response = requests.put(self.url, data=data,
+                                auth=self.config['auth'],
+                                verify=self.config['verify'],
+                                headers=headers)
+
+        entity = self._prepare_entity(response)
+        return entity
 
     def delete(self, **kwargs):
-        requests.delete(self.url, params=kwargs,
-                        auth=self.config['auth'],
-                        verify=self.config['verify'])
+        response = requests.delete(self.url, params=kwargs,
+                                   auth=self.config['auth'],
+                                   verify=self.config['verify'])
+        entity = response._prepare_entity(response)
+        return entity
 
     def __getattr__(self, name):
         if name == 'url':
@@ -108,12 +144,8 @@ def __call__(self, **kwargs):
         response = requests.get(self.url, params=kwargs,
                                 auth=self.config['auth'],
                                 verify=self.config['verify'])
-
-        content = response.json()
-        if isinstance(content, list):
-            return [Entity(item) for item in content]
-
-        return Entity(content)
+        entity = self._prepare_entity(response)
+        return entity
 
     def __str__(self):
         return repr(self)