Merge pull request #61 from cwacek/feature/fix-array-handling

Fixes several issues handling arrays

Author: cwacek

python_jsonschema_objects/classbuilder.py

@@ -744,6 +744,11 @@ def setprop(self, val):
             instance = info['validator'](val)
             val = instance.validate()
 
+        elif util.safe_issubclass(info['type'], validators.ArrayValidator):
+            # An array type may have already been converted into an ArrayValidator
+            instance = info['type'](val)
+            val = instance.validate()
+
         elif getattr(info['type'], 'isLiteralClass', False) is True:
             if not isinstance(val, info['type']):
                 validator = info['type'](val)

python_jsonschema_objects/util.py

@@ -44,9 +44,12 @@ class ProtocolJSONEncoder(json.JSONEncoder):
 
     def default(self, obj):
         from python_jsonschema_objects import classbuilder
+        from python_jsonschema_objects import validators
 
         if isinstance(obj, classbuilder.LiteralValue):
             return obj._value
+        if isinstance(obj, validators.ArrayValidator):
+            return obj.for_json()
         if isinstance(obj, classbuilder.ProtocolBase):
             props = {}
             for raw, trans in six.iteritems(obj.__prop_names__):

python_jsonschema_objects/validators.py

@@ -186,11 +186,13 @@ def from_json(cls, jsonmsg):
         obj.validate()
         return obj
 
-    @classmethod
     def serialize(self):
-        self.validate()
+        d = self.validate()
         enc = util.ProtocolJSONEncoder()
-        return enc.encode(self)
+        return enc.encode(d)
+
+    def for_json(self):
+        return self.validate()
 
     def validate(self):
         converted = self.validate_items()
@@ -245,6 +247,7 @@ def validate_items(self):
                     validator = registry(param)
                     if validator is not None:
                         validator(paramval, elem, typ)
+                typed_elems.append(elem)
 
             elif util.safe_issubclass(typ, classbuilder.LiteralValue):
                 val = typ(elem)
@@ -313,6 +316,8 @@ def create(name, item_constraint=None, **addl_constraints):
                             "Item constraint (position {0}) is not a schema".format(i))
             elif isinstance(item_constraint, classbuilder.TypeProxy):
                 pass
+            elif util.safe_issubclass(item_constraint, ArrayValidator):
+                pass
             else:
                 isdict = isinstance(item_constraint, (dict,))
                 isklass = isinstance( item_constraint, type) and util.safe_issubclass(
@@ -368,8 +373,6 @@ def create(name, item_constraint=None, **addl_constraints):
 
                     item_constraint = classbuilder.TypeProxy(type_array)
 
-
-
         props['__itemtype__'] = item_constraint
 
         props.update(addl_constraints)

test/test_nested_arrays.py

@@ -0,0 +1,47 @@
+
+import pytest
+
+from jsonschema import validate
+import python_jsonschema_objects as pjo
+import json
+import logging
+
+
+@pytest.fixture
+def nested_arrays():
+    return {
+        "title": 'example',
+        "properties": {
+            "foo": {
+                "type": "array",
+                "items": {
+                        "type": "array",
+                        'items': [
+                            {'type': 'number'},
+                            {'type': 'number'}
+                        ]
+                }
+            }
+        }
+
+    }
+
+@pytest.fixture
+def instance():
+    return {'foo': [[42, 44]]}
+
+
+def test_validates(nested_arrays, instance):
+    validate(instance, nested_arrays)
+
+
+def test_nested_array_regression(nested_arrays, instance):
+    logging.basicConfig(level=logging.DEBUG)
+    logging.getLogger().setLevel(logging.DEBUG)
+    builder = pjo.ObjectBuilder(nested_arrays)
+    ns = builder.build_classes()
+
+    q = ns.Example.from_json(json.dumps(instance))
+
+    assert q.serialize() == '{"foo": [[42, 44]]}'
+