imio.smartweb.common 1.2.20__py3-none-any.whl → 1.2.22__py3-none-any.whl

imio/smartweb/common/browser/cropping.py

@@ -51,12 +51,11 @@ class SmartwebCroppingImageScalingFactory(CroppingImageScalingFactory):
     ):
         storage = Storage(self.context)
         self.box = storage.read(fieldname, scale)
-
-        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 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 self.box:
             mode = "contain"
         else:

imio/smartweb/common/caching_overrides.zcml

@@ -0,0 +1,20 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:cache="http://namespaces.zope.org/cache"
+    xmlns:zcml="http://namespaces.zope.org/zcml">
+
+    <include package="z3c.unconfigure" file="meta.zcml" />
+
+    <unconfigure>
+        <cache:ruleset
+                for="plone.namedfile.scaling.ImageScale"
+                ruleset="plone.content.file"
+                />
+    </unconfigure>
+
+    <cache:ruleset
+        for="plone.namedfile.scaling.ImageScale"
+        ruleset="plone.stableResource"
+    />
+
+</configure>

imio/smartweb/common/configure.zcml

@@ -24,4 +24,6 @@
   <include package=".upgrades" />
   <include package=".viewlets" />
 
+  <includeOverrides file="caching_overrides.zcml" />
+
 </configure>

imio/smartweb/common/tests/test_cropping.py

@@ -71,6 +71,9 @@ class TestCropping(unittest.TestCase):
         # uncropped scale
         self.assertIsNone(factory.box)
 
+        factory("image", "scale", 100, 100)
+        self.assertIsNone(factory.box)
+
         api.content.transition(self.folder, "publish")
         transaction.commit()
         browser = Browser(self.layer["app"])

{imio.smartweb.common-1.2.20.dist-info → imio.smartweb.common-1.2.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.common
-Version: 1.2.20
+Version: 1.2.22
 Summary: Common utilities, vocabularies, taxonomies for imio.smartweb & co products
 Home-page: https://github.com/imio/imio.smartweb.common
 Author: iMio
@@ -162,6 +162,20 @@ Changelog
 =========
 
 
+1.2.22 (2025-02-14)
+-------------------
+
+- WEB-4153 : Ruleset plone.stableResource for image scales
+  [remdub]
+
+
+1.2.21 (2025-01-31)
+-------------------
+
+- **Fix:** Updated to align scale behavior with the fix in plone.scale ([commit a352815](https://github.com/plone/plone.scale/commit/a352815#diff-24f46fc714c6d36041bcea7e64a7d5aeceacd929eb802655276a1d8f4b4576f4R209)).
+  [boulch]
+
+
 1.2.20 (2025-01-29)
 -------------------
 

{imio.smartweb.common-1.2.20.dist-info → imio.smartweb.common-1.2.22.dist-info}/RECORD

@@ -1,10 +1,11 @@
-imio.smartweb.common-1.2.20-py3.12-nspkg.pth,sha256=XZ3YhlzwpUCC8tXtelHRqxVxo3NWomIiMsUfUshrbeE,1011
+imio.smartweb.common-1.2.22-py3.12-nspkg.pth,sha256=XZ3YhlzwpUCC8tXtelHRqxVxo3NWomIiMsUfUshrbeE,1011
 imio/smartweb/common/__init__.py,sha256=Na9XBfEQUMrm2c5jbqQgwWeg40ih0aXVG1vT8NeAjMQ,2709
 imio/smartweb/common/adapters.py,sha256=rLlObjqZm3hs2hgUT-LmJytwhT-E1rTvbpIi0mmKQqY,610
 imio/smartweb/common/adapters.zcml,sha256=ndYNj0J_BFfVpX_7JhY2asSwLzXG-WmjLdfwL9hX_No,254
 imio/smartweb/common/caching.py,sha256=aN7gX9rT63fnmUuZnx82Mbu3ghjJUeOiLvLEp9OiFm4,895
+imio/smartweb/common/caching_overrides.zcml,sha256=ysa5DgVGzO1Fp22d9Wg-vNyLlqfRR77WBV-7L6j0Hpo,526
 imio/smartweb/common/config.py,sha256=imgOo0_BBIbXGFNvBnhPReLOSY4JqIOH_QCAl0j0XGI,435
-imio/smartweb/common/configure.zcml,sha256=NiTXMd4tEs9R-DU9BavOaUTmGmndEzuSaSFt3d798jQ,840
+imio/smartweb/common/configure.zcml,sha256=IQMv1giqgunu55osPlnVAq2MwM3FjJOGPgrxuO1e_74,894
 imio/smartweb/common/contact_utils.py,sha256=Pr-Nhz9MRnfirZ7RbmF5JZw9fX4gWa0dWkvJlQBiDKY,11341
 imio/smartweb/common/indexers.py,sha256=TvvKglWI0JM5_jwetlpvqcjwkid_2PhaCZGKZV4sD34,1148
 imio/smartweb/common/indexers.zcml,sha256=End1fDod99sr0xw8PaakgeTAZYq-HLOGw3MNA8K_CTs,324
@@ -28,7 +29,7 @@ imio/smartweb/common/behaviors/topics.py,sha256=K9XkhTBxxp_nBBeQ-ovUpmOc6raXIiYq
 imio/smartweb/common/browser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imio/smartweb/common/browser/collective_taxonomy_controlpanel.py,sha256=QngrsXOIjOt0xHEt2r0W66CPg5msY4H7mDkRaAEGQdg,3044
 imio/smartweb/common/browser/configure.zcml,sha256=1cDR2cy7O6WX33cFmbJU971wxg22LkLJYiMKCmBTWrA,3177
-imio/smartweb/common/browser/cropping.py,sha256=uB0UiCUVMD1YT4a1rBmRzmhtnbatrPAXZztkSypiE6s,2676
+imio/smartweb/common/browser/cropping.py,sha256=7xkTvs_0qUo9tC2tAIj77ZQn2RClKOgAwE0L6WhGGxg,2720
 imio/smartweb/common/browser/description.pt,sha256=ZXKpsMQDJGC0dxVUg5v1W6LsG1_OWuYuWevZuF-Zn2Y,151
 imio/smartweb/common/browser/description.py,sha256=BRpHkVzwyeM-SUzkEbtHn2fm8pQREtcHIW7feoQlBPQ,517
 imio/smartweb/common/browser/forms.py,sha256=UK72J9cEadVU4DqQ3OHqv2Jo_Qff9iFSoRv2gsWpZps,4168
@@ -80,7 +81,7 @@ imio/smartweb/common/sharing/localroles.py,sha256=CFy2WcQz5M4hk0Mj8_Lr1lazJ4vu6Z
 imio/smartweb/common/sharing/permissions.py,sha256=VKuVXrbfzzLJSX8q996GsVVdw59uxbeQ8Oe1U3jdOS4,452
 imio/smartweb/common/sharing/permissions.zcml,sha256=TL61HFqzovSVzLZfKEoOZgtLy3V5qdNEvjSk2nN-Xqw,224
 imio/smartweb/common/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-imio/smartweb/common/tests/test_cropping.py,sha256=FErJqVF2pfpSU-0-orkQiNxk83KI8N_UFHOT2hYc--o,4736
+imio/smartweb/common/tests/test_cropping.py,sha256=WGXTc21HQSE0tdr_W9WfrjisToMBRpm4Og3RvmE2YMM,4820
 imio/smartweb/common/tests/test_description.py,sha256=1gIMuNg5YQI52hqw2TiGeZyJFNo8PrvuepmmMB6N59U,2493
 imio/smartweb/common/tests/test_forms.py,sha256=dIhpFXRwojGarjU-s1nItjFVXUR86utU9Qg0xJX3Ll4,2413
 imio/smartweb/common/tests/test_indexes.py,sha256=3dzPAEbqnRqthKX9YUXM_dSbuZzWV-1Idf6GSWzCcfo,4960
@@ -135,10 +136,10 @@ imio/smartweb/common/viewlets/skip_to_content.pt,sha256=FFfTxvRl8V52FzFE6In6B34A
 imio/smartweb/common/viewlets/skip_to_content.py,sha256=wm22NUf8Qh5uzz8p4vkLCdFNiDv9zUGAueRyXAIXQDo,496
 imio/smartweb/common/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imio/smartweb/common/widgets/select.py,sha256=vfVdbecH7qDfJvWV6TfkpqocD6AA5G4yIq7XqSOuVNw,1142
-imio.smartweb.common-1.2.20.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-imio.smartweb.common-1.2.20.dist-info/LICENSE.rst,sha256=5dd78Fdt0e-oM2ICBrMpjHnT8vEP-jhBDF7akXni6B4,655
-imio.smartweb.common-1.2.20.dist-info/METADATA,sha256=Q_m2tFHekzFxK84WQPMuMJpLryhVDtEbGFZWC51L1zs,15580
-imio.smartweb.common-1.2.20.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-imio.smartweb.common-1.2.20.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
-imio.smartweb.common-1.2.20.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
-imio.smartweb.common-1.2.20.dist-info/RECORD,,
+imio.smartweb.common-1.2.22.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+imio.smartweb.common-1.2.22.dist-info/LICENSE.rst,sha256=5dd78Fdt0e-oM2ICBrMpjHnT8vEP-jhBDF7akXni6B4,655
+imio.smartweb.common-1.2.22.dist-info/METADATA,sha256=6p2sF1KpKS-Nb6JwBOtSGwQ7I9CjC82Bjt8KExtxK4c,15965
+imio.smartweb.common-1.2.22.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+imio.smartweb.common-1.2.22.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
+imio.smartweb.common-1.2.22.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
+imio.smartweb.common-1.2.22.dist-info/RECORD,,