New test for scoped ref that better reflects actual desired behavior.

Author: Peter Amstutz

schema_salad/ref_resolver.py

@@ -382,7 +382,7 @@ def resolve_all(self, document, base_url, file_base=None, toplevel=True):
                                 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)
+                                    "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
@@ -545,16 +545,17 @@ def validate_link(self, field, link, docid):
                 if field in self.scoped_ref_fields:
                     split = urlparse.urlsplit(docid)
                     sp = split.fragment.split("/")
-                    while len(sp) > 0:
-                        sp.pop()
+                    while True:
                         sp.append(link)
                         url = urlparse.urlunsplit(
                             (split.scheme, split.netloc, split.path, split.query, "/".join(sp)))
                         if url in self.idx:
                             print link, "is", url
                             return url
-                        else:
-                            sp.pop()
+                        sp.pop()
+                        if len(sp) == 0:
+                            break
+                        sp.pop()
                     raise validate.ValidationException(
                         "Field `%s` contains undefined reference to `%s`" % (field, link))
                 elif not self.check_file(link):

tests/test_examples.py

@@ -109,46 +109,55 @@ def test_idmap(self):
     def test_scoped_ref(self):
         ldr = schema_salad.ref_resolver.Loader({})
         ldr.add_context({
-            "ref": {
+            "scatter": {
                 "@type": "@id",
                 "scopedRef": True,
             },
+            "source": {
+                "@type": "@id",
+                "scopedRef": True,
+            },
+            "in": {
+                "mapSubject": "id",
+                "mapPredicate": "source"
+            },
+            "inputs": {
+                "mapSubject": "id",
+                "mapPredicate": "type"
+            },
+            "steps": {
+                "mapSubject": "id"
+            },
             "id": "@id"})
 
         ra, _ = ldr.resolve_all({
-            "id": "foo",
-            "blurb": {
-                "id": "bar",
-                "blurg": {
-                    "id": "quux",
-                    "blurb": {
-                        "id": "q2"
-                    }
-                },
-                "blurb": {
-                    "id": "baz",
-                    "ref": ["foo", "bar", "baz", "quux", "quux/q2"]
+            "inputs": {
+                "inp": "string"
+            },
+            "steps": {
+                "step1": {
+                    "in": {
+                        "echo_in": "inp"
+                    },
+                    "scatter": "echo_in"
                 }
             }
         }, "http://example2.com/")
 
-        self.assertEquals({'id': 'http://example2.com/#foo',
-                           'blurb': {
-                               'id': 'http://example2.com/#foo/bar',
-                               "blurg": {
-                                   "id": "http://example2.com/#foo/bar/quux",
-                                   "blurb": {
-                                       "id": "http://example2.com/#foo/bar/quux/q2"
-                                   }
-                               },
-                               'blurb': {
-                                   'ref': ['http://example2.com/#foo',
-                                           'http://example2.com/#foo/bar',
-                                           'http://example2.com/#foo/bar/baz',
-                                           'http://example2.com/#foo/bar/quux',
-                                           'http://example2.com/#foo/bar/quux/q2'],
-                                   'id': 'http://example2.com/#foo/bar/baz'}}},
-                          ra)
+        self.assertEquals({'inputs': [{
+                'id': 'http://example2.com/#inp',
+                'type': 'string'
+            }],
+            'steps': [{
+                    'id': 'http://example2.com/#step1',
+                    'scatter': 'http://example2.com/#step1/echo_in',
+                    'in': [{
+                            'id': 'http://example2.com/#step1/echo_in',
+                            'source': 'http://example2.com/#inp'
+                    }]
+                }]
+        }, ra)
+
 
     def test_examples(self):
         self.maxDiff = None