collective.tiles.carousel 1.0.3__tar.gz → 1.0.4__tar.gz

{collective.tiles.carousel-1.0.3 → collective_tiles_carousel-1.0.4}/CHANGES.rst

@@ -2,6 +2,16 @@ Changelog
 =========
 
 
+1.0.4 (2024-05-02)
+------------------
+
+- Fix ``limit``.
+  [petschki]
+
+- code cleanup.
+  [petschki]
+
+
 1.0.3 (2023-11-03)
 ------------------
 

{collective.tiles.carousel-1.0.3 → collective_tiles_carousel-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: collective.tiles.carousel
-Version: 1.0.3
+Version: 1.0.4
 Summary: Slider for plone.app.mosaic based on Bootstrap 5
 Home-page: https://github.com/collective/collective.tiles.carousel
 Author: Peter Holzer
@@ -23,9 +23,30 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Requires-Python: >=3.8
-Provides-Extra: test
 License-File: LICENSE.GPL
 License-File: LICENSE.rst
+Requires-Dist: setuptools
+Requires-Dist: Products.GenericSetup
+Requires-Dist: plone.app.contenttypes
+Requires-Dist: plone.app.querystring
+Requires-Dist: plone.app.mosaic
+Requires-Dist: plone.app.tiles
+Requires-Dist: plone.app.z3cform
+Requires-Dist: plone.autoform
+Requires-Dist: plone.base
+Requires-Dist: plone.dexterity
+Requires-Dist: plone.memoize
+Requires-Dist: plone.supermodel
+Requires-Dist: plone.tiles
+Requires-Dist: plone.api
+Requires-Dist: z3c.relationfield
+Provides-Extra: test
+Requires-Dist: plone.app.dexterity; extra == "test"
+Requires-Dist: plone.app.testing; extra == "test"
+Requires-Dist: plone.browserlayer; extra == "test"
+Requires-Dist: plone.testing; extra == "test"
+Requires-Dist: plone.app.robotframework[debug]; extra == "test"
+Requires-Dist: robotsuite; extra == "test"
 
 .. This README is meant for consumption by humans and pypi. Pypi can render rst files so please do not use Sphinx features.
    If you want to learn more about writing documentation, please check out: http://docs.plone.org/about/documentation_styleguide.html
@@ -87,6 +108,16 @@ Changelog
 =========
 
 
+1.0.4 (2024-05-02)
+------------------
+
+- Fix ``limit``.
+  [petschki]
+
+- code cleanup.
+  [petschki]
+
+
 1.0.3 (2023-11-03)
 ------------------
 

{collective.tiles.carousel-1.0.3 → collective_tiles_carousel-1.0.4}/setup.py

@@ -15,7 +15,7 @@ long_description = "\n\n".join(
 
 setup(
     name="collective.tiles.carousel",
-    version="1.0.3",
+    version="1.0.4",
     description="Slider for plone.app.mosaic based on Bootstrap 5",
     long_description=long_description,
     # Get more from https://pypi.org/classifiers/

{collective.tiles.carousel-1.0.3 → collective_tiles_carousel-1.0.4}/src/collective/tiles/carousel/__init__.py

@@ -1,4 +1,5 @@
 """Init and utils."""
+
 from zope.i18nmessageid import MessageFactory
 
 

{collective.tiles.carousel-1.0.3 → collective_tiles_carousel-1.0.4}/src/collective/tiles/carousel/tests/test_setup.py

@@ -1,4 +1,5 @@
 """Setup tests for this package."""
+
 from collective.tiles.carousel.testing import (
     COLLECTIVE_TILES_CAROUSEL_INTEGRATION_TESTING,
 )

{collective.tiles.carousel-1.0.3 → collective_tiles_carousel-1.0.4}/src/collective/tiles/carousel/tile.py

@@ -7,8 +7,6 @@ from plone import api
 from plone.app.contenttypes.browser.link_redirect_view import NON_RESOLVABLE_URL_SCHEMES
 from plone.app.contenttypes.interfaces import ICollection
 from plone.app.contenttypes.utils import replace_link_variables_by_paths
-from plone.app.querystring import queryparser
-from plone.app.querystring.interfaces import IParsedQueryIndexModifier
 from plone.app.z3cform.widgets.querystring import QueryStringFieldWidget
 from plone.app.z3cform.widgets.relateditems import RelatedItemsFieldWidget
 from plone.autoform import directives as form
@@ -22,7 +20,6 @@ from z3c.relationfield.schema import RelationChoice
 from z3c.relationfield.schema import RelationList
 from zope import schema
 from zope.component import getMultiAdapter
-from zope.component import getUtilitiesFor
 from zope.component import getUtility
 from zope.interface import alsoProvides
 from zope.interface import implementer
@@ -248,37 +245,10 @@ class SliderTile(Tile):
             values.append(name)
         return values
 
-    def parse_query_from_data(data, context=None):
-        """Parse query from data dictionary"""
-        if context is None:
-            context = api.portal.get()
-        query = data.get("query", {}) or {}
-        try:
-            parsed = queryparser.parseFormquery(context, query)
-        except KeyError:
-            parsed = {}
-
-        index_modifiers = getUtilitiesFor(IParsedQueryIndexModifier)
-        for name, modifier in index_modifiers:
-            if name in parsed:
-                new_name, query = modifier(parsed[name])
-                parsed[name] = query
-                # if a new index name has been returned, we need to replace
-                # the native ones
-                if name != new_name:
-                    del parsed[name]
-                    parsed[new_name] = query
-
-        if data.get("sort_on"):
-            parsed["sort_on"] = data["sort_on"]
-        if data.get("sort_reversed", False):
-            parsed["sort_order"] = "reverse"
-        return parsed
-
     @property
     def items(self):
         items = OrderedDict()
-        if "carousel_items" in self.data:
+        if len(self.data.get("carousel_items") or []):
             for item in self.data["carousel_items"]:
                 if ICollection.providedBy(item.to_object):
                     items.update(
@@ -309,16 +279,19 @@ class SliderTile(Tile):
                 else:
                     items[item.to_object] = None
 
-        if getattr(self, "query", None):
+        query = self.query
+        if query:
             items.update(
-                OrderedDict.fromkeys(
-                    [x.getObject() for x in api.content.find(**self.query)]
-                )
+                OrderedDict.fromkeys([x.getObject() for x in self.catalog(**query)])
             )
+
         result = []
-        for obj in items.keys():
+        limit = self.data.get("limit") or 12
+        for count, obj in enumerate(items.keys(), 1):
             result.append(obj)
-        ips = self.data.get("items_per_slide", 1)
+            if count >= limit:
+                break
+        ips = self.data.get("items_per_slide", 1) or 1
         slides = [
             result[i : i + ips]
             for i in [x * ips for x in range(0, int(len(result) / ips) + int(1))]

collective_tiles_carousel-1.0.4/src/collective/tiles/carousel/utils.py

@@ -0,0 +1,22 @@
+"""Utilities."""
+
+from plone import api
+from plone.app.querystring import queryparser
+
+
+def parse_query_from_data(data, context=None):
+    """Parse query from data dictionary"""
+    if context is None:
+        context = api.portal.get()
+    query = data.get("query", {}) or {}
+    try:
+        parsed = queryparser.parseAndModifyFormquery(
+            context,
+            query,
+            data.get("sort_on"),
+            "desc" if data.get("sort_reversed", False) else "asc",
+        )
+    except KeyError:
+        parsed = {}
+
+    return parsed

{collective.tiles.carousel-1.0.3 → collective_tiles_carousel-1.0.4}/src/collective.tiles.carousel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: collective.tiles.carousel
-Version: 1.0.3
+Version: 1.0.4
 Summary: Slider for plone.app.mosaic based on Bootstrap 5
 Home-page: https://github.com/collective/collective.tiles.carousel
 Author: Peter Holzer
@@ -23,9 +23,30 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Requires-Python: >=3.8
-Provides-Extra: test
 License-File: LICENSE.GPL
 License-File: LICENSE.rst
+Requires-Dist: setuptools
+Requires-Dist: Products.GenericSetup
+Requires-Dist: plone.app.contenttypes
+Requires-Dist: plone.app.querystring
+Requires-Dist: plone.app.mosaic
+Requires-Dist: plone.app.tiles
+Requires-Dist: plone.app.z3cform
+Requires-Dist: plone.autoform
+Requires-Dist: plone.base
+Requires-Dist: plone.dexterity
+Requires-Dist: plone.memoize
+Requires-Dist: plone.supermodel
+Requires-Dist: plone.tiles
+Requires-Dist: plone.api
+Requires-Dist: z3c.relationfield
+Provides-Extra: test
+Requires-Dist: plone.app.dexterity; extra == "test"
+Requires-Dist: plone.app.testing; extra == "test"
+Requires-Dist: plone.browserlayer; extra == "test"
+Requires-Dist: plone.testing; extra == "test"
+Requires-Dist: plone.app.robotframework[debug]; extra == "test"
+Requires-Dist: robotsuite; extra == "test"
 
 .. This README is meant for consumption by humans and pypi. Pypi can render rst files so please do not use Sphinx features.
    If you want to learn more about writing documentation, please check out: http://docs.plone.org/about/documentation_styleguide.html
@@ -87,6 +108,16 @@ Changelog
 =========
 
 
+1.0.4 (2024-05-02)
+------------------
+
+- Fix ``limit``.
+  [petschki]
+
+- code cleanup.
+  [petschki]
+
+
 1.0.3 (2023-11-03)
 ------------------
 

collective.tiles.carousel-1.0.3/src/collective/tiles/carousel/utils.py

@@ -1,36 +0,0 @@
-"""Utilities."""
-
-from plone import api
-from plone.app.querystring import queryparser
-from plone.app.querystring.interfaces import IParsedQueryIndexModifier
-from zope.component import getUtilitiesFor
-
-
-def parse_query_from_data(data, context=None):
-    """Parse query from data dictionary"""
-    if context is None:
-        context = api.portal.get()
-    query = data.get("query", {}) or {}
-    try:
-        parsed = queryparser.parseFormquery(context, query)
-    except KeyError:
-        parsed = {}
-
-    index_modifiers = getUtilitiesFor(IParsedQueryIndexModifier)
-    for name, modifier in index_modifiers:
-        if name in parsed:
-            new_name, query = modifier(parsed[name])
-            parsed[name] = query
-            # if a new index name has been returned, we need to replace
-            # the native ones
-            if name != new_name:
-                del parsed[name]
-                parsed[new_name] = query
-
-    if data.get("sort_on"):
-        parsed["sort_on"] = data["sort_on"]
-    if data.get("limit"):
-        parsed["sort_limit"] = data["limit"]
-    if data.get("sort_reversed", False):
-        parsed["sort_order"] = "reverse"
-    return parsed