json-schema 2.1.1 → 2.1.2

data/README.textile

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

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

@@ -4,15 +4,15 @@ module JSON
       def self.validate(current_schema, data, fragments, processor, validator, options = {})
         if data.is_a?(Hash)
           current_schema.schema['dependencies'].each do |property,dependency_value|
-            if data.has_key?(property)
+            if data.has_key?(property.to_s) || data.has_key?(property.to_sym)
               if dependency_value.is_a?(String)
-                if !data.has_key?(dependency_value)
+                if !data.has_key?(dependency_value.to_s) && !data.has_key?(dependency_value.to_sym)
                   message = "The property '#{build_fragment(fragments)}' has a property '#{property}' that depends on a missing property '#{dependency_value}'"
                   validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
                 end
               elsif dependency_value.is_a?(Array)
                 dependency_value.each do |value|
-                  if !data.has_key?(value)
+                  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/dependencies_v4.rb

@@ -4,9 +4,9 @@ module JSON
       def self.validate(current_schema, data, fragments, processor, validator, options = {})
         if data.is_a?(Hash)
           current_schema.schema['dependencies'].each do |property,dependency_value|
-            if data.has_key?(property) && dependency_value.is_a?(Array)
+            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)
+                if !data.has_key?(value.to_s)
                   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

@@ -4,17 +4,21 @@ module JSON
       def self.validate(current_schema, data, fragments, processor, validator, options = {})
         if data.is_a?(Hash)
           current_schema.schema['properties'].each do |property,property_schema|
-            if !data.has_key?(property) and property_schema['default'] and !property_schema['readonly'] and options[:insert_defaults]
+            if !data.has_key?(property.to_s) &&
+               !data.has_key?(property.to_sym) &&
+               property_schema['default'] &&
+               !property_schema['readonly'] &&
+               options[:insert_defaults]
               default = property_schema['default']
               data[property] = (default.is_a?(Hash) ? default.clone : default)
             end
 
-            if property_schema['required'] and !data.has_key?(property)
+            if property_schema['required'] && !data.has_key?(property.to_s)
               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)
+            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)

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

@@ -4,12 +4,12 @@ module JSON
       def self.validate(current_schema, data, fragments, processor, validator, options = {})
         if data.is_a?(Hash)
           current_schema.schema['properties'].each do |property,property_schema|
-            if ((property_schema['optional'].nil? || property_schema['optional'] == false) && !data.has_key?(property))
+            if ((property_schema['optional'].nil? || property_schema['optional'] == false) && !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)
+
+            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)

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

@@ -4,12 +4,16 @@ module JSON
       def self.validate(current_schema, data, fragments, processor, validator, options = {})
         if data.is_a?(Hash)
           current_schema.schema['properties'].each do |property,property_schema|
-            if !data.has_key?(property) and property_schema['default'] and !property_schema['readonly'] and options[:insert_defaults]
+            if !data.has_key?(property.to_s) &&
+               !data.has_key?(property.to_sym) &&
+               property_schema['default'] &&
+               !property_schema['readonly'] &&
+               options[:insert_defaults]
               default = property_schema['default']
               data[property] = (default.is_a?(Hash) ? default.clone : default)
             end
 
-            if data.has_key?(property)
+            if data.has_key?(property.to_s)
               schema = JSON::Schema.new(property_schema,current_schema.uri,validator)
               fragments << property
               schema.validate(data[property],fragments,processor,options)

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

@@ -4,7 +4,7 @@ module JSON
       def self.validate(current_schema, data, fragments, processor, validator, options = {})
         if data.is_a?(Hash)
           current_schema.schema['required'].each do |property,property_schema|
-            if !data.has_key?(property)
+            if !data.has_key?(property.to_s) && !data.has_key?(property.to_sym)
               prop_defaults = options[:insert_defaults] &&
                               current_schema.schema['properties'] &&
                               current_schema.schema['properties'][property] &&

data/lib/json-schema/schema.rb

@@ -9,6 +9,8 @@ module JSON
       @schema = schema
       @uri = uri
 
+      self.class.add_indifferent_access(@schema)
+
       # If there is an ID on this schema, use it to generate the URI
       if @schema['id'] && @schema['id'].kind_of?(String)
         temp_uri = URI.parse(@schema['id'])
@@ -38,6 +40,25 @@ module JSON
       @validator.validate(self, data, fragments, processor, options)
     end
 
+    def self.add_indifferent_access(schema)
+      if schema.is_a?(Hash)
+        schema.default_proc = proc do |hash,key|
+          if hash.has_key?(key)
+            hash[key]
+          else
+            key = case key
+            when Symbol then key.to_s
+            when String then key.to_sym
+            end
+            hash.has_key?(key) ? hash[key] : nil
+          end
+        end
+        schema.keys.each do |key|
+          add_indifferent_access(schema[key])
+        end
+      end
+    end
+
     def base_uri
       parts = @uri.to_s.split('/')
       parts.pop

data/lib/json-schema/validator.rb

@@ -636,6 +636,7 @@ module JSON
           end
         end
       end
+      JSON::Schema.add_indifferent_access(data)
       data
     end
 

data/test/test_ruby_schema.rb

@@ -0,0 +1,38 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/json-schema'
+
+class RubySchemaTest < Test::Unit::TestCase
+  def test_string_keys
+    schema = {
+      "type" => 'object',
+      "required" => ["a"],
+      "properties" => {
+        "a" => {"type" => "integer", "default" => 42},
+        "b" => {"type" => "integer"}
+      }
+    }
+
+    data = {
+      "a" => 5
+    }
+
+    assert(JSON::Validator.validate(schema, data))
+  end
+
+  def test_symbol_keys
+    schema = {
+      type: 'object',
+      required: ["a"],
+      properties: {
+        a: {type: "integer", default: 42},
+        b: {type: "integer"}
+      }
+    }
+
+    data = {
+      a: 5
+    }
+
+    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.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: hoxworth@gmail.com
@@ -79,6 +79,7 @@ files:
 - test/test_jsonschema_draft2.rb
 - test/test_jsonschema_draft3.rb
 - test/test_jsonschema_draft4.rb
+- test/test_ruby_schema.rb
 - test/test_schema_type_attribute.rb
 - test/test_schema_validation.rb
 - test/data/bad_data_1.json
@@ -112,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby JSON Schema Validator
@@ -126,6 +127,7 @@ test_files:
 - test/test_jsonschema_draft2.rb
 - test/test_jsonschema_draft3.rb
 - test/test_jsonschema_draft4.rb
+- test/test_ruby_schema.rb
 - test/test_schema_type_attribute.rb
 - test/test_schema_validation.rb
 - test/data/bad_data_1.json