Support --base-uri. and local full path and remote URI

willson-chen · willson-chen · commit 0955ad094e72 · 2020-09-03T16:36:03.000+08:00
diff --git a/jsonschema/cli.py b/jsonschema/cli.py
@@ -10,7 +10,6 @@
 import os
 import sys
 import traceback
-import urllib
 
 import attr
 
@@ -264,30 +263,17 @@ def load(_):
 
     if arguments["base_uri"] is None:
         resolver = None
-    else:
-        scheme = urllib.parse.urlsplit(arguments["base_uri"]).scheme
-        alphabet_list = [chr(ord('a') + i) for i in range(0, 26)]
-        local_path_flag = True \
-            if scheme == '' or scheme in alphabet_list else False
-
-        if local_path_flag:
-            file_prefix = "file:///{}/" if "nt" == os.name else "file://{}/"
-            abs_path_flag = os.path.isabs(arguments["base_uri"])
-
-            resolver = RefResolver(
-                    base_uri=file_prefix.format(arguments["base_uri"]),
-                    referrer=schema,
-                ) if abs_path_flag is True else RefResolver(
-                    base_uri=file_prefix.format(
-                        os.path.abspath(arguments["base_uri"])
-                    ),
+    elif arguments["base_uri"] == ".":
+        file_prefix = "file:///{}/" if "nt" == os.name else "file://{}/"
+        resolver = RefResolver(
+                    base_uri=file_prefix.format(os.getcwd()),
                     referrer=schema,
                 )
-        else:
-            resolver = RefResolver(
-                base_uri=arguments["base_uri"],
-                referrer=schema,
-            )
+    else:
+        resolver = RefResolver(
+                        base_uri=arguments["base_uri"],
+                        referrer=schema,
+                    )
 
     validator = arguments["validator"](schema, resolver=resolver)
     exit_code = 0
diff --git a/jsonschema/tests/test_cli.py b/jsonschema/tests/test_cli.py
@@ -690,7 +690,7 @@ def test_successful_validate_with_specifying_base_uri_relative_path(self):
                 mode='w+',
                 prefix='schema',
                 suffix='.json',
-                dir='..',
+                dir='.',
                 delete=False
             )
             self.addCleanup(os.remove, schema_file.name)
@@ -705,7 +705,7 @@ def test_successful_validate_with_specifying_base_uri_relative_path(self):
 
         self.assertOutputs(
             files=dict(some_schema=schema, some_instance='{"KEY1": "1"}'),
-            argv=["-i", "some_instance", "--base-uri", "..", "some_schema"],
+            argv=["-i", "some_instance", "--base-uri", ".", "some_schema"],
             stdout="",
             stderr="",
         )
@@ -716,7 +716,7 @@ def test_failure_validate_with_specifying_base_uri_relative_path(self):
                 mode='w+',
                 prefix='schema',
                 suffix='.json',
-                dir='..',
+                dir='.',
                 delete=False
             )
             self.addCleanup(os.remove, schema_file.name)
@@ -731,7 +731,7 @@ def test_failure_validate_with_specifying_base_uri_relative_path(self):
 
         self.assertOutputs(
             files=dict(some_schema=schema, some_instance='{"KEY1": 1}'),
-            argv=["-i", "some_instance", "--base-uri", "..", "some_schema"],
+            argv=["-i", "some_instance", "--base-uri", ".", "some_schema"],
             exit_code=1,
             stdout="",
             stderr="1: 1 is not of type 'string'\n",
@@ -757,6 +757,8 @@ def test_successful_validate_with_specifying_base_uri_absolute_path(self):
         finally:
             schema_file.close()
 
+        file_prefix = "file:///{}/" if "nt" == os.name else "file://{}/"
+        absolute_path = file_prefix.format(absolute_path)
         self.assertOutputs(
             files=dict(some_schema=schema, some_instance='{"KEY1": "1"}'),
             argv=[
@@ -788,6 +790,8 @@ def test_failure_validate_with_specifying_base_uri_absolute_path(self):
         finally:
             schema_file.close()
 
+        file_prefix = "file:///{}/" if "nt" == os.name else "file://{}/"
+        absolute_path = file_prefix.format(absolute_path)
         self.assertOutputs(
             files=dict(some_schema=schema, some_instance='{"KEY1": 1}'),
             argv=[
@@ -800,43 +804,6 @@ def test_failure_validate_with_specifying_base_uri_absolute_path(self):
             stderr="1: 1 is not of type 'string'\n",
         )
 
-    def test_successful_validate_with_specifying_base_uri_remote_path(self):
-        schema = """
-                 {"type": "object", "properties": {
-                 "KEY1":{"$ref": "organization.json"}}}
-                 """
-        self.assertOutputs(
-            files=dict(some_schema=schema,
-                       some_instance='{"KEY1": {"name": "remote"}}'
-                       ),
-            argv=[
-                "-i", "some_instance",
-                "--base-uri", "https://project-open-data.cio.gov/v1.1/schema/",
-                "some_schema",
-            ],
-            stdout="",
-            stderr="",
-        )
-
-    def test_failure_validate_with_specifying_base_uri_remote_path(self):
-        schema = """
-                 {"type": "object", "properties": {
-                 "KEY1":{"$ref": "organization.json"}}}
-                 """
-        self.assertOutputs(
-            files=dict(some_schema=schema,
-                       some_instance='{"KEY1": {"fail": "remote"}}'
-                       ),
-            argv=[
-                "-i", "some_instance",
-                "--base-uri", "https://project-open-data.cio.gov/v1.1/schema/",
-                "some_schema",
-            ],
-            exit_code=1,
-            stdout="",
-            stderr="{'fail': 'remote'}: 'name' is a required property\n",
-        )
-
     def test_it_validates_using_the_latest_validator_when_unspecified(self):
         # There isn't a better way now I can think of to ensure that the
         # latest version was used, given that the call to validator_for
