json-schema 2.0.1 → 2.0.2

data/README.textile

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

data/lib/json-schema/attributes/maxitems.rb

@@ -3,10 +3,10 @@ module JSON
     class MaxItemsAttribute < Attribute
       def self.validate(current_schema, data, fragments, processor, validator, options = {})
         if data.is_a?(Array) && (data.compact.size > current_schema.schema['maxItems'])
-          message = "The property '#{build_fragment(fragments)}' did not contain a minimum number of items #{current_schema.schema['minItems']}"
+          message = "The property '#{build_fragment(fragments)}' had more items than the allowed #{current_schema.schema['maxItems']}"
           validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
         end
       end
     end
   end
-end
+end

data/lib/json-schema/validator.rb

@@ -233,8 +233,14 @@ module JSON
       if parent_schema.schema["$ref"]
         load_ref_schema(parent_schema, parent_schema.schema["$ref"])
       end
-      if parent_schema.schema["extends"] && parent_schema.schema["extends"].is_a?(String)
-        load_ref_schema(parent_schema, parent_schema.schema["extends"])
+      if parent_schema.schema["extends"]
+        if parent_schema.schema["extends"].is_a?(String)
+          load_ref_schema(parent_schema, parent_schema.schema["extends"])
+        elsif parent_schema.schema["extends"].is_a?(Array)
+          parent_schema.schema["extends"].each do |type|
+            handle_schema(parent_schema, type)
+          end
+        end
       end
 
       # Check for schemas in union types

data/test/schemas/good_schema_extends1.json

@@ -0,0 +1,10 @@
+{
+  "$schema" : "http://json-schema.org/draft-03/schema#",
+  "type" : "object",
+  "extends": {"$ref": "good_schema_1.json"},
+  "properties" : {
+    "c" : {
+      "required" : false
+    }
+  }
+}

data/test/schemas/good_schema_extends2.json

@@ -0,0 +1,13 @@
+{
+  "$schema" : "http://json-schema.org/draft-03/schema#",
+  "type" : "object",
+  "extends": [
+    {"$ref": "good_schema_1.json"},
+    {"$ref": "good_schema_2.json"}
+  ],
+  "properties" : {
+    "c" : {
+      "required" : false
+    }
+  }
+}

data/test/test_files_v3.rb

@@ -40,4 +40,13 @@ class JSONSchemaTest < Test::Unit::TestCase
     data = {"b" => {"a" => "boo"}}
     assert(!JSON::Validator.validate(File.join(File.dirname(__FILE__),"schemas/good_schema_1.json"),data))
   end
+
+  def test_file_extends
+    data = {"a" => 5}
+    assert(JSON::Validator.validate(File.join(File.dirname(__FILE__),"schemas/good_schema_extends1.json"),data))
+
+    data = {"a" => 5, "b" => {"a" => 5}}
+    assert(JSON::Validator.validate(File.join(File.dirname(__FILE__),"schemas/good_schema_extends2.json"),data))
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: hoxworth@gmail.com
@@ -87,6 +87,8 @@ files:
 - test/schemas/extends_and_additionalProperties-2-ref.schema.json
 - test/schemas/good_schema_1.json
 - test/schemas/good_schema_2.json
+- test/schemas/good_schema_extends1.json
+- test/schemas/good_schema_extends2.json
 - test/schemas/inner.schema.json
 homepage: http://github.com/hoxworth/json-schema/tree/master
 licenses: []
@@ -130,4 +132,6 @@ test_files:
 - test/schemas/extends_and_additionalProperties-2-ref.schema.json
 - test/schemas/good_schema_1.json
 - test/schemas/good_schema_2.json
+- test/schemas/good_schema_extends1.json
+- test/schemas/good_schema_extends2.json
 - test/schemas/inner.schema.json