json_schema 0.20.1 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e102114f71484ad7ec4468d6433422c08d7e9a02e20bf635fe7c9a891fce1f99
-  data.tar.gz: 63012a87275d8ee64e9465a5b7998d7db859990d9da99ee197153061e1a00c91
+  metadata.gz: f8995d131af07bfdde3422f2a9cac2a8aaaab975c98692bb944bb8430847cda1
+  data.tar.gz: 893dfed770a20c6e7e66b2a8c0bd8a3defae02a7f2413f839a23df45344028bc
 SHA512:
-  metadata.gz: 3e7481a34dd6f9c56684b387c200afed357dd30fca5d443a1a55ce3eb2b9b75535feb05c4682763b464b882cc1c0cf1a80255bf344e897b8b1f7892a0019225f
-  data.tar.gz: 1175aed4f46aeea66c9d8d65288f6e7a2c9f232bd1f47fdfed342b79259e08975e8b2c795d1fe75e7da563d9d5c171a3ac4b88b6e0045b6c5e965d060bcc28c0
+  metadata.gz: 126055feefc345b2eb5df31af7e0536569d1054ed2ba14d0976ad441078bf577cbaa320b8cbfc1de5da50018ba2bb6463ad60216a9bfbda0622677cc865aa62f
+  data.tar.gz: 03b6f5215269dbd62323fec83204316bc3ab8b143185ec1a4bfe6be67a79fa88406d2ef05ce63f372525ceb411a9e7e3878470b6303702b3b1cbeca2aa2d19d0

data/lib/json_schema/reference_expander.rb

@@ -105,6 +105,29 @@ module JsonSchema
         return false unless success
       end
 
+      # If the reference schema is a global reference
+      # then we'll need to manually expand any nested
+      # references.
+      if ref.uri
+        schema_children(new_schema) do |subschema|
+          next if subschema.expanded?
+          next unless subschema.reference
+
+          # Don't bother if the subschema points to the same
+          # schema as the reference schema.
+          next if ref_schema == subschema
+
+          subref = subschema.reference
+          # the subschema's ref is local to the file that the
+          # subschema is in; however since there's no URI
+          # the 'resolve_pointer' method would try to look it up
+          # within @schema. So: manually reconstruct the reference to
+          # use the URI of the parent ref.
+          subschema.reference = JsonReference::Reference.new("#{ref.uri}#{subref.pointer}")
+          dereference(subschema, ref_stack + [subref])
+        end
+      end
+
       # copy new schema into existing one while preserving parent, fragment,
       # and reference
       parent = ref_schema.parent

data/test/json_schema/reference_expander_test.rb

@@ -265,6 +265,57 @@ describe JsonSchema::ReferenceExpander do
     assert schema.expanded?
   end
 
+  it "expands a schema with a reference to an external schema with a nested property reference" do
+    sample1 = {
+      "$schema" => "http://json-schema.org/draft-04/hyper-schema",
+      "type" => "object",
+      "properties" => {
+        "foo" => {
+          "$ref" => "http://json-schema.org/b.json#/definitions/bar"
+        },
+        "foo2" => {
+          "$ref" => "http://json-schema.org/b.json#/definitions/baz"
+        }
+      }
+    }
+    schema1 = JsonSchema::Parser.new.parse!(sample1)
+    schema1.uri = "http://json-schema.org/a.json"
+
+    sample2 = {
+      "$schema" => "http://json-schema.org/draft-04/hyper-schema",
+      "type" => "object",
+      "definitions" => {
+        "bar" => {
+          "type" => "object",
+          "properties" => {
+            "omg" => {
+              "$ref" => "#/definitions/baz"
+            }
+          }
+        },
+        "baz" => {
+          "type" => "string",
+          "maxLength" => 3
+        }
+      }
+    }
+    schema2 = JsonSchema::Parser.new.parse!(sample2)
+    schema2.uri = "http://json-schema.org/b.json"
+
+    # Initialize a store and add our schema to it.
+    store = JsonSchema::DocumentStore.new
+    store.add_schema(schema1)
+    store.add_schema(schema2)
+
+    expander = JsonSchema::ReferenceExpander.new
+    expander.expand!(schema1, store: store)
+
+    # These both point to the same definition, 'baz', but
+    # 'foo' has a level of indirection.
+    assert_equal 3, schema1.properties["foo2"].max_length
+    assert_equal 3, schema1.properties["foo"].properties["omg"].max_length
+  end
+
   it "expands a reference to a link" do
     pointer("#/properties").merge!(
       "link" => { "$ref" => "#/links/0" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.2
 platform: ruby
 authors:
 - Brandur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecma-re-validator