json-schema 2.1.2 → 2.1.3

data/README.textile

@@ -22,7 +22,7 @@ From the git repo:
 
 <pre>
 $ gem build json-schema.gemspec
-$ gem install json-schema-2.1.2.gem
+$ gem install json-schema-2.1.3.gem
 </pre>
 
 

data/lib/json-schema/validator.rb

@@ -277,6 +277,15 @@ module JSON
         end
       end
 
+      # handle validations that always contain schemas
+      ["allOf", "anyOf", "oneOf", "not"].each do |key|
+        if parent_schema.schema.has_key?(key)
+          validations = parent_schema.schema[key]
+          validations = [validations] unless validations.is_a?(Array)
+          validations.each {|v| handle_schema(parent_schema, v) }
+        end
+      end
+
       # Check for schemas in union types
       ["type", "disallow"].each do |key|
         if parent_schema.schema[key] && parent_schema.schema[key].is_a?(Array)

data/test/data/any_of_ref_data.json

@@ -0,0 +1,7 @@
+{
+  "names" :
+    [ "john"
+    , "jane"
+    , "jimmy"
+    ]
+}

data/test/schemas/any_of_ref_jane_schema.json

@@ -0,0 +1,4 @@
+{ "$schema" : "http://json-schema.org/draft-04/schema#"
+, "type" : "string"
+, "pattern" : "jane"
+}

data/test/schemas/any_of_ref_jimmy_schema.json

@@ -0,0 +1,4 @@
+{ "$schema" : "http://json-schema.org/draft-04/schema#"
+, "type" : "string"
+, "pattern" : "jimmy"
+}

data/test/schemas/any_of_ref_john_schema.json

@@ -0,0 +1,4 @@
+{ "$schema" : "http://json-schema.org/draft-04/schema#"
+, "type" : "string"
+, "pattern" : "john"
+}

data/test/schemas/any_of_ref_schema.json

@@ -0,0 +1,15 @@
+{ "$schema" : "http://json-schema.org/draft-04/schema#"
+, "type" : "object"
+, "properties" :
+  { "names" :
+    { "type" : "array"
+    , "items" :
+      { "anyOf" :
+        [ { "$ref" : "any_of_ref_john_schema.json" }
+        , { "$ref" : "any_of_ref_jane_schema.json" }
+        , { "$ref" : "any_of_ref_jimmy_schema.json" }
+        ]
+      }
+    }
+  }
+}

data/test/test_any_of_ref_schema.rb

@@ -0,0 +1,11 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/json-schema'
+
+class AnyOfRefSchemaTest < Test::Unit::TestCase
+  def test_all_of_ref_schema
+    schema = File.join(File.dirname(__FILE__),"schemas/any_of_ref_schema.json")
+    data = File.join(File.dirname(__FILE__),"data/any_of_ref_data.json")
+    errors = JSON::Validator.fully_validate(schema,data, :errors_as_objects => true)
+    assert(errors.empty?, errors.map{|e| e[:message] }.join("\n"))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: hoxworth@gmail.com
@@ -71,6 +71,7 @@ files:
 - README.textile
 - LICENSE.md
 - test/schemas/test_fragment_resolution.rb
+- test/test_any_of_ref_schema.rb
 - test/test_extended_schema.rb
 - test/test_extends_and_additionalProperties.rb
 - test/test_files_v3.rb
@@ -82,8 +83,13 @@ files:
 - test/test_ruby_schema.rb
 - test/test_schema_type_attribute.rb
 - test/test_schema_validation.rb
+- test/data/any_of_ref_data.json
 - test/data/bad_data_1.json
 - test/data/good_data_1.json
+- test/schemas/any_of_ref_jane_schema.json
+- test/schemas/any_of_ref_jimmy_schema.json
+- test/schemas/any_of_ref_john_schema.json
+- test/schemas/any_of_ref_schema.json
 - test/schemas/extends_and_additionalProperties-1-filename.schema.json
 - test/schemas/extends_and_additionalProperties-1-ref.schema.json
 - test/schemas/extends_and_additionalProperties-2-filename.schema.json
@@ -119,6 +125,7 @@ specification_version: 3
 summary: Ruby JSON Schema Validator
 test_files:
 - test/schemas/test_fragment_resolution.rb
+- test/test_any_of_ref_schema.rb
 - test/test_extended_schema.rb
 - test/test_extends_and_additionalProperties.rb
 - test/test_files_v3.rb
@@ -130,8 +137,13 @@ test_files:
 - test/test_ruby_schema.rb
 - test/test_schema_type_attribute.rb
 - test/test_schema_validation.rb
+- test/data/any_of_ref_data.json
 - test/data/bad_data_1.json
 - test/data/good_data_1.json
+- test/schemas/any_of_ref_jane_schema.json
+- test/schemas/any_of_ref_jimmy_schema.json
+- test/schemas/any_of_ref_john_schema.json
+- test/schemas/any_of_ref_schema.json
 - test/schemas/extends_and_additionalProperties-1-filename.schema.json
 - test/schemas/extends_and_additionalProperties-1-ref.schema.json
 - test/schemas/extends_and_additionalProperties-2-filename.schema.json