Fix proxies=False to recurse through references when replacing them. fix #48

Author: gazpachoking

jsonref.py

@@ -257,23 +257,27 @@ def jsonloader(uri, **kwargs):
     return result
 
 
-_no_result = object()
-
-
-def _walk_refs(obj, func, replace=False):
+def _walk_refs(obj, func, replace=False, _processed=None):
+    # Keep track of already processed items to prevent recursion
+    _processed = _processed or {}
+    oid = id(obj)
+    if oid in _processed:
+        return _processed[oid]
     if type(obj) is JsonRef:
-        return func(obj)
+        r = func(obj)
+        obj = r if replace else obj
+    _processed[oid] = obj
     if isinstance(obj, Mapping):
         for k, v in obj.items():
-            r = _walk_refs(v, func, replace=replace)
-            if r is not _no_result and replace:
+            r = _walk_refs(v, func, replace=replace, _processed=_processed)
+            if replace:
                 obj[k] = r
     elif isinstance(obj, Sequence) and not isinstance(obj, str):
         for i, v in enumerate(obj):
-            r = _walk_refs(v, func, replace=replace)
-            if r is not _no_result and replace:
+            r = _walk_refs(v, func, replace=replace, _processed=_processed)
+            if replace:
                 obj[i] = r
-    return _no_result
+    return obj
 
 
 def replace_refs(

tests.py

@@ -10,6 +10,7 @@
 from jsonref import (
     JsonRef,
     JsonRefError,
+    _walk_refs,
     dump,
     dumps,
     jsonloader,
@@ -186,6 +187,31 @@ def test_no_proxies(self):
         result = replace_refs(json, proxies=False)
         assert result["b"] is result["a"]
 
+    def test_walk_refs(self):
+        docs = {
+            "a.json": {"file": "a", "b": {"$ref": "b.json"}},
+            "b.json": {"file": "b", "c": {"$ref": "c.json"}},
+            "c.json": {"file": "c"},
+        }
+        test_func = mock.Mock()
+        res = replace_refs(docs["a.json"], loader=docs.get)
+        _walk_refs(res, test_func)
+        # Make sure it followed the refs through documents
+        assert test_func.call_count == 2
+
+    def test_multi_doc_no_proxies(self):
+        docs = {
+            "a.json": {"file": "a", "b": {"$ref": "b.json"}},
+            "b.json": {"file": "b", "c": {"$ref": "c.json"}},
+            "c.json": {"file": "c"},
+        }
+        test_func = mock.Mock()
+        res = replace_refs(docs["a.json"], loader=docs.get, proxies=False)
+        _walk_refs(res, test_func)
+        # Make sure there aren't any JsonRefs left
+        assert test_func.call_count == 0
+        assert res == {"file": "a", "b": {"file": "b", "c": {"file": "c"}}}
+
     def test_recursive_data_structures_local(self):
         json = {"a": "foobar", "b": {"$ref": "#"}}
         result = replace_refs(json)