Merge pull request #7 from marnikow/master

Added the option to disable pagination and added url paramaters

Author: David Moreau Simard

cachetclient/cachet.py

@@ -117,7 +117,11 @@ def get(self, id=None, **kwargs):
         https://docs.cachethq.io/docs/get-a-component
         """
         if id is not None:
-            return self._get('components/%s' % id)
+            return self._get('components/%s' % id, data=kwargs)
+        elif 'params' in kwargs:
+            data = dict(kwargs)
+            params = data.pop('params')
+            return self._get('components', data=data, params=params)
         else:
             return self._get('components', data=kwargs)
 
@@ -166,6 +170,10 @@ def get(self, id=None, **kwargs):
         """
         if id is not None:
             return self._get('components/groups/%s' % id, data=kwargs)
+        elif 'params' in kwargs:
+            data = dict(kwargs)
+            params = data.pop('params')
+            return self._get('components/groups', data=data, params=params)
         else:
             return self._get('components/groups', data=kwargs)
 
@@ -211,6 +219,10 @@ def get(self, id=None, **kwargs):
         """
         if id is not None:
             return self._get('incidents/%s' % id, data=kwargs)
+        elif 'params' in kwargs:
+            data = dict(kwargs)
+            params = data.pop('params')
+            return self._get('incidents', data=data, params=params)
         else:
             return self._get('incidents', data=kwargs)
 

cachetclient/client.py

@@ -31,6 +31,7 @@ def __init__(self, **kwargs):
         self.api_token = kwargs.get('api_token', None)
         self.timeout = kwargs.get('timeout', None)
         self.verify = kwargs.get('verify', None)
+        self.pagination = kwargs.get('pagination', False)
 
         self.http = requests.Session()
 
@@ -61,6 +62,15 @@ def _request(self, url, method, **kwargs):
         except ValueError:
             body = None
 
+        if not self.pagination:
+            if body is not None and 'meta' in body and 'pagination' in body['meta']:
+                page_info = body['meta']['pagination']
+                if page_info['total'] > page_info['count']:
+                    # There are items not displayed in our result
+                    kwargs.setdefault('params', kwargs.get('params', {}))
+                    kwargs['params']['per_page'] = page_info['total']
+                    return self._request(url, method, **kwargs)
+
         return resp, body
 
     def _delete(self, path, **kwargs):
@@ -70,7 +80,7 @@ def _delete(self, path, **kwargs):
 
     def _get(self, path, **kwargs):
         url = "%s/%s" % (self.endpoint, path)
-        reponse, data = self._request(url, 'GET', **kwargs)
+        response, data = self._request(url, 'GET', **kwargs)
         return json.dumps(data, indent=2)
 
     def _post(self, path, **kwargs):