Merge pull request #60 from blr246/boolean-in-child-object

Support boolean in schema child object.

Author: cwacek

python_jsonschema_objects/classbuilder.py

@@ -686,7 +686,9 @@ def setprop(self, val):
               if not isinstance(typ, dict):
                 type_checks.append(typ)
                 continue
-              typ = validators.SCHEMA_TYPE_MAPPING[typ['type']]
+              typ = next(t
+                         for n, t in validators.SCHEMA_TYPE_MAPPING
+                         if typ['type'] == t)
               if typ is None:
                   typ = type(None)
               if isinstance(typ, (list, tuple)):

python_jsonschema_objects/pattern_properties.py

@@ -91,7 +91,7 @@ def instantiate(self, name, val):
         if self._additional_type is True:
 
             valtype = [k for k, t
-                       in six.iteritems(validators.SCHEMA_TYPE_MAPPING)
+                       in validators.SCHEMA_TYPE_MAPPING
                        if t is not None and isinstance(val, t)]
             valtype = valtype[0]
             return cb.MakeLiteral(name, valtype, val)

python_jsonschema_objects/validators.py

@@ -4,15 +4,16 @@
 import logging
 logger = logging.getLogger(__name__)
 
-SCHEMA_TYPE_MAPPING = {
-    'array': list,
-    'boolean': bool,
-    'integer': six.integer_types,
-    'number': six.integer_types + (float,),
-    'null': type(None),
-    'string': six.string_types,
-    'object': dict
-}
+SCHEMA_TYPE_MAPPING = (
+    ('array', list),
+    ('boolean', bool),
+    ('integer', six.integer_types),
+    ('number', six.integer_types + (float,)),
+    ('null', type(None)),
+    ('string', six.string_types),
+    ('object', dict),
+)
+"""Sequence of schema type mappings to be checked in precedence order."""
 
 
 class ValidationError(Exception):

test/test_pytest.py

@@ -431,3 +431,21 @@ def test_strict_mode():
         ns = builder.build_classes(strict=True)
         NameData = ns.NameData
         NameData(lastName="hello")
+
+
+def test_boolean_in_child_object():
+    schema = {
+        "$schema": "http://json-schema.org/schema#",
+        "id": "test",
+        "type": "object",
+        "properties": {
+            "data": {
+                "type": "object",
+                "additionalProperties": True
+            }
+        }
+    }
+    builder = pjs.ObjectBuilder(schema)
+    ns = builder.build_classes()
+
+    ns.Test(data={"my_bool": True})