Merge pull request #549 from voxpupuli/ruby322

Require Ruby 3.2 or newer

Author: bastelfreak

.github/workflows/test.yml

@@ -20,11 +20,8 @@ jobs:
           - ruby: truffleruby
           - ruby: truffleruby+graalvm
           - ruby: jruby
-          - ruby: "2.7"
-            rake_task: "rubocop test"
-          - ruby: "3.0"
-          - ruby: "3.1"
           - ruby: "3.2"
+            rake_task: "rubocop test"
           - ruby: "3.3"
           - ruby: "3.3"
             rubyopt: "--enable-frozen-string-literal"

.rubocop.yml

@@ -8,3 +8,6 @@ plugins:
   - rubocop-rspec
   - rubocop-performance
   - rubocop-minitest
+
+AllCops:
+  TargetRubyVersion: 3.2

.rubocop_todo.yml

@@ -1,11 +1,18 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --no-auto-gen-timestamp`
-# using RuboCop version 1.75.8.
+# using RuboCop version 1.79.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: RequireParenthesesForMethodChains.
+Lint/AmbiguousRange:
+  Exclude:
+    - 'test/common_test_suite_test.rb'
+
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowSafeAssignment.
@@ -21,13 +28,6 @@ Lint/MissingSuper:
   Exclude:
     - 'lib/json-schema/attributes/formats/custom.rb'
 
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Lint/NonDeterministicRequireOrder:
-  Exclude:
-    - 'lib/json-schema.rb'
-    - 'test/support/test_helper.rb'
-
 # Offense count: 2
 # Configuration parameters: AllowComments, AllowNil.
 Lint/SuppressedException:
@@ -146,7 +146,7 @@ Style/FormatString:
 Style/FormatStringToken:
   EnforcedStyle: unannotated
 
-# Offense count: 117
+# Offense count: 118
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
@@ -183,109 +183,31 @@ Style/IfUnlessModifier:
     - 'lib/json-schema/schema/validator.rb'
     - 'lib/json-schema/validator.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowedMethods.
-# AllowedMethods: nonzero?
-Style/IfWithBooleanLiteralBranches:
-  Exclude:
-    - 'lib/json-schema/validator.rb'
-
-# Offense count: 6
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: line_count_dependent, lambda, literal
-Style/Lambda:
-  Exclude:
-    - 'lib/json-schema/validator.rb'
-    - 'test/custom_format_test.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/MapToHash:
   Exclude:
     - 'lib/json-schema/schema.rb'
 
-# Offense count: 12
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
-Style/MethodDefParentheses:
-  Exclude:
-    - 'lib/json-schema/util/uuid.rb'
-    - 'lib/json-schema/validator.rb'
-
 # Offense count: 1
 Style/MultilineBlockChain:
   Exclude:
     - 'lib/json-schema/attribute.rb'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Style/MultilineIfThen:
-  Exclude:
-    - 'lib/json-schema/util/uuid.rb'
-
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-Style/MultilineWhenThen:
-  Exclude:
-    - 'lib/json-schema/schema.rb'
-
-# Offense count: 11
+# Offense count: 8
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: literals, strict
 Style/MutableConstant:
   Exclude:
     - 'lib/json-schema/attribute.rb'
-    - 'lib/json-schema/attributes/formats/date.rb'
-    - 'lib/json-schema/attributes/formats/date_time.rb'
-    - 'lib/json-schema/attributes/formats/time.rb'
     - 'lib/json-schema/errors/validation_error.rb'
     - 'lib/json-schema/util/uri.rb'
     - 'lib/json-schema/util/uuid.rb'
     - 'test/extends_nested_test.rb'
     - 'test/schema_reader_test.rb'
     - 'test/support/type_validation.rb'
 
-# Offense count: 10
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: both, prefix, postfix
-Style/NegatedIf:
-  Exclude:
-    - 'lib/json-schema/attributes/anyof.rb'
-    - 'lib/json-schema/attributes/extends.rb'
-    - 'lib/json-schema/attributes/oneof.rb'
-    - 'lib/json-schema/attributes/required.rb'
-    - 'lib/json-schema/attributes/type.rb'
-    - 'lib/json-schema/attributes/type_v4.rb'
-    - 'lib/json-schema/errors/validation_error.rb'
-    - 'lib/json-schema/util/array_set.rb'
-    - 'lib/json-schema/validator.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/NegatedIfElseCondition:
-  Exclude:
-    - 'lib/json-schema/validator.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, MinBodyLength, AllowConsecutiveConditionals.
-# SupportedStyles: skip_modifier_ifs, always
-Style/Next:
-  Exclude:
-    - 'lib/json-schema/attributes/ref.rb'
-    - 'lib/json-schema/validator.rb'
-
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Strict, AllowedNumbers, AllowedPatterns.
-Style/NumericLiterals:
-  MinDigits: 23
-
 # Offense count: 10
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
@@ -308,21 +230,6 @@ Style/OptionalBooleanParameter:
   Exclude:
     - 'lib/json-schema/validator.rb'
 
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-Style/ParallelAssignment:
-  Exclude:
-    - 'lib/json-schema/attributes/extends.rb'
-    - 'lib/json-schema/attributes/ref.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Exclude:
-    - 'Rakefile'
-    - 'lib/json-schema/util/uri.rb'
-
 # Offense count: 10
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
@@ -335,37 +242,6 @@ Style/PreferredHashMethods:
     - 'lib/json-schema/attributes/required.rb'
     - 'lib/json-schema/schema/validator.rb'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantBegin:
-  Exclude:
-    - 'lib/json-schema/attributes/formats/custom.rb'
-    - 'lib/json-schema/validator.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantConditional:
-  Exclude:
-    - 'lib/json-schema/validator.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantSelfAssignmentBranch:
-  Exclude:
-    - 'lib/json-schema/validator.rb'
-
-# Offense count: 11
-# This cop supports safe autocorrection (--autocorrect).
-Style/SelfAssignment:
-  Exclude:
-    - 'lib/json-schema/attributes/additionalproperties.rb'
-    - 'lib/json-schema/attributes/allof.rb'
-    - 'lib/json-schema/attributes/anyof.rb'
-    - 'lib/json-schema/attributes/oneof.rb'
-    - 'lib/json-schema/attributes/ref.rb'
-    - 'lib/json-schema/attributes/type.rb'
-    - 'lib/json-schema/util/uuid.rb'
-
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
@@ -375,12 +251,6 @@ Style/StringConcatenation:
     - 'lib/json-schema/util/uuid.rb'
     - 'test/schema_reader_test.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/SuperArguments:
-  Exclude:
-    - 'lib/json-schema/util/uri.rb'
-
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments.
@@ -390,20 +260,9 @@ Style/SymbolProc:
     - 'lib/json-schema/errors/validation_error.rb'
     - 'lib/json-schema/validator.rb'
 
-# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, AllowSafeAssignment.
-# SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
-Style/TernaryParentheses:
-  Exclude:
-    - 'lib/json-schema/attributes/formats/ip.rb'
-    - 'lib/json-schema/errors/validation_error.rb'
-    - 'lib/json-schema/schema/reader.rb'
-    - 'lib/json-schema/validator.rb'
-
 # Offense count: 71
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
+# Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 235

Rakefile

@@ -71,7 +71,7 @@ begin
 rescue LoadError
 else
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-    config.exclude_labels = %w{duplicate question invalid wontfix wont-fix skip-changelog dependencies}
+    config.exclude_labels = %w[duplicate question invalid wontfix wont-fix skip-changelog dependencies]
     config.user = 'voxpupuli'
     config.project = 'json-schema'
     gem_version = Gem::Specification.load("#{config.project}.gemspec").version

json-schema.gemspec

@@ -14,12 +14,12 @@ Gem::Specification.new do |s|
   s.files = Dir['lib/**/*', 'resources/*.json']
   s.require_path = 'lib'
   s.extra_rdoc_files = ['README.md', 'LICENSE.md']
-  s.required_ruby_version = '>= 2.7'
+  s.required_ruby_version = '>= 3.2'
   s.license = 'MIT'
 
   s.add_development_dependency 'minitest', '~> 5.0'
   s.add_development_dependency 'rake', '~> 13.0'
-  s.add_development_dependency 'voxpupuli-rubocop', '~> 3.1.0'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 4.2.0'
   s.add_development_dependency 'webmock', '~> 3.23'
 
   s.add_dependency 'addressable', '~> 2.8'

lib/json-schema/attributes/additionalproperties.rb

@@ -30,7 +30,7 @@ def self.remove_valid_properties(extra_properties, current_schema, validator)
         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|

lib/json-schema/attributes/allof.rb

@@ -32,7 +32,7 @@ def self.validate(current_schema, data, fragments, processor, validator, options
           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
@@ -44,7 +44,7 @@ def self.validate(current_schema, data, fragments, processor, validator, options
           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
+            common_missing_properties &= curr_property_errors.to_set
           end
         end
 

lib/json-schema/attributes/anyof.rb

@@ -27,7 +27,7 @@ def self.validate(current_schema, data, fragments, processor, validator, options
           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 @@ def self.validate(current_schema, data, fragments, processor, validator, options
           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

lib/json-schema/attributes/extends.rb

@@ -6,7 +6,7 @@ class Schema
     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,15 +22,17 @@ def self.validate(current_schema, data, fragments, processor, validator, options
       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
           if s['$ref']
             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'

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

@@ -9,12 +9,10 @@ def initialize(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.class, options[:record_errors])
-        end
+        @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