Turn idMap into mapSubject and mapPredicate.

Author: Peter Amstutz

schema_salad/jsonld_context.py

@@ -86,7 +86,7 @@ def process_type(t, g, context, defaultBase, namespaces, defaultPrefix):
             predicate = "%s:%s" % (defaultPrefix, recordname)
 
         if context.get(recordname, predicate) != predicate:
-            raise Exception("Predicate collision on '%s', '%s' != '%s'" % (recordname, context[t["name"]], predicate))
+            raise Exception("Predicate collision on '%s', '%s' != '%s'" % (recordname, context[recordname], predicate))
 
         if not recordname:
             raise Exception()

schema_salad/makedoc.py

@@ -286,7 +286,7 @@ def extendsfrom(item, ex):
         else:
             doc = ""
 
-        if self.title is None:
+        if self.title is None and f["doc"]:
             self.title = f["doc"][0:f["doc"].index("\n")]
             if self.title.startswith('# '):
                 self.title = self.title[2:]

schema_salad/ref_resolver.py

@@ -171,7 +171,8 @@ def add_context(self, newcontext, baseuri=""):
         self.identity_links = set()
         self.standalone = set()
         self.nolinkcheck = set()
-        self.idmap = set()
+        self.idmap = {}
+        self.mapPredicate = {}
         self.vocab = {}
         self.rvocab = {}
 
@@ -194,8 +195,11 @@ def add_context(self, newcontext, baseuri=""):
             if isinstance(self.ctx[c], dict) and self.ctx[c].get("noLinkCheck"):
                 self.nolinkcheck.add(c)
 
-            if isinstance(self.ctx[c], dict) and self.ctx[c].get("idMap"):
-                self.idmap.add(c)
+            if isinstance(self.ctx[c], dict) and self.ctx[c].get("mapSubject"):
+                self.idmap[c] = self.ctx[c]["mapSubject"]
+
+            if isinstance(self.ctx[c], dict) and self.ctx[c].get("mapPredicate"):
+                self.mapPredicate[c] = self.ctx[c]["mapPredicate"]
 
             if isinstance(self.ctx[c], dict) and "@id" in self.ctx[c]:
                 self.vocab[c] = self.ctx[c]["@id"]
@@ -338,22 +342,33 @@ def resolve_all(self, document, base_url, file_base=None):
                 if idmapField in document and isinstance(document[idmapField], dict):
                     ls = []
                     for k,v in document[idmapField].items():
-                        v["id"] = k
+                        if not isinstance(v, dict):
+                            if idmapField in loader.mapPredicate:
+                                v = {loader.mapPredicate[idmapField]: v}
+                            else:
+                                raise validate.ValidationException("mapSubject '%s' value '%s' is not a dict and does not have a mapPredicate", k, v)
+                        v[loader.idmap[idmapField]] = k
                         ls.append(v)
                     document[idmapField] = ls
 
-            for identifer in loader.identity_links:
+            for identifer in loader.identifiers:
                 if identifer in document:
                     if isinstance(document[identifer], basestring):
                         document[identifer] = loader.expand_url(document[identifer], base_url, scoped=True)
                         if document[identifer] not in loader.idx or isinstance(loader.idx[document[identifer]], basestring):
                             loader.idx[document[identifer]] = document
                         base_url = document[identifer]
-                    elif isinstance(document[identifer], list):
-                        for n, v in enumerate(document[identifer]):
-                            document[identifer][n] = loader.expand_url(document[identifer][n], base_url, scoped=True)
-                            if document[identifer][n] not in loader.idx:
-                                loader.idx[document[identifer][n]] = document[identifer][n]
+                    else:
+                        raise validate.ValidationException("identifier field '%s' must be a string" % (document[identifer]))
+
+            for identifer in loader.identity_links:
+                if identifer in document and isinstance(document[identifer], list):
+                    for n, v in enumerate(document[identifer]):
+                        document[identifer][n] = loader.expand_url(document[identifer][n], base_url, scoped=True)
+                        if document[identifer][n] not in loader.idx:
+                            loader.idx[document[identifer][n]] = document[identifer][n]
+                #else:
+                #    raise validate.ValidationException("identity field '%s' must be a string" % (document[identifer]))
 
             for d in document:
                 d2 = loader.expand_url(d, "", scoped=False, vocab_term=True)

tests/test_examples.py

@@ -66,41 +66,44 @@ def test_jsonld_ctx(self):
             'http://example.com/foo#bar': 'asym'
         })
 
+    maxDiff = None
 
     def test_idmap(self):
         ldr = schema_salad.ref_resolver.Loader({})
         ldr.add_context({
             "inputs": {
                 "@id": "http://example.com/inputs",
-                "idMap": True
+                "mapSubject": "id",
+                "mapPredicate": "a"
             },
             "outputs": {
-                "@id": "http://example.com/outputs",
-                "idMap": True
+                "@type": "@id",
+                "identity": True,
             },
                          "id": "@id"})
 
         ra, _ = ldr.resolve_all({
+            "id": "stuff",
             "inputs": {
-                "zip": {"a": 1},
-                "zing": {"a": 2}
-            },
-            "outputs": {
-                "out": {"b": 3},
+                "zip": 1,
+                "zing": 2
             },
+            "outputs": ["out"],
             "other": {
                 'n': 9
             }
         }, "http://example2.com/")
 
         self.assertEqual(ra,
-                         {'inputs': [{'a': 2, 'id': 'http://example2.com/#zing'},
-                                     {'a': 1, 'id': 'http://example2.com/#zip'}],
-                          'outputs': [{'b': 3, 'id': 'http://example2.com/#out'}],
-                          'other': {
-                              'n': 9
-                          }
-                      }
+                         {
+                             "id": "http://example2.com/#stuff",
+                             'inputs': [{'a': 2, 'id': 'http://example2.com/#stuff/zing'},
+                                        {'a': 1, 'id': 'http://example2.com/#stuff/zip'}],
+                             'outputs': ['http://example2.com/#stuff/out'],
+                             'other': {
+                                 'n': 9
+                             }
+                         }
                      )
 
     def test_examples(self):