json_schema 0.20.4 → 0.20.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b59e2abb8260fc05004ddde201c9107a0be38149e0dbf9aff1f3d774e5d5ae8
-  data.tar.gz: b40758dada1ba42ac46f7aa45c9370eae4d9ef5178126813fff6ba6ad8ab0ece
+  metadata.gz: 6f22094d77a8c40595f358c40c431ce2b86e694403bf310854046e069377dc83
+  data.tar.gz: 131983e9114e14eb15d87de99571631644827fbe40927f1a9912443343c474e7
 SHA512:
-  metadata.gz: e06bc21c170498b1bcb09b1142a1971b64c8c9e376b395e72017d0aab538eacf54c1061e1a09be7e633734f75706fafe399b9272d9ac633fc7976b4d8084decc
-  data.tar.gz: 98cb1d66418ebcdfe94367c01e946c210f7f79ffa89ee3daa609876398753cb7239c9e8f189087f01f81d33b55f4f038764d21d8da64049c6cc5dfd0034606aa
+  metadata.gz: d8dd23eb8a3e81fa88b4fe77d03b46289f687827c6eb92db29cce1daf41d1fe154a20840e918cb1be0580746929a2db68515795be6f1746fa9f0c649ecd15a2c
+  data.tar.gz: 2b7e8a4c19049c24fde7faa579bf7c21f1e650b5e9ba1a72b83b5cf899f560ef92b9d8883585adc1b663fa005e3d9980412f536bc988c7af97080ee74471579c

data/lib/json_schema/reference_expander.rb

@@ -146,6 +146,17 @@ module JsonSchema
             end
           end
 
+          if subschema.items && subschema.items.reference
+            next if subschema.expanded?
+
+            if !subschema.items.reference.uri
+              # The subschema's ref is local to the file that the
+              # subschema is in. Manually reconstruct the reference
+              # so we can resolve it.
+              subschema.items.reference = JsonReference::Reference.new("#{ref.uri}#{subschema.items.reference.pointer}")
+            end
+          end
+
           # 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

data/test/json_schema/reference_expander_test.rb

@@ -265,6 +265,87 @@ describe JsonSchema::ReferenceExpander do
     assert schema.expanded?
   end
 
+  it "expands a schema with a reference to an external schema in a oneOf array" do
+    sample1 = {
+      "$schema" => "http://json-schema.org/draft-04/schema#",
+      "id" => "http://json-schema.org/draft-04/schema#",
+      "definitions" => {
+        "schemaArray" => {
+          "type" => "array",
+          "minItems" => 1,
+          "items" => { "$ref" => "#" }
+        }
+      }
+    }
+    schema1 = JsonSchema::Parser.new.parse!(sample1)
+
+    sample2 = {
+      "$schema" => "http://json-schema.org/draft-04/hyper-schema#",
+      "id" => "http://json-schema.org/draft-04/hyper-schema#",
+      "allOf" => [
+        {
+          "$ref" => "http://json-schema.org/draft-04/schema#"
+        }
+      ]
+    }
+    schema2 = JsonSchema::Parser.new.parse!(sample2)
+
+    store = JsonSchema::DocumentStore.new
+    expander = JsonSchema::ReferenceExpander.new
+
+    store.add_schema(schema1)
+    store.add_schema(schema2)
+
+    expander.expand!(schema2, store: store)
+
+    assert schema1.expanded?
+    assert schema2.expanded?
+  end
+
+  it "expands a schema with a nested reference to an external schema in a oneOf array" do
+    sample1 = {
+      "$schema" => "http://json-schema.org/draft-04/schema#",
+      "id" => "http://json-schema.org/draft-04/schema#",
+      "definitions" => {
+        "thingy" => {
+          "type" => ["string"]
+        },
+        "schemaArray" => {
+          "type" => "array",
+          "minItems" => 1,
+          "items" => { "$ref" => "#/definitions/thingy" }
+        }
+      },
+      "properties" => {
+        "whatsit" => {
+          "$ref" => "#/definitions/schemaArray"
+        },
+      }
+    }
+    schema1 = JsonSchema::Parser.new.parse!(sample1)
+
+    sample2 = {
+      "$schema" => "http://json-schema.org/draft-04/hyper-schema#",
+      "id" => "http://json-schema.org/draft-04/hyper-schema#",
+      "allOf" => [
+        {
+          "$ref" => "http://json-schema.org/draft-04/schema#"
+        }
+      ]
+    }
+    schema2 = JsonSchema::Parser.new.parse!(sample2)
+
+    store = JsonSchema::DocumentStore.new
+    expander = JsonSchema::ReferenceExpander.new
+
+    store.add_schema(schema1)
+    store.add_schema(schema2)
+
+    expander.expand!(schema2, store: store)
+
+    assert_equal ["string"], schema2.all_of[0].properties["whatsit"].items.type
+  end
+
   it "expands a schema with a reference to an external schema with a nested external 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.4
+  version: 0.20.5
 platform: ruby
 authors:
 - Brandur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2019-05-07 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.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A JSON Schema V4 and Hyperschema V4 parser and validator.