json_schema 0.20.3 → 0.20.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45216e42386e80c6e481d45fafb3bcecad1c55cde5137efb455bb45261e87424
-  data.tar.gz: 8764080e6a1c38b519110a8001b53ebda5864e7b16cdf418b272459542f60e1f
+  metadata.gz: 0b59e2abb8260fc05004ddde201c9107a0be38149e0dbf9aff1f3d774e5d5ae8
+  data.tar.gz: b40758dada1ba42ac46f7aa45c9370eae4d9ef5178126813fff6ba6ad8ab0ece
 SHA512:
-  metadata.gz: 0f43b198fc8050550fb78d3a96ad14dff765fdcce80b5ae73ce080e6fb13600697658cf3b9d2b73e1ed9adc0d40cedfb890047696778dc5e3770dead5889e666
-  data.tar.gz: 6f30c6b07f81396b3f7366fd30186b83ddbf1ef474e375838c77df5a635b96bc2ac4dc4bf2036789a235f19efa3bc22ac76c246d31db9a697b8235790f045c4b
+  metadata.gz: e06bc21c170498b1bcb09b1142a1971b64c8c9e376b395e72017d0aab538eacf54c1061e1a09be7e633734f75706fafe399b9272d9ac633fc7976b4d8084decc
+  data.tar.gz: 98cb1d66418ebcdfe94367c01e946c210f7f79ffa89ee3daa609876398753cb7239c9e8f189087f01f81d33b55f4f038764d21d8da64049c6cc5dfd0034606aa

data/lib/json_schema/reference_expander.rb

@@ -84,9 +84,25 @@ module JsonSchema
       end
     end
 
-    def dereference(ref_schema, ref_stack)
+    def dereference(ref_schema, ref_stack, parent_ref: nil)
       ref = ref_schema.reference
 
+      # Some schemas don't have a reference, but do
+      # have children. If that's the case, we need to
+      # dereference the subschemas.
+      if !ref
+        schema_children(ref_schema) do |subschema|
+          next unless subschema.reference
+
+          if !subschema.reference.uri && parent_ref
+            subschema.reference = JsonReference::Reference.new("#{parent_ref.uri}#{subschema.reference.pointer}")
+          end
+
+          dereference(subschema, ref_stack)
+        end
+        return true
+      end
+
       # detects a reference cycle
       if ref_stack.include?(ref)
         message = %{Reference loop detected: #{ref_stack.sort.join(", ")}.}
@@ -110,22 +126,33 @@ module JsonSchema
       # 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
 
-          if !subschema.reference.uri
-            # 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}#{subschema.reference.pointer}")
+          if subschema.reference
+            # If the subschema has a reference, then
+            # we don't need to recurse if the schema is
+            # already expanded.
+            next if subschema.expanded?
+
+            if !subschema.reference.uri
+              # 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}#{subschema.reference.pointer}")
+            end
           end
-          dereference(subschema, ref_stack)
+
+          # If we're recursing into a schema via a global reference, then if
+          # the current subschema doesn't have a reference, we have no way of
+          # figuring out what schema we're in. The resolve_pointer method will
+          # default to looking it up in the initial schema. Instead, we're
+          # passing the parent ref here, so we can grab the URI
+          # later if needed.
+          dereference(subschema, ref_stack, parent_ref: ref)
         end
       end
 

data/test/json_schema/reference_expander_test.rb

@@ -320,6 +320,104 @@ describe JsonSchema::ReferenceExpander do
     assert_equal 3, schema1.properties["foo"].properties["omg"].max_length
   end
 
+  it "it handles oneOf with nested references to an external schema" do
+    sample1 = {
+      "$schema" => "http://json-schema.org/draft-04/hyper-schema",
+      "type" => "object",
+      "properties" => {
+        "foo" => {
+          "$ref" => "http://json-schema.org/b.json#"
+        }
+      }
+    }
+    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",
+      "properties" => {
+        "bar" => {
+          "oneOf" => [
+            {"type" => "null"},
+            {"$ref" => "http://json-schema.org/c.json#"}
+          ]
+        }
+      },
+    }
+    schema2 = JsonSchema::Parser.new.parse!(sample2)
+    schema2.uri = "http://json-schema.org/b.json"
+
+    sample3 = {
+      "$schema" => "http://json-schema.org/draft-04/hyper-schema",
+      "type" => "object",
+      "properties" => {
+        "baz" => {
+          "type" => "string",
+          "maxLength" => 3
+        }
+      }
+    }
+    schema3 = JsonSchema::Parser.new.parse!(sample3)
+    schema3.uri = "http://json-schema.org/c.json"
+
+    # Initialize a store and add our schema to it.
+    store = JsonSchema::DocumentStore.new
+    store.add_schema(schema1)
+    store.add_schema(schema2)
+    store.add_schema(schema3)
+
+    expander = JsonSchema::ReferenceExpander.new
+    expander.expand(schema1, store: store)
+
+    assert_equal 3, schema1.properties["foo"].properties["bar"].one_of[1].properties["baz"].max_length
+  end
+
+  it "it handles oneOf with nested references to a local schema" do
+    sample1 = {
+      "$schema" => "http://json-schema.org/draft-04/hyper-schema",
+      "type" => "object",
+      "properties" => {
+        "foo" => {
+          "$ref" => "http://json-schema.org/b.json#"
+        }
+      }
+    }
+    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" => {
+        "baz" => {
+          "type" => "string",
+          "maxLength" => 3
+        }
+      },
+      "properties" => {
+        "bar" => {
+          "oneOf" => [
+            {"type" => "null"},
+            {"$ref" => "#/definitions/baz"}
+          ]
+        }
+      },
+    }
+    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)
+
+    assert_equal 3, schema1.properties["foo"].properties["bar"].one_of[1].max_length
+  end
+
   it "expands a schema with a reference to an external schema with a nested local property reference" do
     sample1 = {
       "$schema" => "http://json-schema.org/draft-04/hyper-schema",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.20.3
+  version: 0.20.4
 platform: ruby
 authors:
 - Brandur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-23 00:00:00.000000000 Z
+date: 2019-03-12 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A JSON Schema V4 and Hyperschema V4 parser and validator.