Added basic extends support. forthcoming (I hope)

Julian · Julian · commit 7030485561ea · 2012-01-30T22:41:13.000-05:00
diff --git a/jsonschema.py b/jsonschema.py
@@ -12,8 +12,7 @@
 --------------
 
 * ``format``
-* ``extends``
-* ``$ref``
+* ``$ref`` (and, ergo, using ``extends`` with a ``$ref``)
 * ``$schema``
 
 """
@@ -411,6 +410,12 @@ def validate_disallow(self, disallow, instance, schema):
                 u"%r is disallowed for %r" % (_delist(disallow), instance)
             )
 
+    def validate_extends(self, extends, instance, schema):
+        if self._is_type(extends, "object"):
+            extends = [extends]
+        for subschema in extends:
+            self._validate(instance, subschema)
+
 
 def _extras_msg(extras):
     """
diff --git a/tests.py b/tests.py
@@ -528,6 +528,56 @@ def divisibleBy(self, expect, instance, dB):
         disallow=[u"string", {"properties" : {u"foo" : {u"type" : u"string"}}}]
     ))
 
+    @parametrized(
+        ("", "valid", {"foo" : "baz", "bar" : 2}),
+        ("mismatch_extends", "invalid", {"foo" : "baz"}),
+        ("mismatch_extended", "invalid", {"bar" : 2}),
+        ("wrong_type", "invalid", {"foo" : "baz", "bar" : "quux"}),
+    )
+    def extends(self, expect, instance):
+        schema = {
+            "properties" : {"bar" : {"type" : "integer", "required" : True}},
+            "extends" : {
+                "properties" : {
+                    "foo" : {"type" : "string", "required" : True},
+                }
+            },
+        }
+
+        test = validation_test(**schema)
+        test(self, expect, instance)
+
+    @parametrized(
+        ("", "valid", {"foo" : "quux", "bar" : 2, "baz" : None}),
+        ("mismatch_first_extends", "invalid", {"bar" : 2, "baz" : None}),
+        ("mismatch_second_extends", "invalid", {"foo" : "quux", "bar" : 2}),
+        ("mismatch_both", "invalid", {"bar" : 2}),
+    )
+    def multiple_extends(self, expect, instance):
+        schema = {
+            "properties" : {"bar" : {"type" : "integer", "required" : True}},
+            "extends" : [
+                {
+                    "properties" : {
+                    "foo" : {"type" : "string", "required" : True},
+                    }
+                },
+                {
+                    "properties" : {
+                    "baz" : {"type" : "null", "required" : True},
+                    }
+                },
+            ],
+        }
+
+        test = validation_test(**schema)
+        test(self, expect, instance)
+
+    extends_simple_types = parametrized(
+        ("", "valid", 25),
+        ("mismatch_extends", "invalid", 35)
+    )(validation_test(minimum=20, extends={"maximum" : 30}))
+
     def test_stop_on_error(self):
         instance = [1, 2]
 
