json-schema 2.1.5 → 2.1.6

data/README.textile

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

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

@@ -6,7 +6,7 @@ module JSON
           current_schema.schema['dependencies'].each do |property,dependency_value|
             if (data.has_key?(property.to_s) || data.has_key?(property.to_sym)) && dependency_value.is_a?(Array)
               dependency_value.each do |value|
-                if !data.has_key?(value.to_s)
+                if !data.has_key?(value.to_s) && !data.has_key?(value.to_sym)
                   message = "The property '#{build_fragment(fragments)}' has a property '#{property}' that depends on a missing property '#{value}'"
                   validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
                 end

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

@@ -10,18 +10,18 @@ module JSON
                !property_schema['readonly'] &&
                options[:insert_defaults]
               default = property_schema['default']
-              data[property] = (default.is_a?(Hash) ? default.clone : default)
+              data[property.to_s] = (default.is_a?(Hash) ? default.clone : default)
             end
 
-            if property_schema['required'] && !data.has_key?(property.to_s)
+            if property_schema['required'] && !data.has_key?(property.to_s) && !data.has_key?(property.to_sym)
               message = "The property '#{build_fragment(fragments)}' did not contain a required property of '#{property}'"
               validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
             end
 
             if data.has_key?(property.to_s) || data.has_key?(property.to_sym)
               schema = JSON::Schema.new(property_schema,current_schema.uri,validator)
-              fragments << property
-              schema.validate(data[property],fragments,processor,options)
+              fragments << property.to_s
+              schema.validate(data[property.to_s],fragments,processor,options)
               fragments.pop
             end
           end

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

@@ -10,13 +10,13 @@ module JSON
                !property_schema['readonly'] &&
                options[:insert_defaults]
               default = property_schema['default']
-              data[property] = (default.is_a?(Hash) ? default.clone : default)
+              data[property.to_s] = (default.is_a?(Hash) ? default.clone : default)
             end
 
-            if data.has_key?(property.to_s)
+            if data.has_key?(property.to_s) || data.has_key?(property.to_sym)
               schema = JSON::Schema.new(property_schema,current_schema.uri,validator)
-              fragments << property
-              schema.validate(data[property],fragments,processor,options)
+              fragments << property.to_s
+              schema.validate(data[property.to_s],fragments,processor,options)
               fragments.pop
             end
           end

data/test/test_ruby_schema.rb

@@ -34,5 +34,11 @@ class RubySchemaTest < Test::Unit::TestCase
     }
 
     assert(JSON::Validator.validate(schema, data))
+
+    data = {
+      a: false
+    }
+
+    assert(!JSON::Validator.validate(schema, data))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
   prerelease: 
 platform: ruby
 authors: