Add test for non-scoped identifiers.

Author: Peter Amstutz

schema_salad/jsonld_context.py

@@ -175,3 +175,51 @@ def salad_to_jsonld_context(j, schema_ctx):
         process_type(t, g, context, defaultBase, namespaces, defaultPrefix)
 
     return (context, g)
+
+def fix_jsonld_ids(obj, ids):
+    if isinstance(obj, dict):
+        for i in ids:
+            if i in obj:
+                obj["@id"] = obj[i]
+        for v in obj.values():
+            fix_jsonld_ids(v, ids)
+    if isinstance(obj, list):
+        for i in obj:
+            fix_jsonld_ids(i, ids)
+
+def makerdf(workflow, wf, ctx):
+    # type: (Union[str, unicode], Union[List[Dict[unicode, Any]], Dict[unicode, Any]], Loader.ContextType) -> Graph
+    prefixes = {}
+    idfields = []
+    for k,v in ctx.iteritems():
+        if isinstance(v, dict):
+            url = v["@id"]
+        else:
+            url = v
+        if url == "@id":
+            idfields.append(k)
+        doc_url, frg = urlparse.urldefrag(url)
+        if "/" in frg:
+            p, _ = frg.split("/")
+            prefixes[p] = u"%s#%s/" % (doc_url, p)
+
+    if isinstance(wf, list):
+        wf = {
+            "@context": ctx,
+            "@graph": wf
+        }
+    else:
+        wf["@context"] = ctx
+
+    fix_jsonld_ids(wf, idfields)
+
+    g = Graph().parse(data=json.dumps(wf), format='json-ld', location=workflow)
+
+    # Bug in json-ld loader causes @id fields to be added to the graph
+    for s,p,o in g.triples((None, URIRef("@id"), None)):
+        g.remove((s, p, o))
+
+    for k2,v2 in prefixes.iteritems():
+        g.namespace_manager.bind(k2, v2)
+
+    return g

schema_salad/ref_resolver.py

@@ -135,8 +135,9 @@ def expand_url(self, url, base_url, scoped_id=False, vocab_term=False, scoped_re
                 frg = splitbase.fragment + u"/" + split.path
             else:
                 frg = split.path
+            pt = splitbase.path if splitbase.path else "/"
             url = urlparse.urlunsplit(
-                (splitbase.scheme, splitbase.netloc, splitbase.path, splitbase.query, frg))
+                (splitbase.scheme, splitbase.netloc, pt, splitbase.query, frg))
         elif scoped_ref is not None and not split.fragment:
             pass
         else:

tests/test_examples.py

@@ -2,8 +2,11 @@
 import schema_salad.ref_resolver
 import schema_salad.main
 import schema_salad.schema
+from schema_salad.jsonld_context import makerdf
 import rdflib
 import ruamel.yaml as yaml
+import json
+
 try:
     from ruamel.yaml import CSafeLoader as SafeLoader
 except ImportError:
@@ -249,5 +252,75 @@ def test_typedsl_ref(self):
         ra, _ = ldr.resolve_all({"type": "File[]?"}, "")
         self.assertEqual({'type': ['null', {'items': 'File', 'type': 'array'}]}, ra)
 
+    def test_scoped_id(self):
+        ldr = schema_salad.ref_resolver.Loader({})
+        ctx = {
+            "id": "@id",
+            "location": {
+                "@id": "@id",
+                "@type": "@id"
+            },
+            "bar": "http://example.com/bar",
+            "ex": "http://example.com/"
+        }
+        ldr.add_context(ctx)
+
+        ra, _ = ldr.resolve_all({
+            "id": "foo",
+            "bar": {
+                "id": "baz"
+            }
+        }, "http://example.com")
+        self.assertEqual({'id': 'http://example.com/#foo',
+                          'bar': {
+                              'id': 'http://example.com/#foo/baz'},
+                      }, ra)
+
+        g = makerdf(None, ra, ctx)
+        print(g.serialize(format="n3"))
+
+        ra, _ = ldr.resolve_all({
+            "location": "foo",
+            "bar": {
+                "location": "baz"
+            }
+        }, "http://example.com", checklinks=False)
+        self.assertEqual({'location': 'http://example.com/foo',
+                          'bar': {
+                              'location': 'http://example.com/baz'},
+                      }, ra)
+
+        g = makerdf(None, ra, ctx)
+        print(g.serialize(format="n3"))
+
+        ra, _ = ldr.resolve_all({
+            "id": "foo",
+            "bar": {
+                "location": "baz"
+            }
+        }, "http://example.com", checklinks=False)
+        self.assertEqual({'id': 'http://example.com/#foo',
+                          'bar': {
+                              'location': 'http://example.com/baz'},
+                      }, ra)
+
+        g = makerdf(None, ra, ctx)
+        print(g.serialize(format="n3"))
+
+        ra, _ = ldr.resolve_all({
+            "location": "foo",
+            "bar": {
+                "id": "baz"
+            }
+        }, "http://example.com", checklinks=False)
+        self.assertEqual({'location': 'http://example.com/foo',
+                          'bar': {
+                              'id': 'http://example.com/#baz'},
+                      }, ra)
+
+        g = makerdf(None, ra, ctx)
+        print(g.serialize(format="n3"))
+
+
 if __name__ == '__main__':
     unittest.main()