json-schema 5.1.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c842fa3f98c7ebbdde9ebdbceb44bb1eab1f282f6a5c6c0008e0aac0eca92b6
-  data.tar.gz: d6f98215e98ce89c007d158594078d7135574543c10a82e953dcb3feed6dc9fb
+  metadata.gz: 97a2b4d9e49213c47ca77141334410829d0d03cb5a3578ca985b03faabc91f25
+  data.tar.gz: feed8cd6688bcb611fc5010ad40e96bd2838c5338f35d959b1216b2bd2f449dc
 SHA512:
-  metadata.gz: f744aa3ddcf37191afd16c7424b97d4e610f5da6f0c5ccbdad8fdcc10ee95f1d130f165142da95394ea09a758907b6bf6157343a1796477ed75a340c17217b65
-  data.tar.gz: 1a0d01bfb3595f4286603e9c31d3c578aff55b4abc37952c41e448d02a7ea22c37a7ba5bc8cbb85809f4395992b0da8c73ec79109e6d15338b8802cf96465dbb
+  metadata.gz: 1faa5f35d538f52cb1490d19c875b49025351589b13854b4e40d14d89208b6da683d850afbe1b2e21b781943186d866db1bfc5021c6b021b955c69c6c464374e
+  data.tar.gz: 14b4744fc7b5b47bed8e0599aa1b0dd3ded3338748ab21e07b8bbfbf9d5ca13d310099d90b7436cb43b8e2e0f22b4c9f2ed5e884475f028616144a826cf8b582

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/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
             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 = 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/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/formats/custom.rb

@@ -8,7 +8,7 @@ module JSON
         @validation_proc = validation_proc
       end
 
-      def validate(current_schema, data, fragments, processor, validator, options = {})
+      def validate(current_schema, data, fragments, processor, _validator, options = {})
         begin
           @validation_proc.call data
         rescue JSON::Schema::CustomFormatError => e

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

@@ -5,7 +5,7 @@ module JSON
     class DateFormat < FormatAttribute
       REGEXP = /\A\d{4}-\d{2}-\d{2}\z/
 
-      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

@@ -5,7 +5,7 @@ module JSON
     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/
 
-      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

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

@@ -5,7 +5,7 @@ module JSON
     class TimeFormat < FormatAttribute
       REGEXP = /\A(\d{2}):(\d{2}):(\d{2})\z/
 
-      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

@@ -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

@@ -37,11 +37,11 @@ module JSON
           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
+              target_schema = if target_schema.is_a?(Array)
+                                target_schema[fragment.to_i]
+                              else
+                                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}"

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

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

@@ -5,11 +5,11 @@ 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)
           types = [types]

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

@@ -3,7 +3,7 @@ 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)

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,14 +2,15 @@ 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
 

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 = {})

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

@@ -64,7 +64,7 @@ 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
@@ -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,7 +94,7 @@ module JSON
           ret.freeze
           ret
         end
-        alias :create_v4 :create_random
+        alias create_v4 create_random
 
         def read_state fp # :nodoc:
           fp.rewind
@@ -172,7 +172,7 @@ module JSON
           ch = 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.

data/lib/json-schema/validator.rb

@@ -3,7 +3,6 @@ require 'pathname'
 require 'bigdecimal'
 require 'digest/sha1'
 require 'date'
-require 'thread'
 require 'timeout'
 require 'stringio'
 require 'yaml'
@@ -42,7 +41,6 @@ module JSON
 
     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 +106,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
@@ -229,14 +250,6 @@ 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
@@ -470,7 +483,7 @@ module JSON
       end
 
       if !defined?(MultiJson)
-        if Gem::Specification::find_all_by_name('json').any?
+        if Gem::Specification.find_all_by_name('json').any?
           require 'json'
           @@available_json_backends << 'json'
           @@json_backend = 'json'
@@ -484,25 +497,25 @@ 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) }
-        end
+        @@serializer = if @@json_backend == 'yajl'
+                         lambda { |o| Yajl::Encoder.encode(o) }
+                       elsif @@json_backend == 'json'
+                         lambda { |o| JSON.dump(o) }
+                       else
+                         lambda { |o| YAML.dump(o) }
+                       end
       end
     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 }
     else

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,

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.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
@@ -45,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -95,13 +94,12 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-description: 
 email: voxpupuli@groups.io
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.md
 - LICENSE.md
+- README.md
 files:
 - LICENSE.md
 - README.md
@@ -194,7 +192,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 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Ruby JSON Schema Validator
 test_files: []