json-schema 3.0.0 → 4.1.0

data/lib/json-schema/validator.rb

@@ -15,21 +15,22 @@ require 'json-schema/errors/json_parse_error'
 require 'json-schema/util/uri'
 
 module JSON
-
   class Validator
-
     @@schemas = {}
     @@cache_schemas = true
     @@default_opts = {
-      :list => false,
-      :version => nil,
-      :validate_schema => false,
-      :record_errors => false,
-      :errors_as_objects => false,
-      :insert_defaults => false,
-      :clear_cache => false,
-      :strict => false,
-      :parse_data => true
+      list: false,
+      version: nil,
+      validate_schema: false,
+      record_errors: false,
+      errors_as_objects: false,
+      insert_defaults: false,
+      clear_cache: false,
+      strict: false,
+      allPropertiesRequired: false,
+      noAdditionalProperties: false,
+      parse_data: true,
+      parse_integer: true,
     }
     @@validators = {}
     @@default_validator = nil
@@ -38,28 +39,32 @@ module JSON
     @@serializer = nil
     @@mutex = Mutex.new
 
-    def initialize(schema_data, data, opts={})
+    def initialize(schema_data, opts = {})
       @options = @@default_opts.clone.merge(opts)
       @errors = []
 
       configured_validator = self.class.validator_for_name(@options[:version])
       @options[:schema_reader] ||= self.class.schema_reader
 
-      @validation_options = @options[:record_errors] ? {:record_errors => true} : {}
+      @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
+      if @options[:strict] == true
+        @validation_options[:allPropertiesRequired] = true
+        @validation_options[:noAdditionalProperties] = true
+      else
+        @validation_options[:allPropertiesRequired] = true if @options[:allPropertiesRequired]
+        @validation_options[:noAdditionalProperties] = true if @options[:noAdditionalProperties]
+      end
       @validation_options[:clear_cache] = true if !@@cache_schemas || @options[:clear_cache]
 
       @@mutex.synchronize { @base_schema = initialize_schema(schema_data, configured_validator) }
-      @original_data = data
-      @data = initialize_data(data)
       @@mutex.synchronize { build_schemas(@base_schema) }
 
       # validate the schema, if requested
       if @options[:validate_schema]
         # Don't clear the cache during metaschema validation!
-        meta_validator = self.class.new(@base_schema.validator.metaschema, @base_schema.schema, {:clear_cache => false})
-        meta_validator.validate
+        meta_validator = self.class.new(@base_schema.validator.metaschema, { clear_cache: false })
+        meta_validator.validate(@base_schema.schema)
       end
 
       # If the :fragment option is set, try and validate against the fragment
@@ -70,11 +75,11 @@ module JSON
 
     def schema_from_fragment(base_schema, fragment)
       schema_uri = base_schema.uri
-      fragments = fragment.split("/").map { |f| f.gsub('~0', '~').gsub('~1', '/') }
+      fragments = fragment.split('/').map { |f| f.gsub('~0', '~').gsub('~1', '/') }
 
       # ensure the first element was a hash, per the fragment spec
-      if fragments.shift != "#"
-        raise JSON::Schema::SchemaError.new("Invalid fragment syntax in :fragment option")
+      if fragments.shift != '#'
+        raise JSON::Schema::SchemaError, 'Invalid fragment syntax in :fragment option'
       end
 
       schema_fragment = base_schema.schema
@@ -88,7 +93,7 @@ module JSON
       end
 
       unless schema_fragment.is_a?(Hash)
-        raise JSON::Schema::SchemaError.new("Invalid fragment resolution for :fragment option")
+        raise JSON::Schema::SchemaError, 'Invalid fragment resolution for :fragment option'
       end
 
       schema = JSON::Schema.new(schema_fragment, schema_uri, base_schema.validator)
@@ -103,24 +108,28 @@ module JSON
     end
 
     # Run a simple true/false validation of data against a schema
-    def validate
-      @base_schema.validate(@data,[],self,@validation_options)
+    def validate(data)
+      original_data = data
+      data = initialize_data(data)
+      @base_schema.validate(data, [], self, @validation_options)
 
       if @options[:record_errors]
         if @options[:errors_as_objects]
-          @errors.map{|e| e.to_hash}
+          @errors.map { |e| e.to_hash }
         else
-          @errors.map{|e| e.to_string}
+          @errors.map { |e| e.to_string }
         end
       else
         true
       end
     ensure
+      @errors = []
+
       if @validation_options[:clear_cache] == true
         self.class.clear_cache
       end
       if @validation_options[:insert_defaults]
-        self.class.merge_missing_values(@data, @original_data)
+        self.class.merge_missing_values(data, original_data)
       end
     end
 
@@ -141,13 +150,13 @@ module JSON
       schema = parent_schema.schema
 
       # Build ref schemas if they exist
-      if schema["$ref"]
-        load_ref_schema(parent_schema, schema["$ref"])
+      if schema['$ref']
+        load_ref_schema(parent_schema, schema['$ref'])
       end
 
-      case schema["extends"]
+      case schema['extends']
       when String
-        load_ref_schema(parent_schema, schema["extends"])
+        load_ref_schema(parent_schema, schema['extends'])
       when Array
         schema['extends'].each do |type|
           handle_schema(parent_schema, type)
@@ -155,7 +164,7 @@ module JSON
       end
 
       # Check for schemas in union types
-      ["type", "disallow"].each do |key|
+      %w[type disallow].each do |key|
         if schema[key].is_a?(Array)
           schema[key].each do |type|
             if type.is_a?(Hash)
@@ -169,6 +178,7 @@ module JSON
       # are themselves schemas.
       %w[definitions properties patternProperties].each do |key|
         next unless value = schema[key]
+
         value.each do |k, inner_schema|
           handle_schema(parent_schema, inner_schema)
         end
@@ -177,20 +187,22 @@ module JSON
       # Schema properties whose values are themselves schemas.
       %w[additionalProperties additionalItems dependencies extends].each do |key|
         next unless schema[key].is_a?(Hash)
+
         handle_schema(parent_schema, schema[key])
       end
 
       # Schema properties whose values may be an array of schemas.
       %w[allOf anyOf oneOf not].each do |key|
         next unless value = schema[key]
+
         Array(value).each do |inner_schema|
           handle_schema(parent_schema, inner_schema)
         end
       end
 
       # Items are always schemas
-      if schema["items"]
-        items = schema["items"].clone
+      if schema['items']
+        items = schema['items'].clone
         items = [items] unless items.is_a?(Array)
 
         items.each do |item|
@@ -199,10 +211,9 @@ module JSON
       end
 
       # Convert enum to a ArraySet
-      if schema["enum"].is_a?(Array)
-        schema["enum"] = ArraySet.new(schema["enum"])
+      if schema['enum'].is_a?(Array)
+        schema['enum'] = ArraySet.new(schema['enum'])
       end
-
     end
 
     # Either load a reference schema or create a new schema
@@ -225,58 +236,57 @@ module JSON
       @errors
     end
 
-
     class << self
-      def validate(schema, data,opts={})
+      def validate(schema, data, opts = {})
         begin
           validate!(schema, data, opts)
         rescue JSON::Schema::ValidationError, JSON::Schema::SchemaError
-          return false
+          false
         end
       end
 
-      def validate_json(schema, data, opts={})
-        validate(schema, data, opts.merge(:json => true))
+      def validate_json(schema, data, opts = {})
+        validate(schema, data, opts.merge(json: true))
       end
 
-      def validate_uri(schema, data, opts={})
-        validate(schema, data, opts.merge(:uri => true))
+      def validate_uri(schema, data, opts = {})
+        validate(schema, data, opts.merge(uri: true))
       end
 
-      def validate!(schema, data,opts={})
-        validator = new(schema, data, opts)
-        validator.validate
+      def validate!(schema, data, opts = {})
+        validator = new(schema, opts)
+        validator.validate(data)
       end
 
-      def validate2(schema, data, opts={})
-        warn "[DEPRECATION NOTICE] JSON::Validator#validate2 has been replaced by JSON::Validator#validate! and will be removed in version >= 3. Please use the #validate! method instead."
+      def validate2(schema, data, opts = {})
+        warn '[DEPRECATION NOTICE] JSON::Validator#validate2 has been replaced by JSON::Validator#validate! and will be removed in version >= 3. Please use the #validate! method instead.'
         validate!(schema, data, opts)
       end
 
-      def validate_json!(schema, data, opts={})
-        validate!(schema, data, opts.merge(:json => true))
+      def validate_json!(schema, data, opts = {})
+        validate!(schema, data, opts.merge(json: true))
       end
 
-      def validate_uri!(schema, data, opts={})
-        validate!(schema, data, opts.merge(:uri => true))
+      def validate_uri!(schema, data, opts = {})
+        validate!(schema, data, opts.merge(uri: true))
       end
 
-      def fully_validate(schema, data, opts={})
-        validate!(schema, data, opts.merge(:record_errors => true))
+      def fully_validate(schema, data, opts = {})
+        validate!(schema, data, opts.merge(record_errors: true))
       end
 
-      def fully_validate_schema(schema, opts={})
+      def fully_validate_schema(schema, opts = {})
         data = schema
         schema = validator_for_name(opts[:version]).metaschema
         fully_validate(schema, data, opts)
       end
 
-      def fully_validate_json(schema, data, opts={})
-        fully_validate(schema, data, opts.merge(:json => true))
+      def fully_validate_json(schema, data, opts = {})
+        fully_validate(schema, data, opts.merge(json: true))
       end
 
-      def fully_validate_uri(schema, data, opts={})
-        fully_validate(schema, data, opts.merge(:uri => true))
+      def fully_validate_uri(schema, data, opts = {})
+        fully_validate(schema, data, opts.merge(uri: true))
       end
 
       def schema_reader
@@ -316,7 +326,7 @@ module JSON
       end
 
       def cache_schemas=(val)
-        warn "[DEPRECATION NOTICE] Schema caching is now a validation option. Schemas will still be cached if this is set to true, but this method will be removed in version >= 3. Please use the :clear_cache validation option instead."
+        warn '[DEPRECATION NOTICE] Schema caching is now a validation option. Schemas will still be cached if this is set to true, but this method will be removed in version >= 3. Please use the :clear_cache validation option instead.'
         @@cache_schemas = val == true ? true : false
       end
 
@@ -328,32 +338,34 @@ module JSON
         @@default_validator
       end
 
-      def validator_for_uri(schema_uri, raise_not_found=true)
+      def validator_for_uri(schema_uri, raise_not_found = true)
         return default_validator unless schema_uri
+
         u = JSON::Util::URI.parse(schema_uri)
         validator = validators["#{u.scheme}://#{u.host}#{u.path}"]
         if validator.nil? && raise_not_found
-          raise JSON::Schema::SchemaError.new("Schema not found: #{schema_uri}")
+          raise JSON::Schema::SchemaError, "Schema not found: #{schema_uri}"
         else
           validator
         end
       end
 
-      def validator_for_name(schema_name, raise_not_found=true)
+      def validator_for_name(schema_name, raise_not_found = true)
         return default_validator unless schema_name
+
         schema_name = schema_name.to_s
         validator = validators.values.detect do |v|
           Array(v.names).include?(schema_name)
         end
         if validator.nil? && raise_not_found
-          raise JSON::Schema::SchemaError.new("The requested JSON schema version is not supported")
+          raise JSON::Schema::SchemaError, 'The requested JSON schema version is not supported'
         else
           validator
         end
       end
 
       def validator_for(schema_uri)
-        warn "[DEPRECATION NOTICE] JSON::Validator#validator_for has been replaced by JSON::Validator#validator_for_uri and will be removed in version >= 3. Please use the #validator_for_uri method instead."
+        warn '[DEPRECATION NOTICE] JSON::Validator#validator_for has been replaced by JSON::Validator#validator_for_uri and will be removed in version >= 3. Please use the #validator_for_uri method instead.'
         validator_for_uri(schema_uri)
       end
 
@@ -365,7 +377,7 @@ module JSON
         @@default_validator = v
       end
 
-      def register_format_validator(format, validation_proc, versions = (@@validators.flat_map{ |k, v| v.names.first } + [nil]))
+      def register_format_validator(format, validation_proc, versions = (@@validators.flat_map { |k, v| v.names.first } + [nil]))
         custom_format_validator = JSON::Schema::CustomFormat.new(validation_proc)
         versions.each do |version|
           validator = validator_for_name(version)
@@ -373,14 +385,14 @@ module JSON
         end
       end
 
-      def deregister_format_validator(format, versions = (@@validators.flat_map{ |k, v| v.names.first } + [nil]))
+      def deregister_format_validator(format, versions = (@@validators.flat_map { |k, v| v.names.first } + [nil]))
         versions.each do |version|
           validator = validator_for_name(version)
           validator.formats[format.to_s] = validator.default_formats[format.to_s]
         end
       end
 
-      def restore_default_formats(versions = (@@validators.flat_map{ |k, v| v.names.first } + [nil]))
+      def restore_default_formats(versions = (@@validators.flat_map { |k, v| v.names.first } + [nil]))
         versions.each do |version|
           validator = validator_for_name(version)
           validator.formats = validator.default_formats.clone
@@ -404,7 +416,7 @@ module JSON
           if @@available_json_backends.include?(backend)
             @@json_backend = backend
           else
-            raise JSON::Schema::JsonParseError.new("The JSON backend '#{backend}' could not be found.")
+            raise JSON::Schema::JsonParseError, "The JSON backend '#{backend}' could not be found."
           end
         end
       end
@@ -414,26 +426,26 @@ module JSON
           begin
             MultiJson.respond_to?(:adapter) ? MultiJson.load(s) : MultiJson.decode(s)
           rescue MultiJson::ParseError => e
-            raise JSON::Schema::JsonParseError.new(e.message)
+            raise JSON::Schema::JsonParseError, e.message
           end
         else
           case @@json_backend.to_s
           when 'json'
             begin
-              JSON.parse(s, :quirks_mode => true)
+              JSON.parse(s, quirks_mode: true)
             rescue JSON::ParserError => e
-              raise JSON::Schema::JsonParseError.new(e.message)
+              raise JSON::Schema::JsonParseError, e.message
             end
           when 'yajl'
             begin
               json = StringIO.new(s)
               parser = Yajl::Parser.new
-              parser.parse(json) or raise JSON::Schema::JsonParseError.new("The JSON could not be parsed by yajl")
+              parser.parse(json) or raise(JSON::Schema::JsonParseError, 'The JSON could not be parsed by yajl')
             rescue Yajl::ParseError => e
-              raise JSON::Schema::JsonParseError.new(e.message)
+              raise JSON::Schema::JsonParseError, e.message
             end
           else
-            raise JSON::Schema::JsonParseError.new("No supported JSON parsers found. The following parsers are suported:\n * yajl-ruby\n * json")
+            raise JSON::Schema::JsonParseError, "No supported JSON parsers found. The following parsers are suported:\n * yajl-ruby\n * json"
           end
         end
       end
@@ -472,7 +484,6 @@ module JSON
           end
         end
 
-
         if Gem::Specification::find_all_by_name('yajl-ruby').any?
           require 'yajl'
           @@available_json_backends << 'yajl'
@@ -480,11 +491,11 @@ module JSON
         end
 
         if @@json_backend == 'yajl'
-          @@serializer = lambda{|o| Yajl::Encoder.encode(o) }
+          @@serializer = lambda { |o| Yajl::Encoder.encode(o) }
         elsif @@json_backend == 'json'
-          @@serializer = lambda{|o| JSON.dump(o) }
+          @@serializer = lambda { |o| JSON.dump(o) }
         else
-          @@serializer = lambda{|o| YAML.dump(o) }
+          @@serializer = lambda { |o| YAML.dump(o) }
         end
       end
     end
@@ -493,10 +504,10 @@ module JSON
 
     if Gem::Specification::find_all_by_name('uuidtools').any?
       require 'uuidtools'
-      @@fake_uuid_generator = lambda{|s| UUIDTools::UUID.sha1_create(UUIDTools::UUID_URL_NAMESPACE, s).to_s }
+      @@fake_uuid_generator = lambda { |s| UUIDTools::UUID.sha1_create(UUIDTools::UUID_URL_NAMESPACE, s).to_s }
     else
       require 'json-schema/util/uuid'
-      @@fake_uuid_generator = lambda{|s| JSON::Util::UUID.create_v5(s,JSON::Util::UUID::Nil).to_s }
+      @@fake_uuid_generator = lambda { |s| JSON::Util::UUID.create_v5(s, JSON::Util::UUID::Nil).to_s }
     end
 
     def serialize schema
@@ -552,7 +563,7 @@ module JSON
         end
         self.class.add_schema(schema)
       else
-        raise JSON::Schema::SchemaParseError, "Invalid schema - must be either a string or a hash"
+        raise JSON::Schema::SchemaParseError, 'Invalid schema - must be either a string or a hash'
       end
 
       schema
@@ -567,7 +578,9 @@ module JSON
           data = self.class.parse(custom_open(json_uri))
         elsif data.is_a?(String)
           begin
-            data = self.class.parse(data)
+            # Check if the string is valid integer
+            strict_convert = data.match?(/\A[+-]?\d+\z/) && !@options[:parse_integer]
+            data = strict_convert ? data : self.class.parse(data)
           rescue JSON::Schema::JsonParseError
             begin
               json_uri = Util::URI.normalized_uri(data)

data/lib/json-schema/validators/draft1.rb

@@ -2,27 +2,26 @@ require 'json-schema/schema/validator'
 
 module JSON
   class Schema
-
     class Draft1 < Validator
       def initialize
         super
         @attributes = {
-          "type" => JSON::Schema::TypeAttribute,
-          "disallow" => JSON::Schema::DisallowAttribute,
-          "format" => JSON::Schema::FormatAttribute,
-          "maximum" => JSON::Schema::MaximumInclusiveAttribute,
-          "minimum" => JSON::Schema::MinimumInclusiveAttribute,
-          "minItems" => JSON::Schema::MinItemsAttribute,
-          "maxItems" => JSON::Schema::MaxItemsAttribute,
-          "minLength" => JSON::Schema::MinLengthAttribute,
-          "maxLength" => JSON::Schema::MaxLengthAttribute,
-          "maxDecimal" => JSON::Schema::MaxDecimalAttribute,
-          "enum" => JSON::Schema::EnumAttribute,
-          "properties" => JSON::Schema::PropertiesOptionalAttribute,
-          "pattern" => JSON::Schema::PatternAttribute,
-          "additionalProperties" => JSON::Schema::AdditionalPropertiesAttribute,
-          "items" => JSON::Schema::ItemsAttribute,
-          "extends" => JSON::Schema::ExtendsAttribute
+          'type' => JSON::Schema::TypeAttribute,
+          'disallow' => JSON::Schema::DisallowAttribute,
+          'format' => JSON::Schema::FormatAttribute,
+          'maximum' => JSON::Schema::MaximumInclusiveAttribute,
+          'minimum' => JSON::Schema::MinimumInclusiveAttribute,
+          'minItems' => JSON::Schema::MinItemsAttribute,
+          'maxItems' => JSON::Schema::MaxItemsAttribute,
+          'minLength' => JSON::Schema::MinLengthAttribute,
+          'maxLength' => JSON::Schema::MaxLengthAttribute,
+          'maxDecimal' => JSON::Schema::MaxDecimalAttribute,
+          'enum' => JSON::Schema::EnumAttribute,
+          'properties' => JSON::Schema::PropertiesOptionalAttribute,
+          'pattern' => JSON::Schema::PatternAttribute,
+          'additionalProperties' => JSON::Schema::AdditionalPropertiesAttribute,
+          'items' => JSON::Schema::ItemsAttribute,
+          'extends' => JSON::Schema::ExtendsAttribute,
         }
         @default_formats = {
           'date-time' => DateTimeFormat,
@@ -30,16 +29,15 @@ module JSON
           'time' => TimeFormat,
           'ip-address' => IP4Format,
           'ipv6' => IP6Format,
-          'uri' => UriFormat
+          'uri' => UriFormat,
         }
         @formats = @default_formats.clone
-        @uri = JSON::Util::URI.parse("http://json-schema.org/draft-01/schema#")
-        @names = ["draft1"]
-        @metaschema_name = "draft-01.json"
+        @uri = JSON::Util::URI.parse('http://json-schema.org/draft-01/schema#')
+        @names = ['draft1']
+        @metaschema_name = 'draft-01.json'
       end
 
-      JSON::Validator.register_validator(self.new)
+      JSON::Validator.register_validator(new)
     end
-
   end
 end

data/lib/json-schema/validators/draft2.rb

@@ -2,28 +2,27 @@ require 'json-schema/schema/validator'
 
 module JSON
   class Schema
-
     class Draft2 < Validator
       def initialize
         super
         @attributes = {
-          "type" => JSON::Schema::TypeAttribute,
-          "disallow" => JSON::Schema::DisallowAttribute,
-          "format" => JSON::Schema::FormatAttribute,
-          "maximum" => JSON::Schema::MaximumInclusiveAttribute,
-          "minimum" => JSON::Schema::MinimumInclusiveAttribute,
-          "minItems" => JSON::Schema::MinItemsAttribute,
-          "maxItems" => JSON::Schema::MaxItemsAttribute,
-          "uniqueItems" => JSON::Schema::UniqueItemsAttribute,
-          "minLength" => JSON::Schema::MinLengthAttribute,
-          "maxLength" => JSON::Schema::MaxLengthAttribute,
-          "divisibleBy" => JSON::Schema::DivisibleByAttribute,
-          "enum" => JSON::Schema::EnumAttribute,
-          "properties" => JSON::Schema::PropertiesOptionalAttribute,
-          "pattern" => JSON::Schema::PatternAttribute,
-          "additionalProperties" => JSON::Schema::AdditionalPropertiesAttribute,
-          "items" => JSON::Schema::ItemsAttribute,
-          "extends" => JSON::Schema::ExtendsAttribute
+          'type' => JSON::Schema::TypeAttribute,
+          'disallow' => JSON::Schema::DisallowAttribute,
+          'format' => JSON::Schema::FormatAttribute,
+          'maximum' => JSON::Schema::MaximumInclusiveAttribute,
+          'minimum' => JSON::Schema::MinimumInclusiveAttribute,
+          'minItems' => JSON::Schema::MinItemsAttribute,
+          'maxItems' => JSON::Schema::MaxItemsAttribute,
+          'uniqueItems' => JSON::Schema::UniqueItemsAttribute,
+          'minLength' => JSON::Schema::MinLengthAttribute,
+          'maxLength' => JSON::Schema::MaxLengthAttribute,
+          'divisibleBy' => JSON::Schema::DivisibleByAttribute,
+          'enum' => JSON::Schema::EnumAttribute,
+          'properties' => JSON::Schema::PropertiesOptionalAttribute,
+          'pattern' => JSON::Schema::PatternAttribute,
+          'additionalProperties' => JSON::Schema::AdditionalPropertiesAttribute,
+          'items' => JSON::Schema::ItemsAttribute,
+          'extends' => JSON::Schema::ExtendsAttribute,
         }
         @default_formats = {
           'date-time' => DateTimeFormat,
@@ -31,16 +30,15 @@ module JSON
           'time' => TimeFormat,
           'ip-address' => IP4Format,
           'ipv6' => IP6Format,
-          'uri' => UriFormat
+          'uri' => UriFormat,
         }
         @formats = @default_formats.clone
-        @uri = JSON::Util::URI.parse("http://json-schema.org/draft-02/schema#")
-        @names = ["draft2"]
-        @metaschema_name = "draft-02.json"
+        @uri = JSON::Util::URI.parse('http://json-schema.org/draft-02/schema#')
+        @names = ['draft2']
+        @metaschema_name = 'draft-02.json'
       end
 
-      JSON::Validator.register_validator(self.new)
+      JSON::Validator.register_validator(new)
     end
-
   end
 end