json-schema 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 001e9abbf83e74538a97e0cdb3088cf2b3d415c4
-  data.tar.gz: a7dbb4c977abd6b70c8b019cf85670d4113c3e29
+  metadata.gz: 0448122a379f2472a1f14ca8cc02dfe622f64c4d
+  data.tar.gz: b9ef1a82305726ab44107d6fd078aad9517d33de
 SHA512:
-  metadata.gz: 1414dd9bee261301c502b41b30f5ba4c3dd617676acc06e5ace1a35bec1a115aebe4e996a886f981f4ced69679ae0ffed6f1d1aad4f17c16548df61e094c9bfb
-  data.tar.gz: e661d1bbf6d34d40e963580fc950d7201a2e4670ba90749dee5f76bc33045f6b55a973d17897fdcb7c101fcaafabf2ec38116a93d9fa22d9dd10869e8eabd907
+  metadata.gz: 86eeeb455c88470dd99dfe377e30f12f750dc55b62085131995b5079fbd2cd91515b9eb27a06fe15ffb6084f39cba5c6026cef8c78491a8d344279c621cf3886
+  data.tar.gz: 8d3cce427d1c3d1526bfa8b46ccb62a54683ac7cc19e0eb64a7b5a2bc3da8130343db1807fd227c814a64e7141f6fb983cb705fa4660faf46c5201250d662303

data/README.textile

@@ -26,7 +26,7 @@ From the git repo:
 
 <pre>
 $ gem build json-schema.gemspec
-$ gem install json-schema-2.5.0.gem
+$ gem install json-schema-2.5.2.gem
 </pre>
 
 
@@ -82,7 +82,7 @@ JSON::Validator.validate('user.json', data, :list => true)
 
 h3. Strictly validate an object's properties
 
-With the <code>:strict</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.
+With the <code>:strict</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> regardless of <code>required</code> properties set in the schema.
 
 <pre>
 require 'rubygems'

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

@@ -16,7 +16,7 @@ module JSON
 
           if !data.key?(property) &&
               options[:insert_defaults] &&
-              property_schema['default'] &&
+              property_schema.has_key?('default') &&
               !property_schema['readonly']
             default = property_schema['default']
             data[property] = default.is_a?(Hash) ? default.clone : default

data/lib/json-schema/validator.rb

@@ -46,6 +46,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
+      @validation_options[:clear_cache] = false if @options[:clear_cache] == false
 
       @@mutex.synchronize { @base_schema = initialize_schema(schema_data) }
       @original_data = data
@@ -372,20 +373,20 @@ module JSON
         @@default_validator = v
       end
 
-      def register_format_validator(format, validation_proc, versions = ["draft1", "draft2", "draft3", "draft4"])
+      def register_format_validator(format, validation_proc, versions = ["draft1", "draft2", "draft3", "draft4", nil])
         custom_format_validator = JSON::Schema::CustomFormat.new(validation_proc)
         validators_for_names(versions).each do |validator|
           validator.formats[format.to_s] = custom_format_validator
         end
       end
 
-      def deregister_format_validator(format, versions = ["draft1", "draft2", "draft3", "draft4"])
+      def deregister_format_validator(format, versions = ["draft1", "draft2", "draft3", "draft4", nil])
         validators_for_names(versions).each do |validator|
           validator.formats[format.to_s] = validator.default_formats[format.to_s]
         end
       end
 
-      def restore_default_formats(versions = ["draft1", "draft2", "draft3", "draft4"])
+      def restore_default_formats(versions = ["draft1", "draft2", "draft3", "draft4", nil])
         validators_for_names(versions).each do |validator|
           validator.formats = validator.default_formats.clone
         end
@@ -481,9 +482,16 @@ module JSON
       private
 
       def validators_for_names(names)
-        names.map! { |name| name.to_s }
-        validators.reduce([]) do |memo, (_, validator)|
-          memo.tap { |m| m << validator if (validator.names & names).any? }
+        names = names.map { |name| name.to_s }
+        [].tap do |memo|
+          validators.each do |_, validator|
+            if (validator.names & names).any?
+              memo << validator
+            end
+          end
+          if names.include?('')
+            memo << default_validator
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Kenny Hoxworth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: 2.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: 2.3.8
 description: 
 email: hoxworth@gmail.com
 executables: []
@@ -146,63 +146,6 @@ files:
 - resources/draft-02.json
 - resources/draft-03.json
 - resources/draft-04.json
-- test/data/all_of_ref_data.json
-- test/data/any_of_ref_data.json
-- test/data/bad_data_1.json
-- test/data/good_data_1.json
-- test/data/one_of_ref_links_data.json
-- test/schemas/address_microformat.json
-- test/schemas/all_of_ref_base_schema.json
-- test/schemas/all_of_ref_schema.json
-- test/schemas/any_of_ref_jane_schema.json
-- test/schemas/any_of_ref_jimmy_schema.json
-- test/schemas/any_of_ref_john_schema.json
-- test/schemas/any_of_ref_schema.json
-- test/schemas/definition_schema.json
-- test/schemas/extends_and_additionalProperties-1-filename.schema.json
-- test/schemas/extends_and_additionalProperties-1-ref.schema.json
-- test/schemas/extends_and_additionalProperties-2-filename.schema.json
-- 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
-- test/schemas/one_of_ref_links_schema.json
-- test/schemas/ref john with spaces schema.json
-- test/schemas/relative_definition_schema.json
-- test/schemas/self_link_schema.json
-- test/schemas/up_link_schema.json
-- test/test_all_of_ref_schema.rb
-- test/test_any_of_ref_schema.rb
-- test/test_bad_schema_ref.rb
-- test/test_common_test_suite.rb
-- test/test_custom_format.rb
-- test/test_definition.rb
-- test/test_extended_schema.rb
-- test/test_extends_and_additionalProperties.rb
-- test/test_files_v3.rb
-- test/test_fragment_resolution.rb
-- test/test_fragment_validation_with_ref.rb
-- test/test_full_validation.rb
-- test/test_helper.rb
-- test/test_initialize_data.rb
-- test/test_jsonschema_draft1.rb
-- test/test_jsonschema_draft2.rb
-- test/test_jsonschema_draft3.rb
-- test/test_jsonschema_draft4.rb
-- test/test_list_option.rb
-- test/test_load_ref_schema.rb
-- test/test_merge_missing_values.rb
-- test/test_minitems.rb
-- test/test_one_of.rb
-- test/test_ruby_schema.rb
-- test/test_schema_loader.rb
-- test/test_schema_type_attribute.rb
-- test/test_schema_validation.rb
-- test/test_stringify.rb
-- test/test_uri_related.rb
-- test/test_validator.rb
 homepage: http://github.com/ruby-json-schema/json-schema/tree/master
 licenses:
 - MIT
@@ -223,66 +166,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.8'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby JSON Schema Validator
-test_files:
-- test/test_all_of_ref_schema.rb
-- test/test_any_of_ref_schema.rb
-- test/test_bad_schema_ref.rb
-- test/test_common_test_suite.rb
-- test/test_custom_format.rb
-- test/test_definition.rb
-- test/test_extended_schema.rb
-- test/test_extends_and_additionalProperties.rb
-- test/test_files_v3.rb
-- test/test_fragment_resolution.rb
-- test/test_fragment_validation_with_ref.rb
-- test/test_full_validation.rb
-- test/test_helper.rb
-- test/test_initialize_data.rb
-- test/test_jsonschema_draft1.rb
-- test/test_jsonschema_draft2.rb
-- test/test_jsonschema_draft3.rb
-- test/test_jsonschema_draft4.rb
-- test/test_list_option.rb
-- test/test_load_ref_schema.rb
-- test/test_merge_missing_values.rb
-- test/test_minitems.rb
-- test/test_one_of.rb
-- test/test_ruby_schema.rb
-- test/test_schema_loader.rb
-- test/test_schema_type_attribute.rb
-- test/test_schema_validation.rb
-- test/test_stringify.rb
-- test/test_uri_related.rb
-- test/test_validator.rb
-- test/data/all_of_ref_data.json
-- test/data/any_of_ref_data.json
-- test/data/bad_data_1.json
-- test/data/good_data_1.json
-- test/data/one_of_ref_links_data.json
-- test/schemas/address_microformat.json
-- test/schemas/all_of_ref_base_schema.json
-- test/schemas/all_of_ref_schema.json
-- test/schemas/any_of_ref_jane_schema.json
-- test/schemas/any_of_ref_jimmy_schema.json
-- test/schemas/any_of_ref_john_schema.json
-- test/schemas/any_of_ref_schema.json
-- test/schemas/definition_schema.json
-- test/schemas/extends_and_additionalProperties-1-filename.schema.json
-- test/schemas/extends_and_additionalProperties-1-ref.schema.json
-- test/schemas/extends_and_additionalProperties-2-filename.schema.json
-- 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
-- test/schemas/one_of_ref_links_schema.json
-- test/schemas/ref john with spaces schema.json
-- test/schemas/relative_definition_schema.json
-- test/schemas/self_link_schema.json
-- test/schemas/up_link_schema.json
-has_rdoc: 
+test_files: []

data/test/data/all_of_ref_data.json

@@ -1,3 +0,0 @@
-{
-  "name" : "john"
-}

data/test/data/any_of_ref_data.json

@@ -1,7 +0,0 @@
-{
-  "names" :
-    [ "john"
-    , "jane"
-    , "jimmy"
-    ]
-}

data/test/data/bad_data_1.json

@@ -1,3 +0,0 @@
-{
-  "a" : "poop"
-}

data/test/data/good_data_1.json

@@ -1,3 +0,0 @@
-{
-  "a" : 5
-}

data/test/data/one_of_ref_links_data.json

@@ -1,5 +0,0 @@
-{ "links":
-  [{ "rel" : ["self"] , "href":"http://api.example.com/api/object/3" }
-  ,{ "rel" : ["up"] , "href":"http://api.example.com/api/object" }
-  ]
-}

data/test/schemas/address_microformat.json

@@ -1,18 +0,0 @@
-{
-    "description": "An Address following the convention of http://microformats.org/wiki/hcard",
-    "type": "object",
-    "properties": {
-        "post-office-box": { "type": "string" },
-        "extended-address": { "type": "string" },
-        "street-address": { "type": "string" },
-        "locality":{ "type": "string" },
-        "region": { "type": "string" },
-        "postal-code": { "type": "string" },
-        "country-name": { "type": "string"}
-    },
-    "required": ["locality", "region", "country-name"],
-    "dependencies": {
-        "post-office-box": "street-address",
-        "extended-address": "street-address"
-    }
-}

data/test/schemas/all_of_ref_base_schema.json

@@ -1,6 +0,0 @@
-{
-	"type": "object",
-	"properties" : {
-   		"name" : { "type": "integer" }
- 	}
-}

data/test/schemas/all_of_ref_schema.json

@@ -1,7 +0,0 @@
-{ "$schema" : "http://json-schema.org/draft-04/schema#",
-  "type" : "object",
-  "allOf" :
-  [ { "$ref" : "all_of_ref_base_schema.json" }
-  ]
-
-}

data/test/schemas/any_of_ref_jane_schema.json

@@ -1,4 +0,0 @@
-{ "$schema" : "http://json-schema.org/draft-04/schema#"
-, "type" : "string"
-, "pattern" : "jane"
-}

data/test/schemas/any_of_ref_jimmy_schema.json

@@ -1,4 +0,0 @@
-{ "$schema" : "http://json-schema.org/draft-04/schema#"
-, "type" : "string"
-, "pattern" : "jimmy"
-}

data/test/schemas/any_of_ref_john_schema.json

@@ -1,4 +0,0 @@
-{ "$schema" : "http://json-schema.org/draft-04/schema#"
-, "type" : "string"
-, "pattern" : "john"
-}

data/test/schemas/any_of_ref_schema.json

@@ -1,15 +0,0 @@
-{ "$schema" : "http://json-schema.org/draft-04/schema#"
-, "type" : "object"
-, "properties" :
-  { "names" :
-    { "type" : "array"
-    , "items" :
-      { "anyOf" :
-        [ { "$ref" : "any_of_ref_john_schema.json" }
-        , { "$ref" : "any_of_ref_jane_schema.json" }
-        , { "$ref" : "any_of_ref_jimmy_schema.json" }
-        ]
-      }
-    }
-  }
-}

data/test/schemas/definition_schema.json

@@ -1,15 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "description": "schema with definition",
-  "type": "object",
-  "properties": {
-    "a": {
-      "$ref": "#/definitions/foo"
-    }
-  },
-  "definitions": {
-    "foo": {
-      "type": "integer"
-    }
-  }
-}

data/test/schemas/extends_and_additionalProperties-1-filename.schema.json

@@ -1,34 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-03/schema#",
-  "type": "object",
-  "extends": "inner.schema.json",
-  "properties": {
-    "outerA": {
-      "description": "blah",
-      "required": false,
-      "additionalProperties": false,
-      "properties": {
-        "outerA1": {
-		  "type":"boolean",
-          "required": false
-        }
-      }
-    },
-    "outerB": {
-      "required": false,
-      "type": "array",
-      "minItems": 1,
-      "maxItems": 50,
-      "items": {
-        "extends": "inner.schema.json",
-        "additionalProperties": false
-      }
-    },
-    "outerC": {
-      "description": "blah",
-      "type":"boolean",
-      "required": false
-    }
-  },
-  "additionalProperties": false
-}

data/test/schemas/extends_and_additionalProperties-1-ref.schema.json

@@ -1,34 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-03/schema#",
-  "type": "object",
-  "extends": {"$ref":"inner.schema.json#"},
-  "properties": {
-    "outerA": {
-      "description": "blah",
-      "required": false,
-      "additionalProperties": false,
-      "properties": {
-        "outerA1": {
-		  "type":"boolean",
-          "required": false
-        }
-      }
-    },
-    "outerB": {
-      "required": false,
-      "type": "array",
-      "minItems": 1,
-      "maxItems": 50,
-      "items": {
-        "extends": {"$ref":"inner.schema.json#"},
-        "additionalProperties": false
-      }
-    },
-    "outerC": {
-      "description": "blah",
-      "type":"boolean",
-      "required": false
-    }
-  },
-  "additionalProperties": false
-}