Scaling overrides

.travis.yml

@@ -3,21 +3,13 @@ python: 2.7
 env:
   - PLONE_VERSION=4.2
   - PLONE_VERSION=4.3
-matrix:
-  include:
-    - python: 2.6
-      env: PLONE_VERSION=4.1
-  allow_failures:
-    - python: 2.6
-      env: PLONE_VERSION=4.1
 before_install:
   - sudo apt-get install -y libjpeg-dev libgif-dev libpng-dev libz-dev
-install:
-  - sed -ie "s#travis-4.x.cfg#travis-$PLONE_VERSION.x.cfg#" travis.cfg
   - mkdir -p buildout-cache/downloads
-  - python bootstrap.py -c travis.cfg
-  - bin/buildout -c travis.cfg annotate
-  - bin/buildout -c travis.cfg -N -q
+  - mkdir -p buildout-cache/eggs
+install:
+  - python bootstrap.py -c test-$PLONE_VERSION.cfg
+  - bin/buildout -t 10 -Nc test-$PLONE_VERSION.cfg 
 before_script:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"

CHANGES.txt

@@ -4,8 +4,9 @@ Changelog
 0.1rc3 (unreleased)
 -------------------
 
-- Check for plone.namedfile not Dexterity. It can be used seperately
-  [tom_gross]
+- Check for plone.namedfile not Dexterity. It can be used seperately.
+  *If plone.namedfile is used it needs to be at least version 2.0.1*
+  [tomgross]
 
 - Rename ``imagecropping_keywords.txt`` to ``keywords.robot`` to allow simple
   reusage in ``plone.app.robotframework``.
@@ -20,6 +21,11 @@ Changelog
 - Prevent fieldname loosing for for current field
   [bogdangi]
 
+- Fixed #21 (cropping was reset on modifying image)
+  [tomgross]
+
+- Only test Plone 4.2 and 4.3 with Python 2.7 on Travis-CI
+  [tomgross]
 
 0.1rc2 (2013-05-03)
 -------------------

buildout.cfg

@@ -1,12 +1,10 @@
 [buildout]
 extends =
-    https://raw.github.com/collective/buildout.plonetest/master/test-4.2.x.cfg
+    https://raw.github.com/collective/buildout.plonetest/master/test-4.3.x.cfg
 
 package-name = plone.app.imagecropping
 package-extras = [test]
 
-#index = http://c.pypi.python.org
-
 parts +=
     omelette
     i18ndude
@@ -26,6 +24,11 @@ test-eggs +=
 
 versions = versions
 
+[versions]
+Pillow = 2.3.0
+selenium = 2.40.0 
+plone.app.contenttypes = 1.0
+
 [omelette]
 recipe = collective.recipe.omelette
 eggs = ${instance:eggs} ${buildout:test-eggs}
@@ -53,5 +56,3 @@ input = inline:
     cd -
 mode = 755
 
-[versions]
-plone.app.collection = 2.0b5

setup.py

@@ -1,7 +1,9 @@
 from setuptools import setup, find_packages
 import os
+import pkg_resources
+from distutils.version import LooseVersion
 
-version = '0.1rc3.dev0'
+version = '1.0.dev0'
 
 long_description = (
     open('README.rst').read()
@@ -23,15 +25,13 @@
         "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
         "Framework :: Plone",
-        "Framework :: Plone :: 4.1",
         "Framework :: Plone :: 4.2",
         "Framework :: Plone :: 4.3",
         "Intended Audience :: End Users/Desktop",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
         "Operating System :: OS Independent",
         "Programming Language :: JavaScript",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Topic :: Software Development :: Libraries :: Python Modules",
       ],
@@ -56,6 +56,7 @@
           'test': [
               'plone.app.testing[robot]>=4.2.2',
               'plone.app.dexterity',
+              'plone.namedfile>=2.0.1',
           ],
       },
       entry_points="""

src/plone/app/imagecropping/__init__.py

@@ -14,6 +14,3 @@
 imagecroppingMessageFactory = MessageFactory("plone.app.imagecropping")
 PRODUCT_NAME = PAI_STORAGE_KEY = "plone.app.imagecropping"
 
-
-def initialize(context):
-    """Initializer called when used as a Zope 2 product."""

src/plone/app/imagecropping/browser/configure.zcml

@@ -2,6 +2,7 @@
     xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser"
     xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="plone">
 
     <include package="Products.CMFCore" file="permissions.zcml" />
@@ -43,4 +44,28 @@
       permission="cmf.ModifyPortalContent"
     />
 
+ <browser:page
+      zcml:condition="installed Products.ATContentTypes"
+      for="Products.ATContentTypes.interfaces.IATImage"
+      name="images"
+      class=".scaling.ImageScaling"
+      allowed_interface="plone.app.imaging.interfaces.IImageScaling"
+      permission="zope2.View" />
+
+ <browser:page
+      zcml:condition="installed Products.ATContentTypes"
+      for="Products.ATContentTypes.interfaces.IATNewsItem"
+      name="images"
+      class=".scaling.ImageScaling"
+      allowed_interface="plone.app.imaging.interfaces.IImageScaling"
+      permission="zope2.View" />
+
+ <browser:page
+      zcml:condition="installed plone.namedfile"
+      for=".scaling.IImageCroppingScale"
+      name="images"
+      class=".scaling.NamedfileImageScaling"
+      allowed_interface="plone.app.imaging.interfaces.IImageScaling"
+      permission="zope2.View" />
+
 </configure>

src/plone/app/imagecropping/browser/crop.py

@@ -25,7 +25,6 @@ def _crop(self, fieldname, scale, box, interface=None):
         """switch between dexterity and Archetypes
         """
         croputils = IImageCroppingUtils(self.context)
-        field = croputils.get_image_field(fieldname)
         data = croputils.get_image_data(fieldname)
 
         original_file = StringIO(data)
@@ -38,7 +37,7 @@ def _crop(self, fieldname, scale, box, interface=None):
         cropped_image_file.seek(0)
 
         croputils.save_cropped(
-            fieldname, field, scale, cropped_image_file, interface)
+            fieldname, scale, cropped_image_file, interface)
 
         # store crop information in annotations
         self._store(fieldname, scale, box)

src/plone/app/imagecropping/browser/editor.py

@@ -12,7 +12,6 @@
 from zope.component._api import getUtility
 import json
 
-
 JS_MESSAGES = """\
 if(typeof(imagecropping) != "undefined") {
     imagecropping.i18n_message_ids = {
@@ -143,24 +142,27 @@ def image_url(self, fieldname="image"):
             height=int(self.default_editor_size[1]))
         return scaled_img and scaled_img.url or ''
 
-    def __call__(self):
-        form = self.request.form
+    def _crop(self):
+        coordinate = lambda x: int(round(float(self.request.form.get(x))))
+        x1 = coordinate('x1')
+        y1 = coordinate('y1')
+        x2 = coordinate('x2')
+        y2 = coordinate('y2')
+        scale_name = self.request.form.get('scalename')
         cropping_util = self.context.restrictedTraverse('@@crop-image')
+        cropping_util._crop(fieldname=self.fieldname,
+                            scale=scale_name,
+                            box=(x1, y1, x2, y2),
+                            interface=self.interface)
 
+    def __call__(self):
+        form = self.request.form
         if form.get('form.button.Delete', None) is not None:
-            cropping_util._remove(self.fieldname,
-                self.request.form.get('scalename'))
+            cropping_util = self.context.restrictedTraverse('@@crop-image')
+            cropping_util._remove(self.fieldname, form.get('scalename'))
             IStatusMessage(self.request).add(_(u"Cropping area deleted"))
         if form.get('form.button.Save', None) is not None:
-            x1 = int(round(float(self.request.form.get('x1'))))
-            y1 = int(round(float(self.request.form.get('y1'))))
-            x2 = int(round(float(self.request.form.get('x2'))))
-            y2 = int(round(float(self.request.form.get('y2'))))
-            scale_name = self.request.form.get('scalename')
-            cropping_util._crop(fieldname=self.fieldname,
-                                scale=scale_name,
-                                box=(x1, y1, x2, y2),
-                                interface=self.interface)
+            self._crop()
             IStatusMessage(self.request).add(
                 _(u"Successfully saved cropped area"))
 

src/plone/app/imagecropping/browser/scaling.py

@@ -0,0 +1,72 @@
+from zope.annotation.interfaces import IAnnotations
+
+from plone.app.imagecropping import PAI_STORAGE_KEY
+from plone.app.imaging.scaling import ImageScaling as BaseImageScaling
+
+
+class ScalingOverrides(object):
+
+    _rescale = True
+
+    def need_rescale(self, fieldname, scale):
+        cropped = IAnnotations(self.context).get(PAI_STORAGE_KEY)
+        if cropped and '%s_%s' % (fieldname, scale) in cropped:
+            self._rescale = False
+        else:
+            self._rescale = True
+
+
+class ImageScaling(ScalingOverrides, BaseImageScaling):
+
+    def modified(self):
+        if self._rescale:
+            return super(ImageScaling, self).modified()
+        else:
+            return 1
+
+    def scale(self,
+              fieldname=None,
+              scale=None,
+              height=None,
+              width=None,
+              **parameters):
+        self.need_rescale(fieldname, scale)
+        return super(ImageScaling, self).scale(fieldname, scale, height, width, **parameters)
+
+try:
+    from plone.namedfile.scaling import ImageScaling as NFImageScaling
+
+    from plone.namedfile.interfaces import IImageScaleTraversable
+    from plone.app.imagecropping.interfaces import IImageCropping
+
+
+    class IImageCroppingScale(IImageScaleTraversable, IImageCropping):
+        pass
+
+    class NamedfileImageScaling(ScalingOverrides, NFImageScaling):
+        """ Override plone.namedfile scaling view
+
+            This view checks, if image crops are available and
+            prevents rescaling in this case.
+        """
+
+        def modified(self):
+            if self._rescale:
+                return super(NamedfileImageScaling, self).modified()
+            else:
+                return 1
+
+        def scale(self,
+              fieldname=None,
+              scale=None,
+              height=None,
+              width=None,
+              direction='thumbnail',
+              **parameters):
+            self.need_rescale(fieldname, scale)
+            return super(NamedfileImageScaling, self).scale(
+                    fieldname, scale, height, width, direction, **parameters)
+
+
+except ImportError:
+    pass

src/plone/app/imagecropping/configure.zcml

@@ -6,7 +6,7 @@
     xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="plone.app.imagecropping">
 
-  <five:registerPackage package="." initialize=".initialize" />
+  <five:registerPackage package="." />
 
   <genericsetup:registerProfile
       name="default"

src/plone/app/imagecropping/interfaces.py

@@ -30,7 +30,7 @@ def get_image_size(fieldname, interface):
            (100, 200)
         """
 
-    def save_cropped(fieldname, field, scale, image_file, interface=None):
+    def save_cropped(fieldname, scale, image_file, interface=None):
         """ Save the cropped iamge under the name of the selected scale in
             plone.scale.storage.AnnotationStorage, so that it is available
             in plone.app.imaging @@images view

src/plone/app/imagecropping/profiles/testing/types/dexterity_content_type_with_two_image_fields.xml

@@ -42,7 +42,6 @@
     </schema>
   &lt;/model&gt;</property>
  <property name="model_file"></property>
- <property name="schema_policy">dexterity</property>
  <alias from="(Default)" to="(dynamic view)"/>
  <alias from="edit" to="@@edit"/>
  <alias from="sharing" to="@@sharing"/>