json_schema 0.13.4 → 0.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f66751bcac58d7b1dc4b2cfbe37c0b9c9d588fa6
-  data.tar.gz: eb658403b9f8c3ad98f1830be57610e398ad3944
+  metadata.gz: 714bee88016f66e9aa064a65cbdcac3da544345c
+  data.tar.gz: ac1aee2ff1cfc8fdfc8733782eba71485d473588
 SHA512:
-  metadata.gz: 184db105da05420130fb953b4cd90c41282f0f6963f03a80823baff5a79216d247502113153276ce7b75cb41b2a2a5a1262e4f68ce26cd67d00f041aca5e4fba
-  data.tar.gz: 394c95fb5e5781ae828556758629a873666b0ec36f9e3ed15163d06fc8610713227a29a4a652702da0c3560cdf684624fd8b01beb483d4de207ed62ad5b98588
+  metadata.gz: c71070be974462466e3717a15d944e9c950a600ab0f3665fac62b5b6261acaa0ab27acbf75bdf53a998a2deb601e5bdb683784ff68627cef1e05afefe9c4c313
+  data.tar.gz: cc0418ca51ae31501d1480521d2d9f5ef91987f9ef4bf879c06729a23a29eeef20a52dc6b1c5fa81f403d76d5b799632687dd37907d2724b0de8f0daf69303f2

data/lib/json_schema/reference_expander.rb

@@ -11,7 +11,14 @@ module JsonSchema
       @schema       = schema
       @schema_paths = {}
       @store        = options[:store] || DocumentStore.new
-      @uri          = URI.parse(schema.uri)
+
+      # If the given JSON schema is _just_ a JSON reference and nothing else,
+      # short circuit the whole expansion process and return the result.
+      if schema.reference && !schema.expanded?
+        return dereference(schema, [])
+      end
+
+      @uri = URI.parse(schema.uri)
 
       @store.each do |uri, store_schema|
         build_schema_paths(uri, store_schema)

data/test/json_schema/reference_expander_test.rb

@@ -244,6 +244,27 @@ describe JsonSchema::ReferenceExpander do
     end
   end
 
+  it "expands a schema that is just a reference" do
+    # First initialize another schema. Give it a fully qualified URI so that we
+    # can reference it across schemas.
+    schema = JsonSchema::Parser.new.parse!(schema_sample)
+    schema.uri = "http://json-schema.org/test"
+
+    # Initialize a store and add our schema to it.
+    store = JsonSchema::DocumentStore.new
+    store.add_schema(schema)
+
+    # Have the parser parse _just_ a reference. It should resolve to a
+    # subschema in the schema that we initialized above.
+    schema = JsonSchema::Parser.new.parse!(
+      { "$ref" => "http://json-schema.org/test#/definitions/app" }
+    )
+    expander = JsonSchema::ReferenceExpander.new
+    expander.expand!(schema, store: store)
+
+    assert schema.expanded?
+  end
+
   def error_messages
     @expander.errors.map { |e| e.message }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.13.5
 platform: ruby
 authors:
 - Brandur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecma-re-validator