collective.tiles.carousel 1.0.3__py3-none-any.whl → 1.1.0__py3-none-any.whl

collective/tiles/carousel/__init__.py

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

collective/tiles/carousel/tests/robot/test_example.robot

@@ -23,13 +23,12 @@
 
 *** Settings *****************************************************************
 
-Resource  plone/app/robotframework/selenium.robot
-Resource  plone/app/robotframework/keywords.robot
+Resource  plone/app/robotframework/browser.robot
 
 Library  Remote  ${PLONE_URL}/RobotRemote
 
-Test Setup  Open test browser
-Test Teardown  Close all browsers
+Test Setup  Run keywords  Plone Test Setup
+Test Teardown  Run keywords  Plone Test Teardown
 
 
 *** Test Cases ***************************************************************
@@ -47,20 +46,19 @@ Scenario: As a member I want to be able to log into the website
 
 a login form
   Go To  ${PLONE_URL}/login_form
-  Wait until page contains  Login Name
-  Wait until page contains  Password
+  Get Text    //body    contains    Login Name
+  Get Text    //body    contains    Password
 
 
 # --- WHEN -------------------------------------------------------------------
 
 I enter valid credentials
-  Input Text  __ac_name  admin
-  Input Text  __ac_password  secret
-  Click Button  Log in
+  Type Text    //input[@name="__ac_name"]    admin
+  Type Text    //input[@name="__ac_password"]    secret
+  Click    //button[contains(text(), "Log in")]
 
 
 # --- THEN -------------------------------------------------------------------
 
 I am logged in
-  Wait until page contains  You are now logged in
-  Page should contain  You are now logged in
+  Get Text    //body    contains    You are now logged in

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/tile.py

@@ -7,10 +7,7 @@ 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
 from plone.dexterity.interfaces import IDexterityContainer
 from plone.memoize import view
@@ -22,7 +19,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
@@ -33,6 +29,16 @@ from zope.schema.vocabulary import SimpleTerm
 from zope.schema.vocabulary import SimpleVocabulary
 
 
+try:
+    from plone.app.z3cform.widgets.contentbrowser import (
+        ContentBrowserFieldWidget as CarouselItemsWidget,
+    )
+except ImportError:
+    from plone.app.z3cform.widgets.relateditems import (
+        RelatedItemsFieldWidget as CarouselItemsWidget,
+    )
+
+
 @provider(IContextSourceBinder)
 def image_scales(context):
     """Return custom source for image scales.
@@ -77,11 +83,12 @@ class ISliderTile(Schema):
 
     form.widget(
         "carousel_items",
-        RelatedItemsFieldWidget,
+        CarouselItemsWidget,
         vocabulary="plone.app.vocabularies.Catalog",
         pattern_options={
             "orderable": True,
             "recentlyUsed": True,
+            "upload": True,
         },
     )
 
@@ -248,37 +255,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 +289,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/utils.py

@@ -2,8 +2,6 @@
 
 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):
@@ -12,25 +10,13 @@ def parse_query_from_data(data, context=None):
         context = api.portal.get()
     query = data.get("query", {}) or {}
     try:
-        parsed = queryparser.parseFormquery(context, query)
+        parsed = queryparser.parseAndModifyFormquery(
+            context,
+            query,
+            data.get("sort_on"),
+            "desc" if data.get("sort_reversed", False) else "asc",
+        )
     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

collective.tiles.carousel-1.1.0-py3.12-nspkg.pth

@@ -0,0 +1,2 @@
+import sys, types, os;p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('collective',));importlib = __import__('importlib.util');__import__('importlib.machinery');m = sys.modules.setdefault('collective', importlib.util.module_from_spec(importlib.machinery.PathFinder.find_spec('collective', [os.path.dirname(p)])));m = m or sys.modules.setdefault('collective', types.ModuleType('collective'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p)
+import sys, types, os;p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('collective', 'tiles'));importlib = __import__('importlib.util');__import__('importlib.machinery');m = sys.modules.setdefault('collective.tiles', importlib.util.module_from_spec(importlib.machinery.PathFinder.find_spec('collective.tiles', [os.path.dirname(p)])));m = m or sys.modules.setdefault('collective.tiles', types.ModuleType('collective.tiles'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p);m and setattr(sys.modules['collective'], 'tiles', m)

{collective.tiles.carousel-1.0.3.dist-info → collective.tiles.carousel-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: collective.tiles.carousel
-Version: 1.0.3
+Version: 1.1.0
 Summary: Slider for plone.app.mosaic based on Bootstrap 5
 Home-page: https://github.com/collective/collective.tiles.carousel
 Author: Peter Holzer
@@ -41,12 +41,12 @@ 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'
+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
@@ -108,6 +108,23 @@ Changelog
 =========
 
 
+1.1.0 (2024-12-12)
+------------------
+
+- Use new `ContentBrowserWidget` for Plone 6.1.
+  [petschki]
+
+
+1.0.4 (2024-05-02)
+------------------
+
+- Fix ``limit``.
+  [petschki]
+
+- code cleanup.
+  [petschki]
+
+
 1.0.3 (2023-11-03)
 ------------------
 

{collective.tiles.carousel-1.0.3.dist-info → collective.tiles.carousel-1.1.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
-collective.tiles.carousel-1.0.3-py3.11-nspkg.pth,sha256=Vq44M1ox8wdw3b0VK_LUaGmCPYCr7x699rOAClrxCbs,1762
-collective/tiles/carousel/__init__.py,sha256=J9-8Hj1ymQi5g5IecTHwgRxzlYuFyIDJDVDoNs3IWjQ,118
+collective.tiles.carousel-1.1.0-py3.12-nspkg.pth,sha256=2oWpeYM6MlxuTCe3-blu86w9h991-Etrc9-2Yn3D6ME,1059
+collective/tiles/carousel/__init__.py,sha256=51V59Yi1aRW6PCzRAoJqUlWno0YQO1wAgi8d37mwTmA,119
 collective/tiles/carousel/configure.zcml,sha256=1-9Nc4-Lej7b7HJb9Puc8Jw_rDRVyS6agix2SR98wrs,1783
 collective/tiles/carousel/interfaces.py,sha256=erGd_4DSscSVyQCdzdWNABmPxuUBV1vwKvz6_m5BCc4,249
 collective/tiles/carousel/setuphandlers.py,sha256=0y1cT8R_eYSdIv-aZUY-pazUGia27EFzCCHC-SiGMrI,586
 collective/tiles/carousel/testing.py,sha256=WxBe18FLBdf-9nQmw_0rL_Gf1Eu0aLnUDD0RUxJ2VE0,1685
 collective/tiles/carousel/tile.pt,sha256=ePFsqwYEMYpng21_l8Hp8Ok9-f_KfUKICaq-oJ3n3yc,4737
-collective/tiles/carousel/tile.py,sha256=RdOJZBnnxFZzwUFPvR1xrXYBznHgmCh2PI1lzvd_tfA,13295
-collective/tiles/carousel/utils.py,sha256=4rKRTdhHtoZyRaP2zdMFFTKpohCZUq_xvRhw9NRAC0M,1176
+collective/tiles/carousel/tile.py,sha256=xAFdH8VOybd7rnhVxJAeAaivpZkwNQmLPgr7QrcZj9Y,12448
+collective/tiles/carousel/utils.py,sha256=M0fOW-m5fhe63I4PtO8jCqnbooZ9ZXctj5in_Ru8j-o,550
 collective/tiles/carousel/locales/README.rst,sha256=fS2h1MYp7b5Im-GcnIsZLHhK1N4F-_VuHBf_DorI2_A,611
 collective/tiles/carousel/locales/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 collective/tiles/carousel/locales/collective.tiles.carousel.pot,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -27,13 +27,13 @@ collective/tiles/carousel/slides/slide_view.py,sha256=CiDVVWD_Vcm1JDjruPoR5wJ83g
 collective/tiles/carousel/slides/static/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 collective/tiles/carousel/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 collective/tiles/carousel/tests/test_robot.py,sha256=VPu3DguHGk-5srPM-N9BZj4dALjotYup8RWZ-QRdbpQ,947
-collective/tiles/carousel/tests/test_setup.py,sha256=gzE86929VEpiqhwRkehsMu6ZL3T0-zkIpzZqCw_NJ58,2220
-collective/tiles/carousel/tests/robot/test_example.robot,sha256=RjktU-NOhxH3xDxc_Tn91wLAVcuQQ2aNnMEV5oHOKFw,2032
-collective.tiles.carousel-1.0.3.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-collective.tiles.carousel-1.0.3.dist-info/LICENSE.rst,sha256=iDVL_6C7byshRvxykg-JJfnJl1UQCvKDV_H-1dp_8GU,668
-collective.tiles.carousel-1.0.3.dist-info/METADATA,sha256=k9VFxrkyVwHXYt11qbQDn8v2rrlND_1g9-PmaEa8wUA,3927
-collective.tiles.carousel-1.0.3.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-collective.tiles.carousel-1.0.3.dist-info/entry_points.txt,sha256=ru0hdDg0GqdaMNDkHf3l7rtXvCkgCOmh7S-EiRWIpUk,130
-collective.tiles.carousel-1.0.3.dist-info/namespace_packages.txt,sha256=AiVC9ju6UYs_UE8dvyfAvQmRsFgWG25eyAfTG-nLAjM,28
-collective.tiles.carousel-1.0.3.dist-info/top_level.txt,sha256=FyC0xnd95fkjCaKazR3nfIgNqhWMpB0mYBlzALyXKTg,11
-collective.tiles.carousel-1.0.3.dist-info/RECORD,,
+collective/tiles/carousel/tests/test_setup.py,sha256=4FnSh4YBgEbcKTEw-feXs61FYm137R198GQUz4bXFBE,2221
+collective/tiles/carousel/tests/robot/test_example.robot,sha256=5m94vuXTR8NH6qj1s52WlTCj-3Iwgy579yRFX0JG-UE,2053
+collective.tiles.carousel-1.1.0.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+collective.tiles.carousel-1.1.0.dist-info/LICENSE.rst,sha256=iDVL_6C7byshRvxykg-JJfnJl1UQCvKDV_H-1dp_8GU,668
+collective.tiles.carousel-1.1.0.dist-info/METADATA,sha256=WGYnVoEVoNcrCu5inRUvGJtlPRfEN3tydFWJWkf-Zc4,4124
+collective.tiles.carousel-1.1.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+collective.tiles.carousel-1.1.0.dist-info/entry_points.txt,sha256=ru0hdDg0GqdaMNDkHf3l7rtXvCkgCOmh7S-EiRWIpUk,130
+collective.tiles.carousel-1.1.0.dist-info/namespace_packages.txt,sha256=AiVC9ju6UYs_UE8dvyfAvQmRsFgWG25eyAfTG-nLAjM,28
+collective.tiles.carousel-1.1.0.dist-info/top_level.txt,sha256=FyC0xnd95fkjCaKazR3nfIgNqhWMpB0mYBlzALyXKTg,11
+collective.tiles.carousel-1.1.0.dist-info/RECORD,,

{collective.tiles.carousel-1.0.3.dist-info → collective.tiles.carousel-1.1.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

collective.tiles.carousel-1.0.3-py3.11-nspkg.pth

@@ -1,3 +0,0 @@
-import sys, types, os;has_mfs = sys.version_info > (3, 5);p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('collective',));importlib = has_mfs and __import__('importlib.util');has_mfs and __import__('importlib.machinery');m = has_mfs and sys.modules.setdefault('collective', importlib.util.module_from_spec(importlib.machinery.PathFinder.find_spec('collective', [os.path.dirname(p)])));m = m or sys.modules.setdefault('collective', types.ModuleType('collective'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p)
-import sys, types, os;has_mfs = sys.version_info > (3, 5);p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('collective',));importlib = has_mfs and __import__('importlib.util');has_mfs and __import__('importlib.machinery');m = has_mfs and sys.modules.setdefault('collective', importlib.util.module_from_spec(importlib.machinery.PathFinder.find_spec('collective', [os.path.dirname(p)])));m = m or sys.modules.setdefault('collective', types.ModuleType('collective'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p)
-import sys, types, os;has_mfs = sys.version_info > (3, 5);p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('collective', 'tiles'));importlib = has_mfs and __import__('importlib.util');has_mfs and __import__('importlib.machinery');m = has_mfs and sys.modules.setdefault('collective.tiles', importlib.util.module_from_spec(importlib.machinery.PathFinder.find_spec('collective.tiles', [os.path.dirname(p)])));m = m or sys.modules.setdefault('collective.tiles', types.ModuleType('collective.tiles'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p);m and setattr(sys.modules['collective'], 'tiles', m)