json-schema 2.4.0 → 2.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjMyNzMwODM4YmUyNjNkZjBhNzkzN2E4M2MxYTM2YzhiMzg4MzZlYw==
+    ZTc1NDAxODkxMmNiYTQ4YzdiMzNkMWEyYjlhYTQ5MTU5MWExMTFhZQ==
   data.tar.gz: !binary |-
-    ZWY0NWQ1ZWRlMzVlNTI4N2NhYjk0ZGM4OGIxMzMzNzU5NGE2ZmEwYg==
+    ZmQxNjIyOTU5ZGQyZGQ5ZDIxYmYxMGQwMGIzYjliMDMyYjQ5Y2EwMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDE3Yzc0MmYwNmFkNjUzYmNiYTFhYjg4ODY5MzZjODgyZWIyODBkYWUwZjJh
-    NjJjODk4MGFhNTFlOTkyOTZkYTQ5ODQ2YjYxYjJjZGNjZWIxOTcxNzEyMmYy
-    NzI2MDcwNGU5Mzg0N2IyYzU5NzU0NThkMTNjZjFmZDVhZGNiNjc=
+    YjVlZjkzNWE5YTA3MjhlNTY0ZmMyMGRiNGE0YzYwODE1N2I3ZTFhMTAzYjQ1
+    NTJjZGU2ZTE1OTg3NDJjNThhYzAwMGRiYzZiMzIzZWJiODRmNzA5NjVjMzAw
+    ZTE4MjdjYzE3NGQ0ZjlhYmQ3NWViZjVmOWNhYzc2YjY2NWNlYTU=
   data.tar.gz: !binary |-
-    ZDJjNzIyZDg0NDUxODQyZjM4MzZkNWUxOWViYTA3MDM4MjdmN2Q2ZjBkOTBi
-    NzllYzUyNDc5MDZkZmM0M2U3NmFiZDc5Njk3YTYxNzBiMjYwYjIwMjZmZWY0
-    M2QxMzIwN2EzOTUxNWRjZmQ5ZGQwZTEwNjBjMDVjZTBlNTAxZWE=
+    ODA4M2U2YTkyMmM1NjhlMTUyN2M3NjJiODI3ZmUzMzNhYTFkNTE1YmRkYWM4
+    MWNiODZlYmQ3YjdkY2M4ZDk3ZDVkNTZlYmJkNmNjNWVjODhjOWQxNzA5MmU2
+    YjQwMDBmMjZmODdkOTI5YjBjMzUxMGJiOWNjY2JmNzZlZWZhYjY=

data/README.textile

@@ -25,7 +25,7 @@ From the git repo:
 
 <pre>
 $ gem build json-schema.gemspec
-$ gem install json-schema-2.4.0.gem
+$ gem install json-schema-2.4.1.gem
 </pre>
 
 

data/lib/json-schema.rb

@@ -8,7 +8,6 @@ if Gem::Specification::find_all_by_name('multi_json').any?
   MultiJson.respond_to?(:adapter) ? MultiJson.adapter : MultiJson.engine
 end
 
-require 'json-schema/util/hash'
 require 'json-schema/util/array_set'
 require 'json-schema/schema'
 require 'json-schema/validator'

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

@@ -6,15 +6,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.to_s) || data.has_key?(property.to_sym)
+            if data.has_key?(property.to_s)
               if dependency_value.is_a?(String)
-                if !data.has_key?(dependency_value.to_s) && !data.has_key?(dependency_value.to_sym)
+                if !data.has_key?(dependency_value.to_s)
                   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.to_s) && !data.has_key?(value.to_sym)
+                  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/dependencies_v4.rb

@@ -6,10 +6,10 @@ 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.to_s) || data.has_key?(property.to_sym))
+            if data.has_key?(property.to_s)
               if dependency_value.is_a?(Array)
                 dependency_value.each do |value|
-                  if !data.has_key?(value.to_s) && !data.has_key?(value.to_sym)
+                  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

@@ -7,7 +7,6 @@ module JSON
         if data.is_a?(Hash)
           current_schema.schema['properties'].each do |property,property_schema|
             if !data.has_key?(property.to_s) &&
-               !data.has_key?(property.to_sym) &&
                property_schema['default'] &&
                !property_schema['readonly'] &&
                options[:insert_defaults]
@@ -15,13 +14,12 @@ module JSON
               data[property.to_s] = (default.is_a?(Hash) ? default.clone : default)
             end
 
-            if property_schema.fetch('required') { options[:strict] } &&
-               !data.has_key?(property.to_s) && !data.has_key?(property.to_sym)
+            if property_schema.fetch('required') { options[:strict] } && !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.to_s) || data.has_key?(property.to_sym)
+            if data.has_key?(property.to_s)
               schema = JSON::Schema.new(property_schema,current_schema.uri,validator)
               fragments << property.to_s
               schema.validate(data[property.to_s],fragments,processor,options)
@@ -42,9 +40,9 @@ module JSON
                   end
                 end
 
-                !current_schema.schema['properties'].has_key?(k.to_s) && !current_schema.schema['properties'].has_key?(k.to_sym) && !match
+                !current_schema.schema['properties'].has_key?(k.to_s) && !match
               else
-                !current_schema.schema['properties'].has_key?(k.to_s) && !current_schema.schema['properties'].has_key?(k.to_sym)
+                !current_schema.schema['properties'].has_key?(k.to_s)
               end
             end
 

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

@@ -6,12 +6,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.to_s) && !data.has_key?(property.to_sym))
+            if (property_schema['optional'].nil? || property_schema['optional'] == false) && !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.to_s) || data.has_key?(property.to_sym)
+            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/properties_v4.rb

@@ -7,7 +7,6 @@ module JSON
         if data.is_a?(Hash)
           current_schema.schema['properties'].each do |property,property_schema|
             if !data.has_key?(property.to_s) &&
-               !data.has_key?(property.to_sym) &&
                property_schema['default'] &&
                !property_schema['readonly'] &&
                options[:insert_defaults]
@@ -15,12 +14,12 @@ module JSON
               data[property.to_s] = (default.is_a?(Hash) ? default.clone : default)
             end
 
-            if (options[:strict] == true && !data.has_key?(property.to_s) && !data.has_key?(property.to_sym))
+            if options[:strict] == true && !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.to_s) || data.has_key?(property.to_sym)
+            if data.has_key?(property.to_s)
               schema = JSON::Schema.new(property_schema,current_schema.uri,validator)
               fragments << property.to_s
               schema.validate(data[property.to_s],fragments,processor,options)
@@ -42,9 +41,9 @@ module JSON
                 end
               end
 
-              !current_schema.schema['properties'].has_key?(k.to_s) && !current_schema.schema['properties'].has_key?(k.to_sym) && !match
+              !current_schema.schema['properties'].has_key?(k.to_s) && !match
             else
-              !current_schema.schema['properties'].has_key?(k.to_s) && !current_schema.schema['properties'].has_key?(k.to_sym)
+              !current_schema.schema['properties'].has_key?(k.to_s)
             end
           end
 

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

@@ -6,7 +6,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.to_s) && !data.has_key?(property.to_sym)
+            if !data.has_key?(property.to_s)
               prop_defaults = options[:insert_defaults] &&
                               current_schema.schema['properties'] &&
                               current_schema.schema['properties'][property] &&

data/lib/json-schema/schema.rb

@@ -6,11 +6,9 @@ module JSON
     attr_accessor :schema, :uri, :validator
 
     def initialize(schema,uri,parent_validator=nil)
-      @schema = schema
+      @schema = self.class.stringify(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'])
@@ -36,26 +34,18 @@ 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
-      elsif schema.is_a?(Array)
-        schema.each do |schema_item|
-          add_indifferent_access(schema_item)
+    def self.stringify(schema)
+      case schema
+      when Hash then
+        Hash[schema.map { |key, value| [key.to_s, stringify(schema[key])] }]
+      when Array then
+        schema.map do |schema_item|
+          stringify(schema_item)
         end
+      when Symbol then
+        schema.to_s
+      else
+        schema
       end
     end
 

data/lib/json-schema/validator.rb

@@ -45,6 +45,7 @@ module JSON
       @validation_options[:strict] = true if @options[:strict] == true
 
       @@mutex.synchronize { @base_schema = initialize_schema(schema_data) }
+      @original_data = data
       @data = initialize_data(data)
       @@mutex.synchronize { build_schemas(@base_schema) }
 
@@ -106,21 +107,18 @@ module JSON
 
     # Run a simple true/false validation of data against a schema
     def validate()
-      begin
-        @base_schema.validate(@data,[],self,@validation_options)
-        if @validation_options[:clear_cache] == true
-          Validator.clear_cache
-        end
-        if @options[:errors_as_objects]
-          return @errors.map{|e| e.to_hash}
-        else
-          return @errors.map{|e| e.to_string}
-        end
-      rescue JSON::Schema::ValidationError
-        if @validation_options[:clear_cache] == true
-          Validator.clear_cache
-        end
-        raise $!
+      @base_schema.validate(@data,[],self,@validation_options)
+      if @options[:errors_as_objects]
+        return @errors.map{|e| e.to_hash}
+      else
+        return @errors.map{|e| e.to_string}
+      end
+    ensure
+      if @validation_options[:clear_cache] == true
+        Validator.clear_cache
+      end
+      if @validation_options[:insert_defaults]
+        JSON::Validator.merge_missing_values(@data, @original_data)
       end
     end
 
@@ -425,6 +423,25 @@ module JSON
         end
       end
 
+      def merge_missing_values(source, destination)
+        case destination
+        when Hash
+          source.each do |key, source_value|
+            destination_value = destination[key] || destination[key.to_sym]
+            if destination_value.nil?
+              destination[key] = source_value
+            else
+              merge_missing_values(source_value, destination_value)
+            end
+          end
+        when Array
+          source.each_with_index do |source_value, i|
+            destination_value = destination[i]
+            merge_missing_values(source_value, destination_value)
+          end
+        end
+      end
+
       if !defined?(MultiJson)
         if Gem::Specification::find_all_by_name('json').any?
           require 'json'
@@ -560,8 +577,7 @@ module JSON
           end
         end
       end
-      JSON::Schema.add_indifferent_access(data)
-      data
+      JSON::Schema.stringify(data)
     end
 
     def normalized_uri(data)

data/test/test_jsonschema_draft3.rb

@@ -1210,11 +1210,12 @@ class JSONSchemaDraft3Test < Test::Unit::TestCase
       }
     }
 
-    data = {"b" => 2}
+    data = {:b => 2}
     assert(JSON::Validator.validate(schema,data))
     assert_nil(data["a"])
     assert(JSON::Validator.validate(schema,data, :insert_defaults => true))
     assert_equal(42, data["a"])
+    assert_equal(2, data[:b])
 
     schema = {
       "$schema" => "http://json-schema.org/draft-03/schema#",
@@ -1225,21 +1226,12 @@ class JSONSchemaDraft3Test < Test::Unit::TestCase
       }
     }
 
-    data = {"b" => 2}
+    data = {:b => 2}
     assert(!JSON::Validator.validate(schema,data))
     assert_nil(data["a"])
     assert(JSON::Validator.validate(schema,data, :insert_defaults => true))
     assert_equal(42, data["a"])
-
-    schema = {
-      "$schema" => "http://json-schema.org/draft-03/schema#",
-      "type" => "object",
-      "properties" => {
-        "a" => {"type" => "integer", "default" => 42, "required" => true},
-        "b" => {"type" => "integer"}
-      }
-    }
-
+    assert_equal(2, data[:b])
 
     schema = {
       "$schema" => "http://json-schema.org/draft-03/schema#",
@@ -1250,11 +1242,12 @@ class JSONSchemaDraft3Test < Test::Unit::TestCase
       }
     }
 
-    data = {"b" => 2}
+    data = {:b => 2}
     assert(!JSON::Validator.validate(schema,data))
     assert_nil(data["a"])
     assert(!JSON::Validator.validate(schema,data, :insert_defaults => true))
     assert_nil(data["a"])
+    assert_equal(2, data[:b])
 
     schema = {
       "$schema" => "http://json-schema.org/draft-03/schema#",
@@ -1265,11 +1258,12 @@ class JSONSchemaDraft3Test < Test::Unit::TestCase
       }
     }
 
-    data = {"b" => 2}
+    data = {:b => 2}
     assert(JSON::Validator.validate(schema,data))
     assert_nil(data["a"])
     assert(!JSON::Validator.validate(schema,data, :insert_defaults => true))
     assert_equal("42",data["a"])
+    assert_equal(2, data[:b])
 
   end
 

data/test/test_jsonschema_draft4.rb

@@ -1096,11 +1096,12 @@ class JSONSchemaDraft4Test < Test::Unit::TestCase
       }
     }
 
-    data = {"b" => 2}
+    data = {:b => 2}
     assert(JSON::Validator.validate(schema,data))
     assert_nil(data["a"])
     assert(JSON::Validator.validate(schema,data, :insert_defaults => true))
     assert_equal(42, data["a"])
+    assert_equal(2, data[:b])
 
     schema = {
       "$schema" => "http://json-schema.org/draft-04/schema#",
@@ -1112,22 +1113,12 @@ class JSONSchemaDraft4Test < Test::Unit::TestCase
       }
     }
 
-    data = {"b" => 2}
+    data = {:b => 2}
     assert(!JSON::Validator.validate(schema,data))
     assert_nil(data["a"])
     assert(JSON::Validator.validate(schema,data, :insert_defaults => true))
     assert_equal(42, data["a"])
-
-    schema = {
-      "$schema" => "http://json-schema.org/draft-04/schema#",
-      "type" => "object",
-      "required" => ["a"],
-      "properties" => {
-        "a" => {"type" => "integer", "default" => 42},
-        "b" => {"type" => "integer"}
-      }
-    }
-
+    assert_equal(2, data[:b])
 
     schema = {
       "$schema" => "http://json-schema.org/draft-04/schema#",
@@ -1139,11 +1130,12 @@ class JSONSchemaDraft4Test < Test::Unit::TestCase
       }
     }
 
-    data = {"b" => 2}
+    data = {:b => 2}
     assert(!JSON::Validator.validate(schema,data))
     assert_nil(data["a"])
     assert(!JSON::Validator.validate(schema,data, :insert_defaults => true))
     assert_nil(data["a"])
+    assert_equal(2, data[:b])
 
     schema = {
       "$schema" => "http://json-schema.org/draft-04/schema#",
@@ -1154,11 +1146,12 @@ class JSONSchemaDraft4Test < Test::Unit::TestCase
       }
     }
 
-    data = {"b" => 2}
+    data = {:b => 2}
     assert(JSON::Validator.validate(schema,data))
     assert_nil(data["a"])
     assert(!JSON::Validator.validate(schema,data, :insert_defaults => true))
     assert_equal("42",data["a"])
+    assert_equal(2, data[:b])
 
   end
 
@@ -1318,7 +1311,6 @@ class JSONSchemaDraft4Test < Test::Unit::TestCase
 
     data = {"a" => 1}
     errors = JSON::Validator.fully_validate(schema,data)
-    puts errors
     assert_equal(0, errors.length)
 
     data = {"a" => "taco"}

data/test/test_merge_misisng_values.rb

@@ -0,0 +1,46 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/json-schema'
+
+class MergeMissingValuesTest < Test::Unit::TestCase
+  def test_merge_missing_values_for_string
+    original = 'foo'
+    updated = 'foo'
+    JSON::Validator.merge_missing_values(updated, original)
+    assert_equal('foo', original)
+  end
+
+  def test_merge_missing_values_for_empty_array
+    original = []
+    updated = []
+    JSON::Validator.merge_missing_values(updated, original)
+    assert_equal([], original)
+  end
+
+  def test_merge_missing_values_for_empty_hash
+    original = {}
+    updated = {}
+    JSON::Validator.merge_missing_values(updated, original)
+    assert_equal({}, original)
+  end
+
+  def test_merge_missing_values_for_new_values
+    original = {:hello => 'world'}
+    updated = {'hello' => 'world', 'foo' => 'bar'}
+    JSON::Validator.merge_missing_values(updated, original)
+    assert_equal({:hello => 'world', 'foo' => 'bar'}, original)
+  end
+
+  def test_merge_missing_values_for_nested_array
+    original = [:hello, 'world', 1, 2, 3, {:foo => :bar, 'baz' => 'qux'}]
+    updated = ['hello', 'world', 1, 2, 3, {'foo' => 'bar', 'baz' => 'qux', 'this_is' => 'new'}]
+    JSON::Validator.merge_missing_values(updated, original)
+    assert_equal([:hello, 'world', 1, 2, 3, {:foo => :bar, 'baz' => 'qux', 'this_is' => 'new'}], original)
+  end
+
+  def test_merge_missing_values_for_nested_hash
+    original = {:hello => 'world', :foo => ['bar', :baz, {:uno => {:due => 3}}]}
+    updated = {'hello' => 'world', 'foo' => ['bar', 'baz', {'uno' => {'due' => 3, 'this_is' => 'new'}}], 'ack' => 'sed'}
+    JSON::Validator.merge_missing_values(updated, original)
+    assert_equal({:hello => 'world', :foo => ['bar', :baz, {:uno => {:due => 3, 'this_is' => 'new'}}], 'ack' => 'sed'}, original)
+  end
+end

data/test/test_schema_validation.rb

@@ -47,6 +47,82 @@ class JSONSchemaValidation < Test::Unit::TestCase
     }
   end
 
+  def symbolized_schema
+    {
+      :type => :object,
+      :required => [
+        :id,
+        :name,
+        :real_name,
+        :role,
+        :website,
+        :biography,
+        :created_at,
+        :demographic
+      ],
+      :properties => {
+        :id => {
+          :type => [
+            :integer
+          ]
+        },
+        :name => {
+          :type => [
+            :string
+          ]
+        },
+        :real_name => {
+          :type => [
+            :string
+          ]
+        },
+        :role => {
+          :type => [
+            :string
+          ]
+        },
+        :website => {
+          :type => [
+            :string,
+            :null
+          ]
+        },
+        :created_at => {
+          :type => [
+            :string
+          ]
+        },
+        :biography => {
+          :type => [
+            :string,
+            :null
+          ]
+        }
+      },
+      :relationships => {
+        :demographic => {
+          :type => :object,
+          :required => [
+            :id,
+            :gender
+          ],
+          :properties => {
+            :id => {
+              :type => [
+                :integer
+              ]
+            },
+            :gender => {
+              :type => [
+                :string
+              ]
+            }
+          }
+        }
+      }
+    }
+  end
+
   def test_draft03_validation
     data = {"b" => {"a" => 5}}
     assert(JSON::Validator.validate(valid_schema_v3,data,:validate_schema => true, :version => :draft3))
@@ -93,4 +169,18 @@ class JSONSchemaValidation < Test::Unit::TestCase
       end
     end
   end
+
+  def test_validate_schema_with_symbol_keys
+    data = {
+      "created_at" => "2014-01-25T00:58:33-08:00",
+      "id" => 8517194300913402149003,
+      "name" => "chelsey",
+      "real_name" => "Mekhi Hegmann",
+      "website" => nil,
+      "role" => "user",
+      "biography" => nil,
+      "demographic" => nil
+    }
+    assert(JSON::Validator.validate!(symbolized_schema, data, :validate_schema => true))
+  end
 end

data/test/test_stringify.rb

@@ -0,0 +1,49 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/json-schema'
+
+class StringifyTest < Test::Unit::TestCase
+  def test_stringify_on_hash
+    hash = {
+      :a => 'foo',
+      'b' => :bar
+    }
+    assert_equal({'a' => 'foo', 'b' => 'bar'}, JSON::Schema.stringify(hash), 'symbol keys should be converted to strings')
+  end
+
+  def test_stringify_on_array
+    array = [
+      :a,
+      'b'
+    ]
+    assert_equal(['a', 'b'], JSON::Schema.stringify(array), 'symbols in an array should be converted to strings')
+  end
+
+  def test_stringify_on_hash_of_arrays
+    hash = {
+      :a => [:foo],
+      'b' => :bar
+    }
+    assert_equal({'a' => ['foo'], 'b' => 'bar'}, JSON::Schema.stringify(hash), 'symbols in a nested array should be converted to strings')
+  end
+
+  def test_stringify_on_array_of_hashes
+    array = [
+      :a,
+      {
+        :b => :bar
+      }
+    ]
+    assert_equal(['a', {'b' => 'bar'}], JSON::Schema.stringify(array), 'symbols keys in a nested hash should be converted to strings')
+  end
+
+  def test_stringify_on_hash_of_hashes
+    hash = {
+      :a => {
+        :b => {
+          :foo => :bar
+        }
+      }
+    }
+    assert_equal({'a' => {'b' => {'foo' => 'bar'} } }, JSON::Schema.stringify(hash), 'symbols in a nested hash of hashes should be converted to strings')
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Kenny Hoxworth
@@ -71,7 +71,6 @@ files:
 - lib/json-schema/schema.rb
 - lib/json-schema/uri/file.rb
 - lib/json-schema/util/array_set.rb
-- lib/json-schema/util/hash.rb
 - lib/json-schema/util/uuid.rb
 - lib/json-schema/validator.rb
 - lib/json-schema/validators/draft1.rb
@@ -103,11 +102,13 @@ files:
 - test/test_jsonschema_draft3.rb
 - test/test_jsonschema_draft4.rb
 - test/test_list_option.rb
+- test/test_merge_misisng_values.rb
 - test/test_minitems.rb
 - test/test_one_of.rb
 - test/test_ruby_schema.rb
 - test/test_schema_type_attribute.rb
 - test/test_schema_validation.rb
+- test/test_stringify.rb
 - test/data/all_of_ref_data.json
 - test/data/any_of_ref_data.json
 - test/data/bad_data_1.json
@@ -173,11 +174,13 @@ test_files:
 - test/test_jsonschema_draft3.rb
 - test/test_jsonschema_draft4.rb
 - test/test_list_option.rb
+- test/test_merge_misisng_values.rb
 - test/test_minitems.rb
 - test/test_one_of.rb
 - test/test_ruby_schema.rb
 - test/test_schema_type_attribute.rb
 - test/test_schema_validation.rb
+- test/test_stringify.rb
 - test/data/all_of_ref_data.json
 - test/data/any_of_ref_data.json
 - test/data/bad_data_1.json

data/lib/json-schema/util/hash.rb

@@ -1,8 +0,0 @@
-class Hash
-	if !{}.respond_to?("default_proc=")
-		def default_proc=(blk)
-            self.replace(Hash.new(&blk).merge(self))
-  		end
-	end
-end
-