Support of in ref resolver

Author: horejsek

fastjsonschema/draft06.py

@@ -5,7 +5,7 @@
 class CodeGeneratorDraft06(CodeGeneratorDraft04):
     FORMAT_REGEXS = dict(CodeGeneratorDraft04.FORMAT_REGEXS, **{
         'json-pointer': r'^(/(([^/~])|(~[01]))*)*$',
-        #'uri-reference': r'',
+        'uri-reference': r'^(\w+:(\/?\/?))?[^#\\\s]*(#[^\\\s]*)?$',
         'uri-template': (
             r'^(?:(?:[^\x00-\x20\"\'<>%\\^`{|}]|%[0-9a-f]{2})|'
             r'\{[+#./;?&=,!@|]?(?:[a-z0-9_]|%[0-9a-f]{2})+'

fastjsonschema/draft07.py

@@ -4,9 +4,9 @@
 class CodeGeneratorDraft07(CodeGeneratorDraft06):
     FORMAT_REGEXS = dict(CodeGeneratorDraft06.FORMAT_REGEXS, **{
         'date': r'^(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})$',
-        #'iri': r'',
-        #'iri-reference': r'',
-        #'idn-email': r'',
+        'iri': r'^\w+:(\/?\/?)[^\s]+$',
+        'iri-reference': r'^(\w+:(\/?\/?))?[^#\\\s]*(#[^\\\s]*)?$',
+        'idn-email': r'^\w+@\w+\.\w+$',
         #'idn-hostname': r'',
         'relative-json-pointer': r'^(?:0|[1-9][0-9]*)(?:#|(?:\/(?:[^~/]|~0|~1)*)*)$',
         #'regex': r'',

fastjsonschema/ref_resolver.py

@@ -23,11 +23,6 @@ def resolve_path(schema, fragment):
     Return definition from path.
 
     Path is unescaped according https://tools.ietf.org/html/rfc6901
-
-    :argument schema: the referrant schema document
-    :argument str fragment: a URI fragment to resolve within it
-    :returns: the retrieved schema definition
-
     """
     fragment = fragment.lstrip('/')
     parts = unquote(fragment).split('/') if fragment else []
@@ -59,11 +54,6 @@ def resolve_remote(uri, handlers):
         For unknown schemes urlib is used with UTF-8 encoding.
 
     .. _Requests: http://pypi.python.org/pypi/requests/
-
-    :argument str uri: the URI to resolve
-    :argument dict handlers: the URI resolver functions for each scheme
-    :returns: the retrieved schema document
-
     """
     scheme = urlparse.urlsplit(uri).scheme
     if scheme in handlers:
@@ -78,18 +68,13 @@ def resolve_remote(uri, handlers):
 class RefResolver:
     """
     Resolve JSON References.
-
-    :argument str base_uri: URI of the referring document
-    :argument schema: the actual referring schema document
-    :argument dict store: a mapping from URIs to documents to cache
-    :argument bool cache: whether remote refs should be cached after
-        first resolution
-    :argument dict handlers: a mapping from URI schemes to functions that
-        should be used to retrieve them
     """
 
     # pylint: disable=dangerous-default-value,too-many-arguments
     def __init__(self, base_uri, schema, store={}, cache=True, handlers={}):
+        """
+        `base_uri` is URI of the referring document from the `schema`.
+        """
         self.base_uri = base_uri
         self.resolution_scope = base_uri
         self.schema = schema
@@ -102,19 +87,19 @@ def __init__(self, base_uri, schema, store={}, cache=True, handlers={}):
     def from_schema(cls, schema, handlers={}, **kwargs):
         """
         Construct a resolver from a JSON schema object.
-
-        :argument schema schema: the referring schema
-        :rtype: :class:`RefResolver`
         """
         return cls(
-            schema.get('id', '') if isinstance(schema, dict) else '',
+            schema.get('$id', schema.get('id', '')) if isinstance(schema, dict) else '',
             schema,
             handlers=handlers,
             **kwargs
         )
 
     @contextlib.contextmanager
-    def in_scope(self, scope):
+    def in_scope(self, scope: str):
+        """
+        Context manager to handle current scope.
+        """
         old_scope = self.resolution_scope
         self.resolution_scope = urlparse.urljoin(old_scope, scope)
         try:
@@ -123,12 +108,10 @@ def in_scope(self, scope):
             self.resolution_scope = old_scope
 
     @contextlib.contextmanager
-    def resolving(self, ref):
+    def resolving(self, ref: str):
         """
         Context manager which resolves a JSON ``ref`` and enters the
         resolution scope of this ref.
-
-        :argument str ref: reference to resolve
         """
         new_uri = urlparse.urljoin(self.resolution_scope, ref)
         uri, fragment = urlparse.urldefrag(new_uri)
@@ -154,6 +137,9 @@ def get_uri(self):
         return normalize(self.resolution_scope)
 
     def get_scope_name(self):
+        """
+        Get current scope and return it as a valid function name.
+        """
         name = 'validate_' + unquote(self.resolution_scope).replace('~1', '_').replace('~0', '_')
         name = re.sub(r'[:/#\.\-\%]', '_', name)
         name = name.lower().rstrip('_')

tests/json_schema/test_draft06.py

@@ -11,14 +11,6 @@ def pytest_generate_tests(metafunc):
             # Optional.
             'ecmascript-regex.json',
         ],
-        ignore_tests=[
-            'Recursive references between schemas',
-            'validation of URI References',
-            'base URI change - change folder',
-            'base URI change - change folder in subschema',
-            'base URI change',
-            'root ref in remote ref',
-        ],
     )
     metafunc.parametrize(['version', 'schema', 'data', 'is_valid'], param_values, ids=param_ids)
 

tests/json_schema/test_draft07.py

@@ -10,18 +10,7 @@ def pytest_generate_tests(metafunc):
         ignored_suite_files=[
             # Optional.
             'ecmascript-regex.json',
-            'idn-email.json',
             'idn-hostname.json',
-            'iri-reference.json',
-            'iri.json',
-        ],
-        ignore_tests=[
-            'Recursive references between schemas',
-            'validation of URI References',
-            'base URI change - change folder',
-            'base URI change - change folder in subschema',
-            'base URI change',
-            'root ref in remote ref',
         ],
     )
     metafunc.parametrize(['version', 'schema', 'data', 'is_valid'], param_values, ids=param_ids)

tests/json_schema/utils.py

@@ -29,7 +29,7 @@ def remotes_handler(uri):
     return requests.get(uri).json()
 
 
-def resolve_param_values_and_ids(version, suite_dir, ignored_suite_files, ignore_tests):
+def resolve_param_values_and_ids(version, suite_dir, ignored_suite_files=[], ignore_tests=[]):
     suite_dir_path = Path(suite_dir).resolve()
     test_file_paths = sorted(set(suite_dir_path.glob("**/*.json")))