0.1.4 Fix BadRequest error on client.list_engines

Author: JasonStoltz

README.rst

@@ -21,6 +21,11 @@ You can also download the project source and run::
 
     $ python setup.py install
 
+Running Tests
+============
+
+    $ python setup.py test
+
 Dependencies
 ============
 Swiftype App Search supports Python 2.7 and Python 3.3+. It depends on requests and PyJWT.
@@ -44,7 +49,7 @@ Index document
 .. code-block:: python
 
     >>> engine_name = 'favorite-videos'
-    >>> documents = {
+    >>> document = {
           'id': 'INscMGmhmX4',
           'url': 'https://www.youtube.com/watch?v=INscMGmhmX4',
           'title': 'The Original Grumpy Cat',
@@ -101,8 +106,18 @@ List Engines
 
 .. code-block:: python
 
-    >>> client.list_engines()
-    [{'name': 'favorite-videos'}, {'name': 'another-engine'}]
+    >>> client.list_engines(current=1, size=20)
+    {
+        'meta': {
+            'page': {
+            'current': 1,
+            'total_pages': 1,
+            'total_results': 2,
+            'size': 20
+            }
+        },
+        'results': [{'name': 'favorite-videos'}, {'name': 'another-engine'}]
+    }
 
 Get an Engine
 -------------

setup.py

@@ -40,12 +40,10 @@
         'requests',
         'PyJWT'
     ],
-    extras_require={
-        'test': [
-            'mock',
-            'requests_mock',
-            'future'
-        ],
-    },
+    tests_require=[
+        'mock',
+        'requests_mock',
+        'future'
+    ],
     test_suite='tests'
 )

swiftype_app_search/__version__.py

@@ -1,6 +1,6 @@
 __title__ = 'swiftype_app_search'
 __description__ = 'An API client for Swiftype App Search'
 __url__ = 'https://github.com/swiftype/swiftype-app-search-python'
-__version__ = '0.1.3'
+__version__ = '0.1.4'
 __author__ = 'Swiftype'
 __author_email__ = 'eng@swiftype.com'

swiftype_app_search/client.py

@@ -88,7 +88,7 @@ def list_engines(self, current=1, size=20):
         name of the engine.
         """
         data = { 'page': { 'current': current, 'size': size } }
-        return self.swiftype_session.request('get', 'engines', data=data)
+        return self.swiftype_session.request('get', 'engines', json=data)
 
     def get_engine(self, engine_name):
         """

tests/test_client.py

@@ -4,7 +4,6 @@
 from swiftype_app_search import Client
 from swiftype_app_search.exceptions import InvalidDocument
 
-
 class TestClient(TestCase):
 
     def setUp(self):
@@ -78,6 +77,39 @@ def test_destroy_documents(self):
             response = self.client.destroy_documents(self.engine_name, [id])
             self.assertEqual(response, expected_return)
 
+    def test_list_engines(self):
+        expected_return = [
+            { 'name': 'myawesomeengine' }
+        ]
+
+        with requests_mock.Mocker() as m:
+            url = "{}/{}".format(self.client.swiftype_session.base_url, 'engines')
+            m.register_uri('GET',
+                url,
+                additional_matcher=lambda x: x.text == '{"page": {"current": 1, "size": 20}}',
+                json=expected_return,
+                status_code=200
+            )
+            response = self.client.list_engines()
+            self.assertEqual(response, expected_return)
+
+    def test_list_engines_with_paging(self):
+        expected_return = [
+            {'name': 'myawesomeengine'}
+        ]
+
+        with requests_mock.Mocker() as m:
+            url = "{}/{}".format(self.client.swiftype_session.base_url, 'engines')
+            m.register_uri(
+                'GET',
+                url,
+                additional_matcher=lambda x: x.text == '{"page": {"current": 10, "size": 2}}',
+                json=expected_return,
+                status_code=200
+            )
+            response = self.client.list_engines(current=10, size=2)
+            self.assertEqual(response, expected_return)
+
     def test_get_engine(self):
         engine_name = 'myawesomeengine'
         expected_return = [