json_schema 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ad0b2694247ed71b5163e4cb0e13799bc976c74
-  data.tar.gz: 8cb84d6e25a4badfd97a8b59dd81b75cb75bb88c
+  metadata.gz: 375dc36afc9706236aa48b7cc3d014e33743c0ff
+  data.tar.gz: fc069f896647b5f0bde096d12f4e1b65c38ba1bd
 SHA512:
-  metadata.gz: 7db5975866312faf10720b8cc1e188f3fc8b12c2d06507dd3536411870e90ea9524f437400730071aff6687b38cc5616849ab47b22e257f60fee8ec7643e942c
-  data.tar.gz: 05d7b10c66a92eb00d6e3baafe1d37d5a471e7e25e0554b46a0922338703abc37523c55e36671b8e7b5517e3aa59654a591ba8cb621c3824527f60a11aaedc41
+  metadata.gz: bd3a3e24fb423907e5433345c552b13fc6c36e937086468c7f79ac13d1b2071603bf774f98345e8cc6a11153aedfb892a70b3cb8b28ad21209a66e81fc360731
+  data.tar.gz: d68d410fdcc8a349cbab6a308b8209a048eabdc72df65f7edbb7558e060cfdcdcdf3c18b9768a84d2670a61a8dc5d92833083d220269fd00ca22bad80a90a215

data/lib/json_schema/reference_expander.rb

@@ -132,12 +132,21 @@ module JsonSchema
           return
         end
 
-        # Parse a new schema and use the same parent node. Basically this is
-        # exclusively for the case of a reference that needs to be
-        # de-referenced again to be resolved.
-        # TODO: Fix to never parse.
-        new_schema = Parser.new.parse(data, ref_schema.parent)
-        build_schema_paths(ref.uri, resolved_schema)
+        # Try to aggressively detect a circular dependency in case of another
+        # reference. See:
+        #
+        #     https://github.com/brandur/json_schema/issues/50
+        #
+        if new_schema = lookup_pointer(ref.uri, data["$ref"])
+          new_schema.clones << ref_schema
+        else
+          # Parse a new schema and use the same parent node. Basically this is
+          # exclusively for the case of a reference that needs to be
+          # de-referenced again to be resolved.
+          # TODO: Fix to never parse.
+          new_schema = Parser.new.parse(data, ref_schema.parent)
+          build_schema_paths(ref.uri, resolved_schema)
+        end
       else
         # insert a clone record so that the expander knows to expand it when
         # the schema traversal is finished

data/test/json_schema/reference_expander_test.rb

@@ -162,7 +162,8 @@ describe JsonSchema::ReferenceExpander do
   # they've been nested
   it "builds appropriate JSON Pointers for circular dependencies" do
     pointer("#/properties").merge!(
-      "app" => { "$ref" => "#" }
+      "app"  => { "$ref" => "#" },
+      "app1" => { "$ref" => "#/properties/app"}
     )
     expand
 
@@ -173,6 +174,12 @@ describe JsonSchema::ReferenceExpander do
     # but diving deeper results in the same pointer again
     schema = schema.properties["app"]
     assert_equal "#/properties/app", schema.pointer
+
+    schema = @schema.properties["app1"]
+    assert_equal "#/properties/app1", schema.pointer
+
+    schema = schema.properties["app1"]
+    assert_equal "#/properties/app1", schema.pointer
   end
 
   it "errors on a JSON Pointer that can't be resolved" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Brandur