json-schema 5.1.1 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c842fa3f98c7ebbdde9ebdbceb44bb1eab1f282f6a5c6c0008e0aac0eca92b6
-  data.tar.gz: d6f98215e98ce89c007d158594078d7135574543c10a82e953dcb3feed6dc9fb
+  metadata.gz: 22afd4889333e3c72db735249ce9f628ebf760c343b98bca7dcf44b5d8aedade
+  data.tar.gz: cd6abf52a3af173231e02fec990f2ec80084c8d808ca5f98ef95601fe2c87cf7
 SHA512:
-  metadata.gz: f744aa3ddcf37191afd16c7424b97d4e610f5da6f0c5ccbdad8fdcc10ee95f1d130f165142da95394ea09a758907b6bf6157343a1796477ed75a340c17217b65
-  data.tar.gz: 1a0d01bfb3595f4286603e9c31d3c578aff55b4abc37952c41e448d02a7ea22c37a7ba5bc8cbb85809f4395992b0da8c73ec79109e6d15338b8802cf96465dbb
+  metadata.gz: 626dc61e7da4ecd5984463bc20a3eadd9551ca5a652cfdc60faf7869e09d0f89aa0676aee7e91135738d0fecef5dda298499d196011bfeb1494a2e9cabe3e946
+  data.tar.gz: e111b99ff25a98f785a967b91a3d277f5a0236b5a96bf49cd6c88709abaced71377de17d3f23f206c5d037201a85bd3a1b6d44c685c4e25353f3fc12143da541

data/README.md

@@ -478,6 +478,14 @@ Optionally, the JSON Schema library supports using the MultiJSON library for
 selecting JSON backends. If the MultiJSON library is installed, it will be
 autoloaded.
 
+**Deprecation notice:** MultiJSON support is deprecated and will be removed in a
+future version. To stop using MultiJSON, add the following to your application's
+initialization code:
+
+```ruby
+JSON::Validator.use_multi_json = false
+```
+
 Notes
 -----
 

data/lib/json-schema/attribute.rb

@@ -9,8 +9,8 @@ module JSON
         "#/#{fragments.join('/')}"
       end
 
-      def self.validation_error(processor, message, fragments, current_schema, failed_attribute, record_errors)
-        error = ValidationError.new(message, fragments, failed_attribute, current_schema)
+      def self.validation_error(processor, message, fragments, current_schema, failed_attribute, record_errors, properties = [])
+        error = ValidationError.new(message, fragments, failed_attribute, current_schema, properties)
         if record_errors
           processor.validation_error(error)
         else

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

@@ -30,7 +30,7 @@ module JSON
         schema = current_schema.schema
 
         if schema['properties']
-          extra_properties = extra_properties - schema['properties'].keys
+          extra_properties -= schema['properties'].keys
         end
 
         schema['patternProperties']&.each_key do |key|

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

@@ -17,20 +17,45 @@ module JSON
           pre_validation_error_count = validation_errors(processor).count
 
           begin
-            schema.validate(data, fragments, processor, options)
+            # Cannot raise if noAdditionalProperties is true, we need to
+            # evaluate each sub schema within the allOf, before raising.
+            if options[:noAdditionalProperties] == true
+              schema.validate(data, fragments, processor, options.merge(record_errors: true))
+            else
+              schema.validate(data, fragments, processor, options)
+            end
           rescue ValidationError => e
             valid = false
             message = e.message
           end
 
           diff = validation_errors(processor).count - pre_validation_error_count
+
           while diff > 0
-            diff = diff - 1
+            diff -= 1
             errors["allOf ##{schema_index}"].push(validation_errors(processor).pop)
           end
         end
 
-        if !valid || !errors.empty?
+        # Find any properties that are missing across all subschemas.
+        common_missing_properties = {}
+        if options[:noAdditionalProperties] == true && !errors.empty?
+          all_property_errors = errors.values.flatten.map(&:properties)
+          common_missing_properties = (all_property_errors.first || []).to_set
+
+          all_property_errors[1..].each do |curr_property_errors|
+            common_missing_properties &= curr_property_errors.to_set
+          end
+        end
+
+        # PropertiesV4Attribute represents errors that would indicate an
+        # additional property was detected. If we filter these out, we should
+        # be left with errors that are not dependent on any other sub schema.
+        non_missing_property_errors = errors.values.flatten.reject do |error|
+          error.failed_attribute == JSON::Schema::PropertiesV4Attribute
+        end
+
+        if !valid || !non_missing_property_errors.empty? || !common_missing_properties.empty?
           message ||= "The property '#{build_fragment(fragments)}' of type #{type_of_data(data)} did not match all of the required schemas"
           validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
           validation_errors(processor).last.sub_errors = errors

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

@@ -27,7 +27,7 @@ module JSON
           diff = validation_errors(processor).count - pre_validation_error_count
           valid = false if diff > 0
           while diff > 0
-            diff = diff - 1
+            diff -= 1
             errors["anyOf ##{schema_index}"].push(validation_errors(processor).pop)
           end
 
@@ -36,7 +36,7 @@ module JSON
           data = original_data
         end
 
-        if !valid
+        unless valid
           message = "The property '#{build_fragment(fragments)}' of type #{type_of_data(data)} did not match one or more of the required schemas"
           validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
           validation_errors(processor).last.sub_errors = errors

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

@@ -3,7 +3,7 @@ require 'json-schema/attribute'
 module JSON
   class Schema
     class ConstAttribute < Attribute
-      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+      def self.validate(current_schema, data, fragments, processor, _validator, options = {})
         const_value = current_schema.schema['const']
         unless const_value == data
           message = "The property '#{build_fragment(fragments)}' value #{data.inspect} did not match constant '#{const_value}'"

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

@@ -7,7 +7,7 @@ module JSON
         'divisibleBy'
       end
 
-      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+      def self.validate(current_schema, data, fragments, processor, _validator, options = {})
         return unless data.is_a?(Numeric)
 
         factor = current_schema.schema[keyword]

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

@@ -3,7 +3,7 @@ require 'json-schema/attribute'
 module JSON
   class Schema
     class EnumAttribute < Attribute
-      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+      def self.validate(current_schema, data, fragments, processor, _validator, options = {})
         enum = current_schema.schema['enum']
         return if enum.include?(data)
 

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

@@ -6,7 +6,7 @@ module JSON
     class ExtendsAttribute < Attribute
       def self.validate(current_schema, data, fragments, processor, validator, options = {})
         schemas = current_schema.schema['extends']
-        schemas = [schemas] if !schemas.is_a?(Array)
+        schemas = [schemas] unless schemas.is_a?(Array)
         schemas.each do |s|
           uri, schema = get_extended_uri_and_schema(s, current_schema, validator)
           if schema
@@ -22,7 +22,8 @@ module JSON
       end
 
       def self.get_extended_uri_and_schema(s, current_schema, validator)
-        uri, schema = nil, nil
+        uri = nil
+        schema = nil
 
         if s.is_a?(Hash)
           uri = current_schema.uri
@@ -30,7 +31,8 @@ module JSON
             ref_uri, ref_schema = JSON::Schema::RefAttribute.get_referenced_uri_and_schema(s, current_schema, validator)
             if ref_schema
               if s.size == 1 # Check if anything else apart from $ref
-                uri, schema = ref_uri, ref_schema
+                uri = ref_uri
+                schema = ref_schema
               else
                 s = s.dup
                 s.delete '$ref'

data/lib/json-schema/attributes/formats/custom.rb

@@ -8,13 +8,11 @@ module JSON
         @validation_proc = validation_proc
       end
 
-      def validate(current_schema, data, fragments, processor, validator, options = {})
-        begin
-          @validation_proc.call data
-        rescue JSON::Schema::CustomFormatError => e
-          message = "The property '#{self.class.build_fragment(fragments)}' #{e.message}"
-          self.class.validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
-        end
+      def validate(current_schema, data, fragments, processor, _validator, options = {})
+        @validation_proc.call data
+      rescue JSON::Schema::CustomFormatError => e
+        message = "The property '#{self.class.build_fragment(fragments)}' #{e.message}"
+        self.class.validation_error(processor, message, fragments, current_schema, self.class, options[:record_errors])
       end
     end
   end

data/lib/json-schema/attributes/formats/date.rb

@@ -3,9 +3,9 @@ require 'json-schema/attributes/format'
 module JSON
   class Schema
     class DateFormat < FormatAttribute
-      REGEXP = /\A\d{4}-\d{2}-\d{2}\z/
+      REGEXP = /\A\d{4}-\d{2}-\d{2}\z/.freeze
 
-      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+      def self.validate(current_schema, data, fragments, processor, _validator, options = {})
         if data.is_a?(String)
           error_message = "The property '#{build_fragment(fragments)}' must be a date in the format of YYYY-MM-DD"
           if REGEXP.match(data)

data/lib/json-schema/attributes/formats/date_time.rb

@@ -3,9 +3,9 @@ require 'json-schema/attributes/format'
 module JSON
   class Schema
     class DateTimeFormat < FormatAttribute
-      REGEXP = /\A\d{4}-\d{2}-\d{2}T(\d{2}):(\d{2}):(\d{2})([\.,]\d+)?(Z|[+-](\d{2})(:?\d{2})?)?\z/
+      REGEXP = /\A\d{4}-\d{2}-\d{2}T(\d{2}):(\d{2}):(\d{2})([.,]\d+)?(Z|[+-](\d{2})(:?\d{2})?)?\z/.freeze
 
-      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+      def self.validate(current_schema, data, fragments, processor, _validator, options = {})
         # Timestamp in restricted ISO-8601 YYYY-MM-DDThh:mm:ssZ with optional decimal fraction of the second
         if data.is_a?(String)
           error_message = "The property '#{build_fragment(fragments)}' must be a date/time in the ISO-8601 format of YYYY-MM-DDThh:mm:ssZ or YYYY-MM-DDThh:mm:ss.ssZ"

data/lib/json-schema/attributes/formats/date_time_v4.rb

@@ -3,7 +3,7 @@ require 'json-schema/attributes/format'
 module JSON
   class Schema
     class DateTimeV4Format < FormatAttribute
-      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+      def self.validate(current_schema, data, fragments, processor, _validator, options = {})
         return unless data.is_a?(String)
 
         DateTime.rfc3339(data)

data/lib/json-schema/attributes/formats/ip.rb

@@ -5,7 +5,7 @@ require 'socket'
 module JSON
   class Schema
     class IPFormat < FormatAttribute
-      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+      def self.validate(current_schema, data, fragments, processor, _validator, options = {})
         return unless data.is_a?(String)
 
         begin
@@ -14,7 +14,7 @@ module JSON
           raise e unless e.message.start_with?('invalid address')
         end
 
-        family = ip_version == 6 ? Socket::AF_INET6 : Socket::AF_INET
+        family = (ip_version == 6) ? Socket::AF_INET6 : Socket::AF_INET
         unless ip && ip.family == family
           error_message = "The property '#{build_fragment(fragments)}' must be a valid IPv#{ip_version} address"
           validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])

data/lib/json-schema/attributes/formats/time.rb

@@ -3,9 +3,9 @@ require 'json-schema/attributes/format'
 module JSON
   class Schema
     class TimeFormat < FormatAttribute
-      REGEXP = /\A(\d{2}):(\d{2}):(\d{2})\z/
+      REGEXP = /\A(\d{2}):(\d{2}):(\d{2})\z/.freeze
 
-      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+      def self.validate(current_schema, data, fragments, processor, _validator, options = {})
         if data.is_a?(String)
           error_message = "The property '#{build_fragment(fragments)}' must be a time in the format of hh:mm:ss"
           if (m = REGEXP.match(data))

data/lib/json-schema/attributes/formats/uri.rb

@@ -4,7 +4,7 @@ require 'json-schema/errors/uri_error'
 module JSON
   class Schema
     class UriFormat < FormatAttribute
-      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+      def self.validate(current_schema, data, fragments, processor, _validator, options = {})
         return unless data.is_a?(String)
 
         error_message = "The property '#{build_fragment(fragments)}' must be a valid URI"

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

@@ -3,7 +3,7 @@ require 'json-schema/attribute'
 module JSON
   class Schema
     class LimitAttribute < Attribute
-      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+      def self.validate(current_schema, data, fragments, processor, _validator, options = {})
         schema = current_schema.schema
         return unless data.is_a?(acceptable_type) && invalid?(schema, value(data))
 
@@ -28,7 +28,7 @@ module JSON
         schema[limit_name]
       end
 
-      def self.exclusive?(schema)
+      def self.exclusive?(_schema)
         false
       end
 

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

@@ -3,7 +3,7 @@ require 'json-schema/attribute'
 module JSON
   class Schema
     class MaxDecimalAttribute < Attribute
-      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+      def self.validate(current_schema, data, fragments, processor, _validator, options = {})
         return unless data.is_a?(Numeric)
 
         max_decimal_places = current_schema.schema['maxDecimal']

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

@@ -27,9 +27,9 @@ module JSON
 
           diff = validation_errors(processor).count - pre_validation_error_count
           valid = false if diff > 0
-          validation_error_count += 1 if !valid
+          validation_error_count += 1 unless valid
           while diff > 0
-            diff = diff - 1
+            diff -= 1
             errors["oneOf ##{schema_index}"].push(validation_errors(processor).pop)
           end
           data = original_data
@@ -40,11 +40,11 @@ module JSON
           return
         end
 
-        if validation_error_count == one_of.length
-          message = "The property '#{build_fragment(fragments)}' of type #{type_of_data(data)} did not match any of the required schemas"
-        else
-          message = "The property '#{build_fragment(fragments)}' of type #{type_of_data(data)} matched more than one of the required schemas"
-        end
+        message = if validation_error_count == one_of.length
+                    "The property '#{build_fragment(fragments)}' of type #{type_of_data(data)} did not match any of the required schemas"
+                  else
+                    "The property '#{build_fragment(fragments)}' of type #{type_of_data(data)} matched more than one of the required schemas"
+                  end
 
         validation_error(processor, message, fragments, current_schema, self, options[:record_errors]) if message
         validation_errors(processor).last.sub_errors = errors if message

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

@@ -3,7 +3,7 @@ require 'json-schema/attribute'
 module JSON
   class Schema
     class PatternAttribute < Attribute
-      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+      def self.validate(current_schema, data, fragments, processor, _validator, options = {})
         return unless data.is_a?(String)
 
         pattern = current_schema.schema['pattern']

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

@@ -58,7 +58,7 @@ module JSON
         unless diff.empty?
           properties = diff.keys.join(', ')
           message = "The property '#{build_fragment(fragments)}' contained undefined properties: '#{properties}'"
-          validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
+          validation_error(processor, message, fragments, current_schema, self, options[:record_errors], diff.keys)
         end
       end
     end

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

@@ -5,7 +5,7 @@ module JSON
     class PropertiesV4Attribute < PropertiesAttribute
       # draft4 relies on its own RequiredAttribute validation at a higher level, rather than
       # as an attribute of individual properties.
-      def self.required?(schema, options)
+      def self.required?(_schema, options)
         options[:allPropertiesRequired] == true
       end
     end

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

@@ -20,7 +20,8 @@ module JSON
       end
 
       def self.get_referenced_uri_and_schema(s, current_schema, validator)
-        uri, schema = nil, nil
+        uri = nil
+        schema = nil
 
         temp_uri = JSON::Util::URI.normalize_ref(s['$ref'], current_schema.uri)
 
@@ -35,17 +36,17 @@ module JSON
           fragments = JSON::Util::URI.parse(JSON::Util::URI.unescape_uri(temp_uri)).fragment.split('/')
           fragment_path = ''
           fragments.each do |fragment|
-            if fragment && fragment != ''
-              fragment = fragment.gsub('~0', '~').gsub('~1', '/')
-              if target_schema.is_a?(Array)
-                target_schema = target_schema[fragment.to_i]
-              else
-                target_schema = target_schema[fragment]
-              end
-              fragment_path = fragment_path + "/#{fragment}"
-              if target_schema.nil?
-                raise SchemaError, "The fragment '#{fragment_path}' does not exist on schema #{ref_schema.uri}"
-              end
+            next unless fragment && fragment != ''
+
+            fragment = fragment.gsub('~0', '~').gsub('~1', '/')
+            target_schema = if target_schema.is_a?(Array)
+                              target_schema[fragment.to_i]
+                            else
+                              target_schema[fragment]
+                            end
+            fragment_path += "/#{fragment}"
+            if target_schema.nil?
+              raise SchemaError, "The fragment '#{fragment_path}' does not exist on schema #{ref_schema.uri}"
             end
           end
 

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

@@ -3,7 +3,7 @@ require 'json-schema/attribute'
 module JSON
   class Schema
     class RequiredAttribute < Attribute
-      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+      def self.validate(current_schema, data, fragments, processor, _validator, options = {})
         return unless data.is_a?(Hash)
 
         schema = current_schema.schema
@@ -18,7 +18,7 @@ module JSON
                           !defined_properties[property]['default'].nil? &&
                           !defined_properties[property]['readonly']
 
-          if !prop_defaults
+          unless prop_defaults
             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

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

@@ -5,13 +5,13 @@ module JSON
     class TypeAttribute < Attribute
       def self.validate(current_schema, data, fragments, processor, validator, options = {})
         union = true
-        if options[:disallow]
-          types = current_schema.schema['disallow']
-        else
-          types = current_schema.schema['type']
-        end
+        types = if options[:disallow]
+                  current_schema.schema['disallow']
+                else
+                  current_schema.schema['type']
+                end
 
-        if !types.is_a?(Array)
+        unless types.is_a?(Array)
           types = [types]
           union = false
         end
@@ -41,7 +41,7 @@ module JSON
             diff = validation_errors(processor).count - pre_validation_error_count
             valid = false if diff > 0
             while diff > 0
-              diff = diff - 1
+              diff -= 1
               union_errors["type ##{type_index}"].push(validation_errors(processor).pop)
             end
           end
@@ -50,7 +50,7 @@ module JSON
         end
 
         if options[:disallow]
-          return if !valid
+          return unless valid
 
           message = "The property '#{build_fragment(fragments)}' matched one or more of the following types: #{list_types(types)}"
           validation_error(processor, message, fragments, current_schema, self, options[:record_errors])

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

@@ -3,10 +3,10 @@ require 'json-schema/attribute'
 module JSON
   class Schema
     class TypeV4Attribute < Attribute
-      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+      def self.validate(current_schema, data, fragments, processor, _validator, options = {})
         union = true
         types = current_schema.schema['type']
-        if !types.is_a?(Array)
+        unless types.is_a?(Array)
           types = [types]
           union = false
         end

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

@@ -3,7 +3,7 @@ require 'json-schema/attribute'
 module JSON
   class Schema
     class UniqueItemsAttribute < Attribute
-      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+      def self.validate(current_schema, data, fragments, processor, _validator, options = {})
         return unless data.is_a?(Array)
 
         if data.clone.uniq!

data/lib/json-schema/errors/validation_error.rb

@@ -2,20 +2,21 @@ module JSON
   class Schema
     class ValidationError < StandardError
       INDENT = '    '
-      attr_accessor :fragments, :schema, :failed_attribute, :sub_errors, :message
+      attr_accessor :fragments, :schema, :failed_attribute, :sub_errors, :message, :properties
 
-      def initialize(message, fragments, failed_attribute, schema)
+      def initialize(message, fragments, failed_attribute, schema, properties = [])
         @fragments = fragments.clone
         @schema = schema
         @sub_errors = {}
         @failed_attribute = failed_attribute
         @message = message
+        @properties = properties
         super(message_with_schema)
       end
 
       def to_string(subschema_level = 0)
         if @sub_errors.empty?
-          subschema_level == 0 ? message_with_schema : message
+          (subschema_level == 0) ? message_with_schema : message
         else
           messages = ["#{message}. The schema specific errors were:\n"]
           @sub_errors.each do |subschema, errors|
@@ -28,7 +29,7 @@ module JSON
 
       def to_hash
         base = { schema: @schema.uri, fragment: ::JSON::Schema::Attribute.build_fragment(fragments), message: message_with_schema, failed_attribute: @failed_attribute.to_s.split(':').last.split('Attribute').first }
-        if !@sub_errors.empty?
+        unless @sub_errors.empty?
           base[:errors] = @sub_errors.each_with_object({}) do |(subschema, errors), hsh|
             subschema_sym = subschema.downcase.gsub(/\W+/, '_').to_sym
             hsh[subschema_sym] = Array(errors).map { |e| e.to_hash }

data/lib/json-schema/schema/reader.rb

@@ -20,7 +20,7 @@ module JSON
       private
 
       def type_string
-        type == :uri ? 'URI' : type.to_s
+        (type == :uri) ? 'URI' : type.to_s
       end
     end
 

data/lib/json-schema/schema/validator.rb

@@ -29,7 +29,7 @@ module JSON
       end
 
       def metaschema
-        resources = File.expand_path('../../../../resources', __FILE__)
+        resources = File.expand_path('../../../resources', __dir__)
         File.join(resources, @metaschema_name)
       end
     end

data/lib/json-schema/schema.rb

@@ -19,13 +19,13 @@ module JSON
       @uri = JSON::Util::URI.strip_fragment(@uri)
 
       # If there is a $schema on this schema, use it to determine which validator to use
-      if @schema['$schema']
-        @validator = JSON::Validator.validator_for_uri(@schema['$schema'])
-      elsif parent_validator
-        @validator = parent_validator
-      else
-        @validator = JSON::Validator.default_validator
-      end
+      @validator = if @schema['$schema']
+                     JSON::Validator.validator_for_uri(@schema['$schema'])
+                   elsif parent_validator
+                     parent_validator
+                   else
+                     JSON::Validator.default_validator
+                   end
     end
 
     def validate(data, fragments, processor, options = {})
@@ -34,13 +34,13 @@ module JSON
 
     def self.stringify(schema)
       case schema
-      when Hash then
+      when Hash
         schema.map { |key, _value| [key.to_s, stringify(schema[key])] }.to_h
-      when Array then
+      when Array
         schema.map do |schema_item|
           stringify(schema_item)
         end
-      when Symbol then
+      when Symbol
         schema.to_s
       else
         schema

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

@@ -1,11 +1,9 @@
-require 'set'
-
 # This is a hack that I don't want to ever use anywhere else or repeat EVER, but we need enums to be
 # an Array to pass schema validation. But we also want fast lookup!
 
 class ArraySet < Array
   def include?(obj)
-    if !defined? @values
+    unless defined? @values
       @values = Set.new
       each { |x| @values << convert_to_float_if_numeric(x) }
     end

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

@@ -6,7 +6,7 @@ module JSON
   module Util
     # @api private
     class URI < Addressable::URI
-      SUPPORTED_PROTOCOLS = %w(http https ftp tftp sftp ssh svn+ssh telnet nntp gopher wais ldap prospero)
+      SUPPORTED_PROTOCOLS = %w[http https ftp tftp sftp ssh svn+ssh telnet nntp gopher wais ldap prospero]
 
       class << self
         alias unescape_uri unescape
@@ -14,7 +14,7 @@ module JSON
         # @param uri [String, Addressable::URI]
         # @return [Addressable::URI, nil]
         def parse(uri)
-          super(uri)
+          super
         rescue Addressable::URI::InvalidURIError => e
           raise JSON::Schema::UriError, e.message
         end

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

@@ -36,7 +36,7 @@ module JSON
       private_class_method :new
 
       class << self
-        def mask v, str
+        def mask(v, str)
           nstr = str.bytes.to_a
           version = [0, 16, 32, 48, 64, 80][v]
           nstr[6] &= 0b00001111
@@ -54,7 +54,7 @@ module JSON
 
         # UUID generation using SHA1. Recommended over create_md5.
         # Namespace object is another UUID, some of them are pre-defined below.
-        def create_sha1 str, namespace
+        def create_sha1(str, namespace)
           sha1 = Digest::SHA1.new
           sha1.update namespace.raw_bytes
           sha1.update str
@@ -64,10 +64,10 @@ module JSON
           ret.freeze
           ret
         end
-        alias :create_v5 :create_sha1
+        alias create_v5 create_sha1
 
         # UUID generation using MD5 (for backward compat.)
-        def create_md5 str, namespace
+        def create_md5(str, namespace)
           md5 = Digest::MD5.new
           md5.update namespace.raw_bytes
           md5.update str
@@ -77,7 +77,7 @@ module JSON
           ret.freeze
           ret
         end
-        alias :create_v3 :create_md5
+        alias create_v3 create_md5
 
         # UUID  generation  using  random-number  generator.   From  it's  random
         # nature, there's  no warranty that  the created ID is  really universaly
@@ -94,14 +94,14 @@ module JSON
           ret.freeze
           ret
         end
-        alias :create_v4 :create_random
+        alias create_v4 create_random
 
-        def read_state fp # :nodoc:
+        def read_state(fp) # :nodoc:
           fp.rewind
           Marshal.load fp.read
         end
 
-        def write_state fp, c, m # :nodoc:
+        def write_state(fp, c, m) # :nodoc:
           fp.rewind
           str = Marshal.dump [c, m]
           fp.write str
@@ -117,10 +117,10 @@ module JSON
         # invokation. If you want to speed  this up, try remounting tmpdir with a
         # memory based filesystem  (such as tmpfs).  STILL slow?  then no way but
         # rewrite it with c :)
-        def create clock = nil, time = nil, mac_addr = nil
+        def create(clock = nil, time = nil, mac_addr = nil)
           c = t = m = nil
           Dir.chdir Dir.tmpdir do
-            unless FileTest.exist? STATE_FILE then
+            unless FileTest.exist? STATE_FILE
               # Generate a pseudo MAC address because we have no pure-ruby way
               # to know  the MAC  address of the  NIC this system  uses.  Note
               # that cheating  with pseudo arresses here  is completely legal:
@@ -150,10 +150,10 @@ module JSON
               c = clock % 0x4000 if clock
               m = mac_addr if mac_addr
               t = time
-              if t.nil? then
+              if t.nil?
                 # UUID epoch is 1582/Oct/15
                 tt = Time.now
-                t = (tt.to_i * 10000000) + (tt.tv_usec * 10) + 0x01B21DD213814000
+                t = (tt.to_i * 10_000_000) + (tt.tv_usec * 10) + 0x01B21DD213814000
               end
               c = c.succ # important; increment here
               write_state fp, c, m
@@ -162,21 +162,21 @@ module JSON
 
           tl = t & 0xFFFF_FFFF
           tm = t >> 32
-          tm = tm & 0xFFFF
+          tm &= 0xFFFF
           th = t >> 48
-          th = th & 0x0FFF
-          th = th | 0x1000
+          th &= 0x0FFF
+          th |= 0x1000
           cl = c & 0xFF
           ch = c & 0x3F00
-          ch = ch >> 8
-          ch = ch | 0x80
+          ch >>= 8
+          ch |= 0x80
           pack tl, tm, th, cl, ch, m
         end
-        alias :create_v1 :create
+        alias create_v1 create
 
         # A  simple GUID  parser:  just ignores  unknown  characters and  convert
         # hexadecimal dump into 16-octet object.
-        def parse obj
+        def parse(obj)
           str = obj.to_s.sub(/\Aurn:uuid:/, '')
           str.gsub!(/[^0-9A-Fa-f]/, '')
           raw = str[0..31].lines.to_a.pack 'H*'
@@ -187,7 +187,7 @@ module JSON
 
         # The 'primitive constructor' of this class
         # Note UUID.pack(uuid.unpack) == uuid
-        def pack tl, tm, th, ch, cl, n
+        def pack(tl, tm, th, ch, cl, n)
           raw = [tl, tm, th, ch, cl, n].pack 'NnnCCa6'
           ret = new raw
           ret.freeze
@@ -238,13 +238,14 @@ module JSON
       # Two  UUIDs  are  said  to  be  equal if  and  only  if  their  (byte-order
       # canonicalized) integer representations are equivalent.  Refer RFC4122 for
       # details.
-      def == other
+      def ==(other)
         to_i == other.to_i
       end
 
       include Comparable
+
       # UUIDs are comparable (don't know what benefits are there, though).
-      def <=> other
+      def <=>(other)
         to_s <=> other.to_s
       end
 

data/lib/json-schema/validator.rb

@@ -3,10 +3,10 @@ require 'pathname'
 require 'bigdecimal'
 require 'digest/sha1'
 require 'date'
-require 'thread'
 require 'timeout'
 require 'stringio'
 require 'yaml'
+require 'delegate'
 
 require 'json-schema/schema/reader'
 require 'json-schema/errors/schema_error'
@@ -38,11 +38,12 @@ module JSON
     @@available_json_backends = []
     @@json_backend = nil
     @@serializer = nil
+    @@use_multi_json = defined?(MultiJson) ? true : false
+    @@multi_json_warned = false
     @@mutex = Mutex.new
 
     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
@@ -108,24 +109,47 @@ module JSON
       end
     end
 
+    class ErrorRecorder < SimpleDelegator
+      def initialize(sub)
+        @errors = []
+
+        super
+      end
+
+      def validation_error(error)
+        @errors.push(error)
+      end
+
+      def validation_errors
+        @errors
+      end
+
+      def with_errors
+        self
+      end
+    end
+
+    def with_errors
+      ErrorRecorder.new(self)
+    end
+
     # Run a simple true/false validation of data against a schema
     def validate(data)
       original_data = data
       data = initialize_data(data)
-      @base_schema.validate(data, [], self, @validation_options)
+      error_recorder = with_errors
+      @base_schema.validate(data, [], error_recorder, @validation_options)
 
       if @options[:record_errors]
         if @options[:errors_as_objects]
-          @errors.map { |e| e.to_hash }
+          error_recorder.validation_errors.map { |e| e.to_hash }
         else
-          @errors.map { |e| e.to_string }
+          error_recorder.validation_errors.map { |e| e.to_string }
         end
       else
         true
       end
     ensure
-      @errors = []
-
       if @validation_options[:clear_cache] == true
         self.class.clear_cache
       end
@@ -166,11 +190,11 @@ module JSON
 
       # Check for schemas in union types
       %w[type disallow].each do |key|
-        if schema[key].is_a?(Array)
-          schema[key].each do |type|
-            if type.is_a?(Hash)
-              handle_schema(parent_schema, type)
-            end
+        next unless schema[key].is_a?(Array)
+
+        schema[key].each do |type|
+          if type.is_a?(Hash)
+            handle_schema(parent_schema, type)
           end
         end
       end
@@ -229,21 +253,11 @@ module JSON
       end
     end
 
-    def validation_error(error)
-      @errors.push(error)
-    end
-
-    def validation_errors
-      @errors
-    end
-
     class << self
       def validate(schema, data, opts = {})
-        begin
-          validate!(schema, data, opts)
-        rescue JSON::Schema::ValidationError, JSON::Schema::SchemaError
-          false
-        end
+        validate!(schema, data, opts)
+      rescue JSON::Schema::ValidationError, JSON::Schema::SchemaError
+        false
       end
 
       def validate_json(schema, data, opts = {})
@@ -327,7 +341,7 @@ module JSON
 
       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.'
-        @@cache_schemas = val == true ? true : false
+        @@cache_schemas = val == true
       end
 
       def validators
@@ -399,8 +413,20 @@ module JSON
         end
       end
 
+      def use_multi_json?
+        @@use_multi_json
+      end
+
+      def use_multi_json=(value)
+        @@use_multi_json = value ? true : false
+        if use_multi_json? == false
+          ensure_ruby_json_backends!
+        end
+      end
+
       def json_backend
-        if defined?(MultiJson)
+        if use_multi_json?
+          multi_json_deprecation_warning!
           MultiJson.respond_to?(:adapter) ? MultiJson.adapter : MultiJson.engine
         else
           @@json_backend
@@ -408,8 +434,9 @@ module JSON
       end
 
       def json_backend=(backend)
-        if defined?(MultiJson)
-          backend = backend == 'json' ? 'json_gem' : backend
+        if use_multi_json?
+          multi_json_deprecation_warning!
+          backend = 'json_gem' if backend == 'json'
           MultiJson.respond_to?(:use) ? MultiJson.use(backend) : MultiJson.engine = backend
         else
           backend = backend.to_s
@@ -422,7 +449,8 @@ module JSON
       end
 
       def parse(s)
-        if defined?(MultiJson)
+        if use_multi_json?
+          multi_json_deprecation_warning!
           begin
             MultiJson.respond_to?(:adapter) ? MultiJson.load(s) : MultiJson.decode(s)
           rescue MultiJson::ParseError => e
@@ -469,8 +497,12 @@ module JSON
         end
       end
 
-      if !defined?(MultiJson)
-        if Gem::Specification::find_all_by_name('json').any?
+      def ensure_ruby_json_backends!
+        if !@@available_json_backends.empty? || !@@serializer.nil?
+          return
+        end
+
+        if Gem::Specification.find_all_by_name('json').any?
           require 'json'
           @@available_json_backends << 'json'
           @@json_backend = 'json'
@@ -484,41 +516,61 @@ module JSON
           end
         end
 
-        if Gem::Specification::find_all_by_name('yajl-ruby').any?
+        if Gem::Specification.find_all_by_name('yajl-ruby').any?
           require 'yajl'
           @@available_json_backends << 'yajl'
           @@json_backend = 'yajl'
         end
 
-        if @@json_backend == 'yajl'
-          @@serializer = lambda { |o| Yajl::Encoder.encode(o) }
-        elsif @@json_backend == 'json'
-          @@serializer = lambda { |o| JSON.dump(o) }
-        else
-          @@serializer = lambda { |o| YAML.dump(o) }
+        @@serializer = if @@json_backend == 'yajl'
+                         ->(o) { Yajl::Encoder.encode(o) }
+                       elsif @@json_backend == 'json'
+                         ->(o) { JSON.dump(o) }
+                       else
+                         ->(o) { YAML.dump(o) }
+                       end
+      end
+
+      def multi_json_deprecation_warning!
+        unless @@multi_json_warned
+          @@multi_json_warned = true
+          warn '[DEPRECATION NOTICE] json-schema support for MultiJSON is deprecated and will be removed in a future version. ' \
+               'To stop using MultiJSON, add `JSON::Validator.use_multi_json = false` to your application\'s initialization code.'
         end
       end
+
+      private
+
+      # for test usage only
+      def reset_multi_json_deprecation_warning!
+        @@multi_json_warned = false
+      end
+    end
+
+    if use_multi_json? == false
+      ensure_ruby_json_backends!
     end
 
     private
 
-    if Gem::Specification::find_all_by_name('uuidtools').any?
+    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 = ->(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 = ->(s) { JSON::Util::UUID.create_v5(s, JSON::Util::UUID::Nil).to_s }
     end
 
-    def serialize schema
-      if defined?(MultiJson)
+    def serialize(schema)
+      if self.class.use_multi_json?
+        self.class.multi_json_deprecation_warning!
         MultiJson.respond_to?(:dump) ? MultiJson.dump(schema) : MultiJson.encode(schema)
       else
         @@serializer.call(schema)
       end
     end
 
-    def fake_uuid schema
+    def fake_uuid(schema)
       @@fake_uuid_generator.call(schema)
     end
 
@@ -535,7 +587,15 @@ module JSON
         rescue JSON::Schema::JsonParseError
           # Build a uri for it
           schema_uri = Util::URI.normalized_uri(schema)
-          if !self.class.schema_loaded?(schema_uri)
+          if self.class.schema_loaded?(schema_uri)
+            schema = self.class.schema_for_uri(schema_uri)
+            if @options[:list] && @options[:fragment].nil?
+              schema = schema.to_array_schema
+              schema.uri = JSON::Util::URI.parse(fake_uuid(serialize(schema.schema)))
+              self.class.add_schema(schema)
+            end
+            schema
+          else
             schema = @options[:schema_reader].read(schema_uri)
             schema = JSON::Schema.stringify(schema)
 
@@ -544,14 +604,6 @@ module JSON
             end
 
             self.class.add_schema(schema)
-          else
-            schema = self.class.schema_for_uri(schema_uri)
-            if @options[:list] && @options[:fragment].nil?
-              schema = schema.to_array_schema
-              schema.uri = JSON::Util::URI.parse(fake_uuid(serialize(schema.schema)))
-              self.class.add_schema(schema)
-            end
-            schema
           end
         end
       elsif schema.is_a?(Hash)
@@ -580,7 +632,7 @@ module JSON
           begin
             # 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)
+            data = self.class.parse(data) unless strict_convert
           rescue JSON::Schema::JsonParseError
             begin
               json_uri = Util::URI.normalized_uri(data)

data/lib/json-schema.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 
-if Gem::Specification::find_all_by_name('multi_json').any?
+if Gem::Specification.find_all_by_name('multi_json').any?
   require 'multi_json'
 
   # Force MultiJson to load an engine before we define the JSON constant here; otherwise,
@@ -14,5 +14,5 @@ require 'json-schema/schema'
 require 'json-schema/schema/reader'
 require 'json-schema/validator'
 
-Dir[File.join(File.dirname(__FILE__), 'json-schema/attributes/**/*.rb')].each { |file| require file }
+Dir[File.join(File.dirname(__FILE__), 'json-schema/attributes/**/*.rb')].sort.each { |file| require file }
 Dir[File.join(File.dirname(__FILE__), 'json-schema/validators/*.rb')].sort!.each { |file| require file }

metadata

@@ -1,72 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 6.2.0
 platform: ruby
 authors:
 - Kenny Hoxworth
 - Vox Pupuli
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: voxpupuli-rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.23'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.23'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -85,23 +28,28 @@ dependencies:
   name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-description: 
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 email: voxpupuli@groups.io
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.md
 - LICENSE.md
+- README.md
 files:
 - LICENSE.md
 - README.md
@@ -194,7 +142,6 @@ metadata:
   changelog_uri: https://github.com/voxpupuli/json-schema//blob/master/CHANGELOG.md
   bug_tracker_uri: https://github.com/voxpupuli/json-schema//issues
   funding_uri: https://github.com/sponsors/voxpupuli
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -209,8 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key: 
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Ruby JSON Schema Validator
 test_files: []