add id with ref support

Author: willson-chen

jsonschema/tests/test_jsonschema_test_suite.py

@@ -151,25 +151,6 @@ def narrow_unicode_build(test):  # pragma: no cover
             subject="ref",
             case_description="Recursive references between schemas",
         )(test)
-        or skip(
-            message=bug(371),
-            subject="ref",
-            case_description="Location-independent identifier",
-        )(test)
-        or skip(
-            message=bug(371),
-            subject="ref",
-            case_description=(
-                "Location-independent identifier with absolute URI"
-            ),
-        )(test)
-        or skip(
-            message=bug(371),
-            subject="ref",
-            case_description=(
-                "Location-independent identifier with base URI change in subschema"
-            ),
-        )(test)
         or skip(
             message=bug(),
             subject="refRemote",
@@ -225,25 +206,6 @@ def narrow_unicode_build(test):  # pragma: no cover
             subject="ref",
             case_description="Recursive references between schemas",
         )(test)
-        or skip(
-            message=bug(371),
-            subject="ref",
-            case_description="Location-independent identifier",
-        )(test)
-        or skip(
-            message=bug(371),
-            subject="ref",
-            case_description=(
-                "Location-independent identifier with absolute URI"
-            ),
-        )(test)
-        or skip(
-            message=bug(371),
-            subject="ref",
-            case_description=(
-                "Location-independent identifier with base URI change in subschema"
-            ),
-        )(test)
         or skip(
             message=bug(),
             subject="refRemote",
@@ -300,25 +262,6 @@ def narrow_unicode_build(test):  # pragma: no cover
             subject="ref",
             case_description="Recursive references between schemas",
         )(test)
-        or skip(
-            message=bug(371),
-            subject="ref",
-            case_description="Location-independent identifier",
-        )(test)
-        or skip(
-            message=bug(371),
-            subject="ref",
-            case_description=(
-                "Location-independent identifier with absolute URI"
-            ),
-        )(test)
-        or skip(
-            message=bug(371),
-            subject="ref",
-            case_description=(
-                "Location-independent identifier with base URI change in subschema"
-            ),
-        )(test)
         or skip(
             message=bug(),
             subject="refRemote",

jsonschema/validators.py

@@ -5,6 +5,7 @@
 import contextlib
 import json
 import numbers
+import copy
 
 from jsonschema import (
     _legacy_validators,
@@ -31,6 +32,10 @@
 # Imported for backwards compatibility.
 from jsonschema.exceptions import ErrorTree
 ErrorTree
+list_schema = ["http://json-schema.org/draft-03/schema#",
+               "http://json-schema.org/draft-04/schema#",
+               "http://json-schema.org/draft-06/schema#",
+               "http://json-schema.org/draft-07/schema#"]
 
 
 class _DontDoThat(Exception):
@@ -654,6 +659,7 @@ def __init__(
         )
         self.store.update(store)
         self.store[base_uri] = referrer
+        self.store_subschema(referrer, last_url=base_uri)
 
         self._urljoin_cache = urljoin_cache
         self._remote_cache = remote_cache
@@ -862,6 +868,41 @@ def resolve_remote(self, uri):
             self.store[uri] = result
         return result
 
+    def store_subschema(self, schema, last_url=None):
+        """
+        Using $id or id with $ref, save subschema to self.store
+
+        Arguments:
+
+            schema:
+
+                The referring schema.
+
+            last_url:
+
+                The last URL.
+        """
+        if not isinstance(schema, dict) \
+                or self.resolution_scope in list_schema:
+            return
+
+        for k in schema.keys():
+            if k in [u"id", u"$id"] and isinstance(schema[k], str):
+                # Splicing the url in the last id with the url in this id,
+                # and store last_url at the same time.
+                last_url = urljoin(last_url, schema[k], allow_fragments=True)
+                url, fragment = urldefrag(last_url)
+
+                # Save the schema into self.store[url]
+                self.store[url] = copy.deepcopy(schema)
+
+                # Add fragment element in self.store[url]
+                if fragment:
+                    self.store[url][fragment] = copy.deepcopy(schema)
+
+            if isinstance(schema[k], dict):
+                self.store_subschema(schema[k], last_url)
+
 
 def validate(instance, schema, cls=None, *args, **kwargs):
     """