Merge pull request #591 from petrjasek/fix-image-crop-custom-size

fix(crop): cast image crop vocab width/height values to int

features/vocabularies.feature

@@ -151,3 +151,28 @@ Feature: Vocabularies
      ]}
     """
     Then we get updated response
+
+  @auth
+  Scenario: Cast crop image width/height to int
+    Given "vocabularies"
+    """
+    [{"_id": "crop_sizes", "items": [
+      {
+        "is_active" : true,
+        "width" : "300",
+        "name" : "foo",
+        "height" : "200"
+      }
+    ]}]
+    """
+    When we get "/vocabularies"
+    Then we get list with 1 items
+    """
+    {"_items": [{"items": [{"width": 300, "height": 200}]}]}
+    """
+
+    When we get "/vocabularies/crop_sizes"
+    Then we get existing resource
+    """
+    {"items": [{"width": 300, "height": 200}]}
+    """

superdesk/vocabularies/vocabularies.py

@@ -14,6 +14,7 @@
 
 from flask import request, current_app as app
 from eve.utils import config
+from eve.methods.common import serialize_value
 
 from superdesk import privilege
 from superdesk.notification import push_notification
@@ -30,6 +31,15 @@
           description="User can manage vocabularies' contents.")
 
 
+# TODO(petr): add api to specify vocabulary schema
+vocab_schema = {
+    'crop_sizes': {
+        'width': {'type': 'integer'},
+        'height': {'type': 'integer'},
+    }
+}
+
+
 class VocabulariesResource(Resource):
     schema = {
         '_id': {
@@ -99,13 +109,14 @@ def on_fetched(self, doc):
 
         for item in doc[config.ITEMS]:
             self._filter_inactive_vocabularies(item)
+            self._cast_items(item)
 
     def on_fetched_item(self, doc):
         """
         Overriding to filter out inactive vocabularies and pops out 'is_active' property from the response.
         """
-
         self._filter_inactive_vocabularies(doc)
+        self._cast_items(doc)
 
     def on_update(self, updates, original):
         """ Checks the duplicates if a unique field is defined """
@@ -155,6 +166,17 @@ def _filter_inactive_vocabularies(self, item):
 
         item['items'] = list(active_vocs)
 
+    def _cast_items(self, vocab):
+        """Cast values in vocabulary items using predefined schema.
+
+        :param vocab
+        """
+        schema = vocab_schema.get(vocab.get('_id'), {})
+        for item in vocab.get('items', []):
+            for field, field_schema in schema.items():
+                if field in item:
+                    item[field] = serialize_value(field_schema['type'], item[field])
+
     def _send_notification(self, updated_vocabulary):
         """
         Sends notification about the updated vocabulary to all the connected clients.