Merge pull request #62 from cwacek/feature/feature/check-schema-first

feature: Use jsonschema to validate the schema itself before load

Author: cwacek

python_jsonschema_objects/__init__.py

@@ -43,9 +43,12 @@ def __init__(self, schema_uri, resolved={}):
             }
         )
 
+        meta_validator = Draft4Validator(Draft4Validator.META_SCHEMA)
+        meta_validator.validate(self.schema)
         self.validator = Draft4Validator(self.schema,
                                          resolver=self.resolver)
 
+
         self._classes = None
         self._resolved = None
 

test/test_pytest.py

@@ -2,21 +2,38 @@
 
 import json
 import six
-import pkg_resources
+import jsonschema
 import python_jsonschema_objects as pjs
 
 import logging
 logging.basicConfig(level=logging.DEBUG)
 
 
+def test_schema_validation():
+    """ Test that the ObjectBuilder validates the schema itself.
+    """
+    schema = {
+        "$schema": "http://json-schema.org/schema#",
+        "id": "test",
+        "type": "object",
+        "properties": {
+                "name": "string",
+                "email": {"oneOf": [{"type": "string"}, {"type": "integer"}]},
+        },
+        "required": ["email"]
+    }
+    with pytest.raises(jsonschema.ValidationError):
+        pjs.ObjectBuilder(schema)
+
+
 def test_regression_9():
     schema = {
         "$schema": "http://json-schema.org/schema#",
         "id": "test",
         "type": "object",
         "properties": {
                 "name": {"type": "string"},
-                "email": {"oneOf": ["string", "integer"]},
+                "email": {"oneOf": [{"type": "string"}, {"type": "integer"}]},
         },
         "required": ["email"]
     }

test/test_regression_17.py

@@ -12,7 +12,6 @@ def test_class():
                 "id": "claimed",
                 "type": ["string", "integer", "null"],
                 "description": "Robots Only. The human agent that has claimed this robot.",
-                "required": False
                 },
             }
         }