imio.smartweb.common 1.2.26__tar.gz → 1.2.28__tar.gz

{imio_smartweb_common-1.2.26 → imio_smartweb_common-1.2.28}/CHANGES.rst

@@ -2,6 +2,23 @@ Changelog
 =========
 
 
+1.2.28 (2025-04-30)
+-------------------
+
+- Upgrade dev environment to Plone 6.1-latest
+  [remdub]
+
+- Add tests for Plone 6.1-latest and add Python 3.13
+  [remdub]
+
+
+1.2.27 (2025-03-19)
+-------------------
+
+- WEB-4122 : Create adapter/validator to filter valid image mimetype in our solutions
+  [boulch]
+
+
 1.2.26 (2025-03-12)
 -------------------
 
@@ -58,7 +75,8 @@ Changelog
 1.2.19 (2025-01-09)
 -------------------
 
-- Nothing changed yet.
+- WEB-4153 : Override @vocabularies endpoint to add a cache ruleset on it
+  [remdub]
 
 
 1.2.18 (2024-07-01)

{imio_smartweb_common-1.2.26 → imio_smartweb_common-1.2.28}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: imio.smartweb.common
-Version: 1.2.26
+Version: 1.2.28
 Summary: Common utilities, vocabularies, taxonomies for imio.smartweb & co products
 Home-page: https://github.com/imio/imio.smartweb.common
 Author: iMio
@@ -15,10 +15,13 @@ Classifier: Environment :: Web Environment
 Classifier: Framework :: Plone
 Classifier: Framework :: Plone :: Addon
 Classifier: Framework :: Plone :: 6.0
+Classifier: Framework :: Plone :: 6.1
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Requires-Python: >=3.10
@@ -51,6 +54,19 @@ Requires-Dist: plone.app.robotframework[debug]; extra == "test"
 Requires-Dist: plone.restapi[test]; extra == "test"
 Requires-Dist: freezegun; extra == "test"
 Requires-Dist: mock; extra == "test"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 .. 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
@@ -162,6 +178,23 @@ Changelog
 =========
 
 
+1.2.28 (2025-04-30)
+-------------------
+
+- Upgrade dev environment to Plone 6.1-latest
+  [remdub]
+
+- Add tests for Plone 6.1-latest and add Python 3.13
+  [remdub]
+
+
+1.2.27 (2025-03-19)
+-------------------
+
+- WEB-4122 : Create adapter/validator to filter valid image mimetype in our solutions
+  [boulch]
+
+
 1.2.26 (2025-03-12)
 -------------------
 
@@ -218,7 +251,8 @@ Changelog
 1.2.19 (2025-01-09)
 -------------------
 
-- Nothing changed yet.
+- WEB-4153 : Override @vocabularies endpoint to add a cache ruleset on it
+  [remdub]
 
 
 1.2.18 (2024-07-01)

imio_smartweb_common-1.2.28/requirements-6.1.txt

@@ -0,0 +1 @@
+-r https://dist.plone.org/release/6.1-latest/requirements.txt

imio_smartweb_common-1.2.28/requirements-coverage.txt

@@ -0,0 +1,2 @@
+-r requirements-6.0.txt
+coveralls==3.2.0

{imio_smartweb_common-1.2.26 → imio_smartweb_common-1.2.28}/setup.py

@@ -16,7 +16,7 @@ long_description = "\n\n".join(
 
 setup(
     name="imio.smartweb.common",
-    version="1.2.26",
+    version="1.2.28",
     description="Common utilities, vocabularies, taxonomies for imio.smartweb & co products",
     long_description=long_description,
     # Get more from https://pypi.org/classifiers/
@@ -26,10 +26,13 @@ setup(
         "Framework :: Plone",
         "Framework :: Plone :: Addon",
         "Framework :: Plone :: 6.0",
+        "Framework :: Plone :: 6.1",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Operating System :: OS Independent",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
     ],

imio_smartweb_common-1.2.28/src/imio/smartweb/common/adapters.py

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+
+from imio.smartweb.common.utils import get_image_format
+from plone.namedfile.interfaces import IAvailableSizes
+from plone.namedfile.interfaces import INamedImageField
+from plone.namedfile.field import InvalidImageFile
+from zope.component import adapter
+from zope.component import getUtility
+from zope.interface import Interface
+
+
+class BaseCroppingProvider(object):
+    def __init__(self, context):
+        self.context = context
+
+    def get_scales(self, fieldname, request=None):
+        if self.context.portal_type == "Image":
+            # imio.smartweb.core override get_scales.
+            # so this is only available for authentic sources
+            return []
+        allowed_sizes = getUtility(IAvailableSizes)()
+        scales = list(allowed_sizes.keys())
+        scales.remove("banner")
+        return scales
+
+
+@adapter(INamedImageField, Interface)
+class ImageContenttypeValidator:
+    def __init__(self, field, value):
+        self.field = field
+        self.value = value
+
+    def __call__(self):
+        if self.value is None:
+            return
+        mimetype = get_image_format(self.value)
+
+        valid_mimetypes = [
+            "image/gif",
+            "image/jpeg",
+            "image/png",
+            "image/svg+xml",
+            "image/webp",
+        ]
+        if mimetype not in valid_mimetypes:
+            raise InvalidImageFile(mimetype, self.field.__name__)

{imio_smartweb_common-1.2.26 → imio_smartweb_common-1.2.28}/src/imio/smartweb/common/adapters.zcml

@@ -7,4 +7,10 @@
       factory=".adapters.BaseCroppingProvider"
       />
 
+  <adapter
+      factory=".adapters.ImageContenttypeValidator"
+      provides="plone.namedfile.field.IPluggableImageFieldValidation"
+      name="smartweb_image_contenttype"
+      />
+
 </configure>

{imio_smartweb_common-1.2.26 → imio_smartweb_common-1.2.28}/src/imio/smartweb/common/browser/collective_taxonomy_controlpanel.py

@@ -2,11 +2,8 @@
 
 from collective.taxonomy.interfaces import ITaxonomy
 from collective.taxonomy.jsonimpl import EditTaxonomyData as baseEditTaxonomyData
-from imio.smartweb.locales import SmartwebMessageFactory as _
 from plone import api
 from zope.component import queryUtility
-from zope.component import queryUtility
-from plone import api
 from Products.Five import BrowserView
 
 

{imio_smartweb_common-1.2.26 → imio_smartweb_common-1.2.28}/src/imio/smartweb/common/browser/cropping.py

@@ -51,11 +51,10 @@ class SmartwebCroppingImageScalingFactory(CroppingImageScalingFactory):
     ):
         storage = Storage(self.context)
         self.box = storage.read(fieldname, scale)
-        if scale is not None:
-            if "portrait" in scale or "paysage" in scale or "carre" in scale:
-                orientation = scale.split("_")[0]
-                # take cropping box from "affiche" scale
-                self.box = storage.read(fieldname, f"{orientation}_affiche")
+        if scale and ("portrait" in scale or "paysage" in scale or "carre" in scale):
+            orientation = scale.split("_")[0]
+            # take cropping box from "affiche" scale
+            self.box = storage.read(fieldname, f"{orientation}_affiche")
         if self.box:
             mode = "contain"
         else:

{imio_smartweb_common-1.2.26 → imio_smartweb_common-1.2.28}/src/imio/smartweb/common/configure.zcml

@@ -1,6 +1,7 @@
 <configure
     xmlns="http://namespaces.zope.org/zope">
 
+  <include package="z3c.unconfigure" file="meta.zcml" />
   <include package="collective.taxonomy" />
   <include package="eea.facetednavigation" />
   <include package="eea.facetednavigation" file="meta.zcml" />

imio_smartweb_common-1.2.28/src/imio/smartweb/common/tests/test_widgets.py

@@ -0,0 +1,120 @@
+# -*- coding: utf-8 -*-
+
+from imio.smartweb.common.testing import IMIO_SMARTWEB_COMMON_INTEGRATION_TESTING
+from imio.smartweb.common.widgets.select import TranslatedAjaxSelectWidget
+from importlib.metadata import version
+from plone.api import portal as portal_api
+from zope.publisher.browser import TestRequest
+
+
+import mock
+import unittest
+
+
+class TestVocabulary(unittest.TestCase):
+    layer = IMIO_SMARTWEB_COMMON_INTEGRATION_TESTING
+
+    def setUp(self):
+        """Custom shared utility setup for tests"""
+        self.request = TestRequest()
+
+    def test_translated_ajax_select(self):
+        portal_api.get_current_language = mock.Mock(return_value="fr")
+        widget = TranslatedAjaxSelectWidget(self.request)
+        widget.update()
+        # __import__("pdb").set_trace()
+        if version("plone.app.z3cform") < "4.4.0":
+            self.assertEqual(
+                {
+                    "name": None,
+                    "value": "",
+                    "pattern": "select2",
+                    "pattern_options": {"separator": ";"},
+                },
+                widget._base_args(),
+            )
+            widget.vocabulary = "imio.smartweb.vocabulary.Topics"
+            self.assertEqual(
+                widget._base_args(),
+                {
+                    "name": None,
+                    "value": "",
+                    "pattern": "select2",
+                    "pattern_options": {
+                        "vocabularyUrl": "http://nohost/plone/@@getVocabulary?name=imio.smartweb.vocabulary.Topics",
+                        "separator": ";",
+                    },
+                },
+            )
+            widget.value = "entertainment"
+            self.assertEqual(
+                widget._base_args(),
+                {
+                    "name": None,
+                    "value": "entertainment",
+                    "pattern": "select2",
+                    "pattern_options": {
+                        "vocabularyUrl": "http://nohost/plone/@@getVocabulary?name=imio.smartweb.vocabulary.Topics",
+                        "initialValues": {
+                            "entertainment": "Activités et divertissement",
+                        },
+                        "separator": ";",
+                    },
+                },
+            )
+        else:
+            # _base.args has been removed
+            # see https://github.com/plone/plone.app.z3cform/commit/5de30e9b117885859680dfe3861f134a667cea9c
+            self.assertEqual(
+                {
+                    "name": None,
+                    "value": None,
+                    "pattern": "select2",
+                    "pattern_options": {"separator": ";"},
+                },
+                {
+                    "name": widget.name,
+                    "value": widget.value,
+                    "pattern": widget.pattern,
+                    "pattern_options": widget.get_pattern_options(),
+                },
+            )
+            widget.vocabulary = "imio.smartweb.vocabulary.Topics"
+            self.assertEqual(
+                {
+                    "name": None,
+                    "value": None,
+                    "pattern": "select2",
+                    "pattern_options": {
+                        "vocabularyUrl": "http://nohost/plone/@@getVocabulary?name=imio.smartweb.vocabulary.Topics",
+                        "separator": ";",
+                    },
+                },
+                {
+                    "name": widget.name,
+                    "value": widget.value,
+                    "pattern": widget.pattern,
+                    "pattern_options": widget.get_pattern_options(),
+                },
+            )
+            widget.value = "entertainment"
+            self.assertEqual(
+                {
+                    "name": None,
+                    "value": "entertainment",
+                    "pattern": "select2",
+                    "pattern_options": {
+                        "vocabularyUrl": "http://nohost/plone/@@getVocabulary?name=imio.smartweb.vocabulary.Topics",
+                        "initialValues": {
+                            "entertainment": "Activités et divertissement",
+                        },
+                        "separator": ";",
+                    },
+                },
+                {
+                    "name": widget.name,
+                    "value": widget.value,
+                    "pattern": widget.pattern,
+                    "pattern_options": widget.get_pattern_options(),
+                },
+            )

{imio_smartweb_common-1.2.26 → imio_smartweb_common-1.2.28}/src/imio/smartweb/common/utils.py

@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 
 from Acquisition import aq_parent
+from io import BytesIO
 from imio.smartweb.common.config import TRANSLATED_VOCABULARIES
 from imio.smartweb.common.interfaces import ICropping
 from imio.smartweb.locales import SmartwebMessageFactory as _
+from PIL import Image
 from plone import api
 from plone.app.imagecropping.storage import Storage
 from plone.dexterity.utils import iterSchemata
@@ -203,3 +205,27 @@ def get_parent_of_type(context, content_type):
             return parent
         parent = aq_parent(parent)
     return None
+
+
+def _get_pil_mimetype(pil_image):
+    """Retourne le MIME type d'une image PIL."""
+    format_to_mime = {
+        "JPEG": "image/jpeg",
+        "PNG": "image/png",
+        "GIF": "image/gif",
+        "BMP": "image/bmp",
+        "TIFF": "image/tiff",
+        "WEBP": "image/webp",
+        "SVG": "image/svg+xml",
+    }
+    return format_to_mime.get(pil_image.format, "application/octet-stream")
+
+
+def get_image_format(named_blob_image):
+    """Détecte le format d'une image à partir de son contenu binaire."""
+    if named_blob_image and named_blob_image.data:
+        try:
+            with Image.open(BytesIO(named_blob_image.data)) as img:
+                return _get_pil_mimetype(img)
+        except Exception:
+            return None

{imio_smartweb_common-1.2.26 → imio_smartweb_common-1.2.28}/src/imio.smartweb.common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: imio.smartweb.common
-Version: 1.2.26
+Version: 1.2.28
 Summary: Common utilities, vocabularies, taxonomies for imio.smartweb & co products
 Home-page: https://github.com/imio/imio.smartweb.common
 Author: iMio
@@ -15,10 +15,13 @@ Classifier: Environment :: Web Environment
 Classifier: Framework :: Plone
 Classifier: Framework :: Plone :: Addon
 Classifier: Framework :: Plone :: 6.0
+Classifier: Framework :: Plone :: 6.1
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Requires-Python: >=3.10
@@ -51,6 +54,19 @@ Requires-Dist: plone.app.robotframework[debug]; extra == "test"
 Requires-Dist: plone.restapi[test]; extra == "test"
 Requires-Dist: freezegun; extra == "test"
 Requires-Dist: mock; extra == "test"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 .. 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
@@ -162,6 +178,23 @@ Changelog
 =========
 
 
+1.2.28 (2025-04-30)
+-------------------
+
+- Upgrade dev environment to Plone 6.1-latest
+  [remdub]
+
+- Add tests for Plone 6.1-latest and add Python 3.13
+  [remdub]
+
+
+1.2.27 (2025-03-19)
+-------------------
+
+- WEB-4122 : Create adapter/validator to filter valid image mimetype in our solutions
+  [boulch]
+
+
 1.2.26 (2025-03-12)
 -------------------
 
@@ -218,7 +251,8 @@ Changelog
 1.2.19 (2025-01-09)
 -------------------
 
-- Nothing changed yet.
+- WEB-4153 : Override @vocabularies endpoint to add a cache ruleset on it
+  [remdub]
 
 
 1.2.18 (2024-07-01)

{imio_smartweb_common-1.2.26 → imio_smartweb_common-1.2.28}/src/imio.smartweb.common.egg-info/SOURCES.txt

@@ -5,8 +5,9 @@ LICENSE.GPL
 LICENSE.rst
 MANIFEST.in
 README.rst
+requirements-6.0.txt
+requirements-6.1.txt
 requirements-coverage.txt
-requirements.txt
 setup.cfg
 setup.py
 docs/conf.py

imio_smartweb_common-1.2.26/requirements-coverage.txt

@@ -1,2 +0,0 @@
--r requirements.txt
-coveralls==3.2.0

imio_smartweb_common-1.2.26/src/imio/smartweb/common/adapters.py

@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from plone.namedfile.interfaces import IAvailableSizes
-from zope.component import getUtility
-
-
-class BaseCroppingProvider(object):
-    def __init__(self, context):
-        self.context = context
-
-    def get_scales(self, fieldname, request=None):
-        if self.context.portal_type == "Image":
-            # imio.smartweb.core override get_scales.
-            # so this is only available for authentic sources
-            return []
-        allowed_sizes = getUtility(IAvailableSizes)()
-        scales = list(allowed_sizes.keys())
-        scales.remove("banner")
-        return scales

imio_smartweb_common-1.2.26/src/imio/smartweb/common/tests/test_widgets.py

@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from imio.smartweb.common.testing import IMIO_SMARTWEB_COMMON_INTEGRATION_TESTING
-from imio.smartweb.common.widgets.select import TranslatedAjaxSelectWidget
-from plone.api import portal as portal_api
-from zope.publisher.browser import TestRequest
-
-import mock
-import unittest
-
-
-class TestVocabulary(unittest.TestCase):
-    layer = IMIO_SMARTWEB_COMMON_INTEGRATION_TESTING
-
-    def setUp(self):
-        """Custom shared utility setup for tests"""
-        self.request = TestRequest()
-
-    def test_translated_ajax_select(self):
-        portal_api.get_current_language = mock.Mock(return_value="fr")
-        widget = TranslatedAjaxSelectWidget(self.request)
-        widget.update()
-        self.assertEqual(
-            {
-                "name": None,
-                "value": "",
-                "pattern": "select2",
-                "pattern_options": {"separator": ";"},
-            },
-            widget._base_args(),
-        )
-
-        widget.vocabulary = "imio.smartweb.vocabulary.Topics"
-        self.assertEqual(
-            widget._base_args(),
-            {
-                "name": None,
-                "value": "",
-                "pattern": "select2",
-                "pattern_options": {
-                    "vocabularyUrl": "http://nohost/plone/@@getVocabulary?name=imio.smartweb.vocabulary.Topics",
-                    "separator": ";",
-                },
-            },
-        )
-        widget.value = "entertainment"
-        self.assertEqual(
-            widget._base_args(),
-            {
-                "name": None,
-                "value": "entertainment",
-                "pattern": "select2",
-                "pattern_options": {
-                    "vocabularyUrl": "http://nohost/plone/@@getVocabulary?name=imio.smartweb.vocabulary.Topics",
-                    "initialValues": {
-                        "entertainment": "Activités et divertissement",
-                    },
-                    "separator": ";",
-                },
-            },
-        )