Bugfix to uri_file_path. (#80)

* Allow document fragments in paths with correct quoting
* Add test for file_uri and uri_file_path.

Author: tetron

schema_salad/ref_resolver.py

@@ -36,19 +36,21 @@
 DocumentOrStrType = TypeVar(
     'DocumentOrStrType', CommentedSeq, CommentedMap, unicode)
 
-def file_uri(path):  # type: (unicode) -> unicode
+def file_uri(path):  # type: (str) -> str
     if path.startswith("file://"):
         return path
-    urlpath = urllib.pathname2url(str(path))
+    pathsp = path.split("#", 2)
+    frag = "#" + urllib.quote(str(pathsp[1])) if len(pathsp) == 2 else ""
+    urlpath = urllib.pathname2url(str(pathsp[0]))
     if urlpath.startswith("//"):
-        return "file:%s" % urlpath
+        return "file:%s%s" % (urlpath, frag)
     else:
-        return "file://%s" % urlpath
+        return "file://%s%s" % (urlpath, frag)
 
-def uri_file_path(url):  # type: (unicode) -> unicode
+def uri_file_path(url):  # type: (str) -> str
     split = urlparse.urlsplit(url)
     if split.scheme == "file":
-        urllib.url2pathname(str(split.path))
+        return urllib.url2pathname(str(split.path)) + ("#" + urllib.unquote(str(split.fragment)) if split.fragment else "")
     else:
         raise ValueError("Not a file URI")
 

schema_salad/tests/test_examples.py

@@ -362,6 +362,14 @@ def test_fragment(self):
         b, _ = ldr.resolve_ref(get_data("tests/frag.yml#foo2"))
         self.assertEquals({"id": b["id"], "bar":"b2"}, b)
 
+    def test_file_uri(self):
+        # Note: this test probably won't pass on Windows.  Someone with a
+        # windows box should add an alternate test.
+        self.assertEquals("file:///foo/bar%20baz/quux", schema_salad.ref_resolver.file_uri("/foo/bar baz/quux"))
+        self.assertEquals("/foo/bar baz/quux", schema_salad.ref_resolver.uri_file_path("file:///foo/bar%20baz/quux"))
+        self.assertEquals("file:///foo/bar%20baz/quux#zing%20zong", schema_salad.ref_resolver.file_uri("/foo/bar baz/quux#zing zong"))
+        self.assertEquals("/foo/bar baz/quux#zing zong", schema_salad.ref_resolver.uri_file_path("file:///foo/bar%20baz/quux#zing%20zong"))
+
 
 if __name__ == '__main__':
     unittest.main()