Bugfix resolving references to document fragments. (#74)

* Bugfix resolving references to document fragments.

Author: tetron

schema_salad/ref_resolver.py

@@ -380,10 +380,12 @@ def resolve_ref(self,
         mixin = None            # type: Dict[unicode, Any]
 
         if not base_url:
-            if isinstance(ref, unicode):
-                ref = pathlib2.Path(os.path.join(os.getcwd(), ref)).as_uri()
             base_url = pathlib2.Path(os.getcwd()).as_uri() + '/'
 
+        if isinstance(ref, (str, unicode)) and os.sep == "\\":
+            # Convert Windows paths
+            ref = ref.replace("\\", "/")
+
         sl = SourceLine(obj, None, ValueError)
         # If `ref` is a dict, look for special directives.
         if isinstance(ref, CommentedMap):

schema_salad/tests/frag.yml

@@ -0,0 +1,4 @@
+- id: foo1
+  bar: b1
+- id: foo2
+  bar: b2

schema_salad/tests/test_examples.py

@@ -243,7 +243,7 @@ def test_examples(self):
             self.assertEqual(proc, src)
 
     def test_yaml_float_test(self):
-        self.assertEqual(ruamel.yaml.load("float-test: 2e-10")["float-test"],
+        self.assertEqual(ruamel.yaml.safe_load("float-test: 2e-10")["float-test"],
                 2e-10)
 
     def test_typedsl_ref(self):
@@ -341,13 +341,13 @@ def test_scoped_id(self):
         print(g.serialize(format="n3"))
 
     def test_mixin(self):
+        base_url = "file://" + os.getcwd() + "/tests/"
         ldr = schema_salad.ref_resolver.Loader({})
         ra = ldr.resolve_ref(cmap({"$mixin": get_data("tests/mixin.yml"), "one": "five"}),
-                             base_url="file://" + os.getcwd() + "/tests/")
+                             base_url=base_url)
         self.assertEqual({'id': 'four', 'one': 'five'}, ra[0])
-
         ldr = schema_salad.ref_resolver.Loader({"id": "@id"})
-        base_url = "file://" + os.getcwd() + "/tests/"
+
         ra = ldr.resolve_all(cmap([{
             "id": "a",
             "m": {"$mixin": get_data("tests/mixin.yml")}
@@ -368,6 +368,11 @@ def test_mixin(self):
                 'one': 'two'}
         }], ra[0])
 
+    def test_fragment(self):
+        ldr = schema_salad.ref_resolver.Loader({"id": "@id"})
+        b, _ = ldr.resolve_ref("schema_salad/tests/frag.yml#foo2")
+        self.assertEquals({"id": b["id"], "bar":"b2"}, b)
+
 
 if __name__ == '__main__':
     unittest.main()