json-schema 2.1.9 → 2.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmM0OTNmZTRkM2JmNmNlYWM2MDA0ZjNlZmFlMzZkM2JjOWRmZGQ1ZQ==
+  data.tar.gz: !binary |-
+    MTdmODg5Njc3NmRjZDliZGU1YjYxMGQwNWQ1ZGY4NDFhMWEyZjcxZA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MjUxNmNmNWUzZWQ1MzgyMDk1YjZiNTkyODM1NzFiNmU2MWI0NDMxY2NkN2Rj
+    M2VhNDBkODlkZDg0MGEyMDZhMWFmZWU2MzIwYTBjNjliYWVkM2Y5YTZhNGM2
+    Y2Y5ZjgzNzJmYzhkZjhlMWI0ODljMzA3Mjk5N2JkNjlhZmIzNWQ=
+  data.tar.gz: !binary |-
+    MzQ3NWRlNzJhZWY5NWFjZWRmN2U4N2MxMTlkMjgyNDU3OWMxMWFjOWY2MDk5
+    Njk3YjZjZGQyNTk2MjFhZjczZTRkZDgwZmQ3MWFlZDM3YTVkMTAyYmNlMWI1
+    ZWQ4YTkyZDRlNzY5NGYzMDY3MmZkY2ExYmRiMzdkY2U4MzFjNDU=

data/README.textile

@@ -22,7 +22,7 @@ From the git repo:
 
 <pre>
 $ gem build json-schema.gemspec
-$ gem install json-schema-2.1.9.gem
+$ gem install json-schema-2.2.0.gem
 </pre>
 
 
@@ -74,6 +74,18 @@ data = ['user','user','user']
 JSON::Validator.validate('user.json', data, :list => true)
 </pre>
 
+h3. Strictly validate an object's properties
+
+With the <code>:strict</code>code> option, validation fails when an object contains properties that are not defined in the schema's property list or doesn't match the <code>additionalProperties</code> property. Furthermore, all properties are treated as <code>required</code> by default.
+
+<pre>
+require 'rubygems'
+require 'json-schema'
+
+data = ['user','user','user']
+JSON::Validator.validate('user.json', data, :list => true)
+</pre>
+
 h3. Catch a validation error and print it out
 
 <pre>

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

@@ -15,7 +15,7 @@ module JSON
 
           addprop = current_schema.schema['additionalProperties']
           if addprop.is_a?(Hash)
-            matching_properties= extra_properties # & addprop.keys
+            matching_properties = extra_properties # & addprop.keys
             matching_properties.each do |key|
               schema = JSON::Schema.new(addprop[key] || addprop, current_schema.uri, validator)
               fragments << key

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

@@ -13,7 +13,8 @@ module JSON
               data[property.to_s] = (default.is_a?(Hash) ? default.clone : default)
             end
 
-            if property_schema['required'] && !data.has_key?(property.to_s) && !data.has_key?(property.to_sym)
+
+            if (property_schema['required'] || options[:strict] == true) && !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
@@ -25,6 +26,18 @@ module JSON
               fragments.pop
             end
           end
+
+          # When strict is true, ensure no undefined properties exist in the data
+          if (options[:strict] == true && !current_schema.schema.has_key?('additionalProperties'))
+            diff = data.select do |k,v|
+              !current_schema.schema['properties'].has_key?(k.to_s) && !current_schema.schema['properties'].has_key?(k.to_sym)
+            end
+
+            if diff.size > 0
+              message = "The property '#{build_fragment(fragments)}' contained undefined properties: '#{diff.keys.join(", ")}'"
+              validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
+            end
+          end
         end
       end
     end

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

@@ -13,6 +13,11 @@ 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))
+              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.to_s
@@ -21,6 +26,18 @@ module JSON
             end
           end
         end
+
+        # When strict is true, ensure no undefined properties exist in the data
+        if (options[:strict] == true && !current_schema.schema.has_key?('additionalProperties'))
+          diff = data.select do |k,v|
+            !current_schema.schema['properties'].has_key?(k.to_s) && !current_schema.schema['properties'].has_key?(k.to_sym)
+          end
+
+          if diff.size > 0
+            message = "The property '#{build_fragment(fragments)}' contained undefined properties: '#{diff.keys.join(", ")}'"
+            validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
+          end
+        end
       end
     end
   end

data/lib/json-schema/validator.rb

@@ -113,7 +113,8 @@ module JSON
       :record_errors => false,
       :errors_as_objects => false,
       :insert_defaults => false,
-      :clear_cache => true
+      :clear_cache => true,
+      :strict => false
     }
     @@validators = {}
     @@default_validator = nil
@@ -158,6 +159,7 @@ module JSON
 
       @validation_options = @options[:record_errors] ? {:record_errors => true} : {}
       @validation_options[:insert_defaults] = true if @options[:insert_defaults]
+      @validation_options[:strict] = true if @options[:strict] == true
 
       @@mutex.synchronize { @base_schema = initialize_schema(schema_data) }
       @data = initialize_data(data)

data/test/test_jsonschema_draft3.rb

@@ -480,6 +480,55 @@ class JSONSchemaDraft3Test < Test::Unit::TestCase
     assert(!JSON::Validator.validate(schema,data))
   end
 
+  def test_strict_properties
+    schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
+      "properties" => {
+        "a" => {"type" => "string"},
+        "b" => {"type" => "string"}
+      }
+    }
+
+    data = {"a" => "a"}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"b" => "b"}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"a" => "a", "b" => "b"}
+    assert(JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"a" => "a", "b" => "b", "c" => "c"}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+  end
+
+  def test_strict_properties_additional_props
+    schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
+      "properties" => {
+        "a" => {"type" => "string"},
+        "b" => {"type" => "string"}
+      },
+      "additionalProperties" => {"type" => "integer"}
+    }
+
+    data = {"a" => "a"}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"b" => "b"}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"a" => "a", "b" => "b"}
+    assert(JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"a" => "a", "b" => "b", "c" => "c"}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"a" => "a", "b" => "b", "c" => 3}
+    assert(JSON::Validator.validate(schema,data,:strict => true))
+  end
+
+
 
   def test_pattern
     # Set up the default datatype

data/test/test_jsonschema_draft4.rb

@@ -415,6 +415,54 @@ class JSONSchemaDraft4Test < Test::Unit::TestCase
     assert(!JSON::Validator.validate(schema,data))
   end
 
+    def test_strict_properties
+    schema = {
+      "$schema" => "http://json-schema.org/draft-04/schema#",
+      "properties" => {
+        "a" => {"type" => "string"},
+        "b" => {"type" => "string"}
+      }
+    }
+
+    data = {"a" => "a"}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"b" => "b"}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"a" => "a", "b" => "b"}
+    assert(JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"a" => "a", "b" => "b", "c" => "c"}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+  end
+
+  def test_strict_properties_additional_props
+    schema = {
+      "$schema" => "http://json-schema.org/draft-04/schema#",
+      "properties" => {
+        "a" => {"type" => "string"},
+        "b" => {"type" => "string"}
+      },
+      "additionalProperties" => {"type" => "integer"}
+    }
+
+    data = {"a" => "a"}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"b" => "b"}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"a" => "a", "b" => "b"}
+    assert(JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"a" => "a", "b" => "b", "c" => "c"}
+    assert(!JSON::Validator.validate(schema,data,:strict => true))
+
+    data = {"a" => "a", "b" => "b", "c" => 3}
+    assert(JSON::Validator.validate(schema,data,:strict => true))
+  end
+
 
 
   def test_unique_items

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 2.1.9
-  prerelease: 
+  version: 2.2.0
 platform: ruby
 authors:
 - Kenny Hoxworth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: hoxworth@gmail.com
@@ -114,27 +113,26 @@ files:
 homepage: http://github.com/hoxworth/json-schema/tree/master
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby JSON Schema Validator
 test_files:
 - test/test_all_of_ref_schema.rb