papyru 2.11.1.dev140__tar.gz → 2.11.1.dev147__tar.gz

{papyru-2.11.1.dev140/papyru.egg-info → papyru-2.11.1.dev147}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: papyru
-Version: 2.11.1.dev140
+Version: 2.11.1.dev147
 Summary: minimal REST library with OpenAPI-based validation for django
 Home-page: http://www.puzzleyou.net/
 Author: puzzleYOU GmbH

{papyru-2.11.1.dev140 → papyru-2.11.1.dev147}/papyru/create_variant/edit_template/xml.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass
+from typing import Optional
 from xml.etree.ElementTree import Element, SubElement
 
 from papyru import XMLHelper
@@ -23,7 +24,7 @@ class ImageInfo:
     location: str
     width: int
     height: int
-    crop: ImageCrop = None
+    crop: Optional[ImageCrop] = None
 
 
 def find_placeholder(doc: XMLHelper,
@@ -86,34 +87,44 @@ def fit_image(doc: XMLHelper,
     if ph is None:
         return doc
 
-    if image_info.crop is not None:
-        return _crop_image(doc, ph, image_info)
-    else:
-        wrapper_dims = (float(doc.get_attribute(ph.wrapper, 'width')),
-                        float(doc.get_attribute(ph.wrapper, 'height')))
+    wrapper_dims = (float(doc.get_attribute(ph.wrapper, 'width')),
+                    float(doc.get_attribute(ph.wrapper, 'height')))
 
-        image_dims = (float(image_info.width),
-                      float(image_info.height))
+    image_dims = (float(image_info.width),
+                  float(image_info.height))
 
-        viewbox = _fit_dimensions(wrapper_dims, image_dims)
+    viewbox = (_fit_dimensions(wrapper_dims, image_dims)
+               if image_info.crop is None else
+               (image_info.crop.x, image_info.crop.y,
+                image_info.crop.width, image_info.crop.height))
 
-        doc.set_attribute(ph.wrapper,
-                          'viewBox',
-                          '%s %s %s %s' % viewbox)
+    doc.set_attribute(ph.wrapper,
+                      'viewBox',
+                      '%s %s %s %s' % viewbox)
 
-        has_xlink = doc.namespace('xlink') is not None
-        doc.set_attribute(ph.placeholder,
-                          'href', image_info.location,
-                          'xlink' if has_xlink else None)
+    has_xlink = doc.namespace('xlink') is not None
+    doc.set_attribute(ph.placeholder,
+                      'href', image_info.location,
+                      'xlink' if has_xlink else None)
 
-        doc.set_attribute(ph.placeholder, 'x', '0.0')
-        doc.set_attribute(ph.placeholder, 'y', '0.0')
-        doc.set_attribute(ph.placeholder, 'width', '%s' % image_dims[0])
-        doc.set_attribute(ph.placeholder, 'height', '%s' % image_dims[1])
+    doc.set_attribute(ph.placeholder, 'x', '0.0')
+    doc.set_attribute(ph.placeholder, 'y', '0.0')
+    doc.set_attribute(ph.placeholder, 'width', '%s' % image_dims[0])
+    doc.set_attribute(ph.placeholder, 'height', '%s' % image_dims[1])
 
-        _set_changed(doc, ph.placeholder)
+    if image_info.crop is not None:
+        doc.set_attribute(ph.placeholder, 'bbox',
+                          '{"x": %s, "y": %s, "width": %s, "height": %s}'
+                          % (image_info.crop.x, image_info.crop.y,
+                             image_info.crop.width,
+                             image_info.crop.height), 'pap')
+        doc.set_attribute(ph.placeholder, 'img-dimensions',
+                          '{"width": %s, "height": %s}'
+                          % (image_dims[0], image_dims[1]), 'pap')
 
-        return doc
+    _set_changed(doc, ph.placeholder)
+
+    return doc
 
 
 def _set_changed(document: XMLHelper, element: Element):
@@ -136,34 +147,3 @@ def _fit_dimensions(container_dims: (float, float),
     else:
         w = element_dims[1] * aspect_container
         return ((e_w - w) / 2, 0.0, w, e_h)
-
-
-def _crop_image(doc: XMLHelper, ph: PlaceholderInfo,
-                image_info: ImageInfo) -> XMLHelper:
-    crop = image_info.crop
-
-    doc.set_attribute(ph.wrapper, 'viewBox',
-                      '%s %s %s %s' % (crop.x, crop.y,
-                                       crop.width, crop.height))
-
-    has_xlink = doc.namespace('xlink') is not None
-    doc.set_attribute(ph.placeholder,
-                      'href', image_info.location,
-                      'xlink' if has_xlink else None)
-
-    doc.set_attribute(ph.placeholder, 'x', '0.0')
-    doc.set_attribute(ph.placeholder, 'y', '0.0')
-    doc.set_attribute(ph.placeholder, 'width', '%s' % image_info.width)
-    doc.set_attribute(ph.placeholder, 'height', '%s' % image_info.height)
-
-    doc.set_attribute(ph.placeholder, 'bbox',
-                      '{"x": %s, "y": %s, "width": %s, "height": %s}'
-                      % (crop.x, crop.y,
-                         crop.width, crop.height), 'pap')
-    doc.set_attribute(ph.placeholder, 'img-dimensions',
-                      '{"width": %s, "height": %s}'
-                      % (image_info.width, image_info.height), 'pap')
-
-    _set_changed(doc, ph.placeholder)
-
-    return doc

{papyru-2.11.1.dev140 → papyru-2.11.1.dev147/papyru.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: papyru
-Version: 2.11.1.dev140
+Version: 2.11.1.dev147
 Summary: minimal REST library with OpenAPI-based validation for django
 Home-page: http://www.puzzleyou.net/
 Author: puzzleYOU GmbH

{papyru-2.11.1.dev140 → papyru-2.11.1.dev147}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name='papyru',
-    version='2.11.1.dev140',
+    version='2.11.1.dev147',
     description=(
         'minimal REST library with OpenAPI-based validation for django'),
     author='puzzleYOU GmbH',