cli2 3.3.36__tar.gz → 3.3.37__tar.gz

{cli2-3.3.36/cli2.egg-info → cli2-3.3.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cli2
-Version: 3.3.36
+Version: 3.3.37
 Summary: image:: https://yourlabs.io/oss/cli2/badges/master/pipeline.svg
 Home-page: https://yourlabs.io/oss/cli2
 Author: James Pic

{cli2-3.3.36 → cli2-3.3.37}/cli2/client.py

@@ -708,6 +708,8 @@ class ModelMetaclass(type):
         cls = super().__new__(cls, name, bases, attributes)
         client = getattr(cls, 'client', None)
         if client:
+            if not cls.paginator:
+                cls.paginator = client.paginator
             return cls
 
         client_class = getattr(cls, '_client_class', None)
@@ -776,7 +778,7 @@ class Model(metaclass=ModelMetaclass):
 
         Object URL based on :py:attr:`url_detail` and :py:attr:`id_field`.
     """
-    paginator = Paginator
+    paginator = None
     model_command = ModelCommand
     model_group = ModelGroup
     url_list = None

{cli2-3.3.36 → cli2-3.3.37}/cli2/test_client.py

@@ -389,6 +389,21 @@ async def test_pagination(httpx_mock):
     ]
 
 
+def test_paginator(client_class):
+    class Client(client_class):
+        paginator = 'foo'
+
+    class Model1(Client.Model):
+        pass
+
+    class Model2(Client.Model):
+        paginator = 'bar'
+
+    client = Client()
+    assert client.Model1.paginator == 'foo'
+    assert client.Model2.paginator == 'bar'
+
+
 @pytest.mark.asyncio
 async def test_pagination_initialize(httpx_mock):
     httpx_mock.add_response(url='http://lol/?page=1', json=dict(
@@ -515,6 +530,34 @@ async def test_pagination_patterns(httpx_mock):
     assert paginator.per_page == 1
     assert paginator.pagination_parameters(2) == dict(offset=1, limit=1)
 
+    class Key(Client.Model):
+        url_list = '/key'
+
+        @classmethod
+        def pagination_initialize(cls, paginator, data):
+            paginator.next_page = data['next_page']
+            paginator.total_pages = data['total']
+
+        @classmethod
+        def pagination_parameters(cls, paginator, page_number):
+            if page_number > 1:
+                return dict(next_page=paginator.next_page)
+
+    httpx_mock.add_response(
+        url='http://lol/key',
+        json=dict(total=2, items=[dict(a=1)], next_page='aoeu'),
+    )
+    httpx_mock.add_response(
+        url='http://lol/key?next_page=aoeu',
+        json=dict(total=2, items=[dict(a=2)]),
+    )
+
+    client = Client(base_url='http://lol')
+    items = []
+    async for item in client.Key.find():
+        items.append(item.data['a'])
+    assert items == [1, 2]
+
 
 @pytest.mark.asyncio
 async def test_pagination_reverse(httpx_mock):

{cli2-3.3.36 → cli2-3.3.37/cli2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cli2
-Version: 3.3.36
+Version: 3.3.37
 Summary: image:: https://yourlabs.io/oss/cli2/badges/master/pipeline.svg
 Home-page: https://yourlabs.io/oss/cli2
 Author: James Pic

{cli2-3.3.36 → cli2-3.3.37}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 
 setup(
     name='cli2',
-    version='3.3.36',
+    version='3.3.37',
     setup_requires='setupmeta',
     install_requires=[
         'docstring_parser',