shoulda-matchers 5.3.0 → 6.1.0

data/lib/shoulda/matchers/active_record/validate_uniqueness_of_matcher.rb

@@ -411,9 +411,29 @@ module Shoulda
           if scopes_match?
             true
           else
-            @failure_reason = 'Expected the validation '
+            @failure_reason = String.new('Expected the validation ').tap do |failure_reason_string|
+              failure_reason_string <<
+                if expected_scopes.empty?
+                  'not to be scoped to anything, '
+                else
+                  "to be scoped to #{inspected_expected_scopes}, "
+                end
+
+              if actual_sets_of_scopes.any?
+                failure_reason_string << 'but it was scoped to '
+                failure_reason_string << "#{inspected_actual_scopes} instead."
+              else
+                failure_reason_string << 'but it was not scoped to anything.'
+              end
+            end
 
-            @failure_reason <<
+            false
+          end
+        end
+
+        def build_failure_reason
+          String.new('Expected the validation ').tap do |failure_reason_string|
+            failure_reason_string <<
               if expected_scopes.empty?
                 'not to be scoped to anything, '
               else
@@ -421,27 +441,25 @@ module Shoulda
               end
 
             if actual_sets_of_scopes.any?
-              @failure_reason << 'but it was scoped to '
-              @failure_reason << "#{inspected_actual_scopes} instead."
+              failure_reason_string << 'but it was scoped to '
+              failure_reason_string << "#{inspected_actual_scopes} instead."
             else
-              @failure_reason << 'but it was not scoped to anything.'
+              failure_reason_string << 'but it was not scoped to anything.'
             end
-
-            false
           end
         end
 
         def does_not_match_scopes_configuration?
           if scopes_match?
-            @failure_reason = 'Expected the validation '
-
-            if expected_scopes.empty?
-              @failure_reason << 'to be scoped to nothing, '
-              @failure_reason << 'but it was scoped to '
-              @failure_reason << "#{inspected_actual_scopes} instead."
-            else
-              @failure_reason << 'not to be scoped to '
-              @failure_reason << inspected_expected_scopes
+            @failure_reason = String.new('Expected the validation ').tap do |failure_reason|
+              if expected_scopes.empty?
+                failure_reason << 'to be scoped to nothing, '
+                failure_reason << 'but it was scoped to '
+                failure_reason << "#{inspected_actual_scopes} instead."
+              else
+                failure_reason << 'not to be scoped to '
+                failure_reason << inspected_expected_scopes
+              end
             end
 
             false
@@ -618,20 +636,18 @@ module Shoulda
           else
             inspected_scopes = scopes_missing_on_model.map(&:inspect)
 
-            reason = ''
-
-            reason << inspected_scopes.to_sentence
-
-            reason <<
-              if inspected_scopes.many?
-                ' do not seem to be attributes'
-              else
-                ' does not seem to be an attribute'
-              end
+            @failure_reason = String.new.tap do |reason|
+              reason << inspected_scopes.to_sentence
 
-            reason << " on #{model.name}."
+              reason <<
+                if inspected_scopes.many?
+                  ' do not seem to be attributes'
+                else
+                  ' does not seem to be an attribute'
+                end
 
-            @failure_reason = reason
+              reason << " on #{model.name}."
+            end
 
             false
           end
@@ -643,20 +659,18 @@ module Shoulda
           else
             inspected_scopes = scopes_present_on_model.map(&:inspect)
 
-            reason = ''
-
-            reason << inspected_scopes.to_sentence
-
-            reason <<
-              if inspected_scopes.many?
-                ' seem to be attributes'
-              else
-                ' seems to be an attribute'
-              end
+            @failure_reason = String.new.tap do |reason|
+              reason << inspected_scopes.to_sentence
 
-            reason << " on #{model.name}."
+              reason <<
+                if inspected_scopes.many?
+                  ' seem to be attributes'
+                else
+                  ' seems to be an attribute'
+                end
 
-            @failure_reason = reason
+              reason << " on #{model.name}."
+            end
 
             false
           end
@@ -936,45 +950,43 @@ module Shoulda
         end
 
         def failure_message_preface # rubocop:disable Metrics/MethodLength
-          prefix = ''
-
-          if @existing_record_created
-            prefix << "After taking the given #{model.name}"
+          String.new.tap do |prefix|
+            if @existing_record_created
+              prefix << "After taking the given #{model.name}"
+
+              if attribute_setter_for_existing_record
+                prefix << ', setting '
+                prefix << description_for_attribute_setter(
+                  attribute_setter_for_existing_record,
+                )
+              else
+                prefix << ", whose :#{attribute} is "
+                prefix << "‹#{existing_value_read.inspect}›"
+              end
 
-            if attribute_setter_for_existing_record
-              prefix << ', setting '
+              prefix << ', and saving it as the existing record, then'
+            elsif attribute_setter_for_existing_record
+              prefix << "Given an existing #{model.name},"
+              prefix << ' after setting '
               prefix << description_for_attribute_setter(
                 attribute_setter_for_existing_record,
               )
+              prefix << ', then'
             else
-              prefix << ", whose :#{attribute} is "
-              prefix << "‹#{existing_value_read.inspect}›"
+              prefix << "Given an existing #{model.name} whose :#{attribute}"
+              prefix << ' is '
+              prefix << Shoulda::Matchers::Util.inspect_value(
+                existing_value_read,
+              )
+              prefix << ', after'
             end
 
-            prefix << ', and saving it as the existing record, then'
-          elsif attribute_setter_for_existing_record
-            prefix << "Given an existing #{model.name},"
-            prefix << ' after setting '
-            prefix << description_for_attribute_setter(
-              attribute_setter_for_existing_record,
-            )
-            prefix << ', then'
-          else
-            prefix << "Given an existing #{model.name} whose :#{attribute}"
-            prefix << ' is '
-            prefix << Shoulda::Matchers::Util.inspect_value(
-              existing_value_read,
-            )
-            prefix << ', after'
-          end
-
-          prefix << " making a new #{model.name} and setting "
+            prefix << " making a new #{model.name} and setting "
 
-          prefix << descriptions_for_attribute_setters_for_new_record
+            prefix << descriptions_for_attribute_setters_for_new_record
 
-          prefix << ", the matcher expected the new #{model.name} to be"
-
-          prefix
+            prefix << ", the matcher expected the new #{model.name} to be"
+          end
         end
 
         def attribute_changed_value_message

data/lib/shoulda/matchers/active_record.rb

@@ -24,6 +24,8 @@ require 'shoulda/matchers/active_record/define_enum_for_matcher'
 require 'shoulda/matchers/active_record/uniqueness'
 require 'shoulda/matchers/active_record/validate_uniqueness_of_matcher'
 require 'shoulda/matchers/active_record/have_attached_matcher'
+require 'shoulda/matchers/active_record/normalize_matcher'
+require 'shoulda/matchers/active_record/encrypt_matcher'
 
 module Shoulda
   module Matchers

data/lib/shoulda/matchers/doublespeak/double_collection.rb

@@ -18,15 +18,11 @@ module Shoulda
         end
 
         def activate
-          doubles_by_method_name.each do |_method_name, double|
-            double.activate
-          end
+          doubles_by_method_name.each_value(&:activate)
         end
 
         def deactivate
-          doubles_by_method_name.each do |_method_name, double|
-            double.deactivate
-          end
+          doubles_by_method_name.each_value(&:deactivate)
         end
 
         def calls_by_method_name

data/lib/shoulda/matchers/doublespeak/world.rb

@@ -39,15 +39,11 @@ module Shoulda
         private
 
         def activate
-          double_collections_by_class.each do |_klass, double_collection|
-            double_collection.activate
-          end
+          double_collections_by_class.each_value(&:activate)
         end
 
         def deactivate
-          double_collections_by_class.each do |_klass, double_collection|
-            double_collection.deactivate
-          end
+          double_collections_by_class.each_value(&:deactivate)
         end
 
         def double_collections_by_class

data/lib/shoulda/matchers/independent/delegate_method_matcher.rb

@@ -400,7 +400,7 @@ module Shoulda
                 false
               rescue NoMethodError => e
                 if e.message =~
-                   /undefined method `#{delegate_method}' for nil:NilClass/
+                   /undefined method `#{delegate_method}' for nil/
                   false
                 else
                   raise e
@@ -440,22 +440,20 @@ module Shoulda
         end
 
         def formatted_calls_on_delegate_object
-          string = ''
-
-          if calls_on_delegate_object.any?
-            string << "\n\n"
-            calls_on_delegate_object.each_with_index do |call, i|
-              name = call.method_name
-              args = call.args.map(&:inspect).join(', ')
-              string << "#{i + 1}) #{name}(#{args})\n"
+          String.new.tap do |string|
+            if calls_on_delegate_object.any?
+              string << "\n\n"
+              calls_on_delegate_object.each_with_index do |call, i|
+                name = call.method_name
+                args = call.args.map(&:inspect).join(', ')
+                string << "#{i + 1}) #{name}(#{args})\n"
+              end
+            else
+              string << ' (none)'
             end
-          else
-            string << ' (none)'
-          end
 
-          string.rstrip!
-
-          string
+            string.rstrip!
+          end
         end
       end
     end

data/lib/shoulda/matchers/rails_shim.rb

@@ -1,7 +1,7 @@
 module Shoulda
   module Matchers
     # @private
-    module RailsShim # rubocop:disable Metrics/ModuleLength
+    module RailsShim
       class << self
         def action_pack_version
           Gem::Version.new(::ActionPack::VERSION::STRING)
@@ -9,10 +9,6 @@ module Shoulda
           Gem::Version.new('0')
         end
 
-        def active_record_gte_6?
-          Gem::Requirement.new('>= 6').satisfied_by?(active_record_version)
-        end
-
         def active_record_version
           Gem::Version.new(::ActiveRecord::VERSION::STRING)
         rescue NameError
@@ -60,9 +56,10 @@ module Shoulda
         end
 
         def serialized_attributes_for(model)
+          type_serialized_defined = Object.const_defined?('ActiveRecord::Type::Serialized')
           attribute_types_for(model).
             inject({}) do |hash, (attribute_name, attribute_type)|
-              if attribute_type.is_a?(::ActiveRecord::Type::Serialized)
+              if type_serialized_defined && attribute_type.is_a?(::ActiveRecord::Type::Serialized)
                 hash.merge(attribute_name => attribute_type.coder)
               else
                 hash
@@ -146,6 +143,10 @@ module Shoulda
             model.respond_to?(:attribute_types)
         end
 
+        def validates_column_options?
+          Gem::Requirement.new('>= 7.1.0').satisfied_by?(active_record_version)
+        end
+
         private
 
         def simply_generate_validation_message(
@@ -172,6 +173,7 @@ module Shoulda
           I18n.translate(primary_translation_key, translate_options)
         end
 
+        # @private
         class FakeAttributeType
           def initialize(model, attribute_name)
             @model = model

data/lib/shoulda/matchers/util/word_wrap.rb

@@ -41,7 +41,7 @@ module Shoulda
 
     # @private
     class Text < ::String
-      LIST_ITEM_REGEXP = /\A((?:[a-z0-9]+(?:\)|\.)|\*) )/.freeze
+      LIST_ITEM_REGEXP = /\A((?:[a-z0-9]+(?:\)|\.)|\*) )/
 
       def indented?
         self =~ /\A +/

data/lib/shoulda/matchers/util.rb

@@ -7,10 +7,9 @@ module Shoulda
       MAXIMUM_LENGTH_OF_VALUE_TO_DISPLAY = 500
 
       def self.deconstantize(path)
-        if (
-          defined?(ActiveSupport::Inflector) &&
-          ActiveSupport::Inflector.respond_to?(:deconstantize)
-        )
+        if defined?(ActiveSupport::Inflector) &&
+           ActiveSupport::Inflector.respond_to?(:deconstantize)
+
           ActiveSupport::Inflector.deconstantize(path)
         else
           path.to_s[0...(path.to_s.rindex('::') || 0)]
@@ -18,10 +17,9 @@ module Shoulda
       end
 
       def self.safe_constantize(camel_cased_word)
-        if (
-          defined?(ActiveSupport::Inflector) &&
-          ActiveSupport::Inflector.respond_to?(:safe_constantize)
-        )
+        if defined?(ActiveSupport::Inflector) &&
+           ActiveSupport::Inflector.respond_to?(:safe_constantize)
+
           ActiveSupport::Inflector.safe_constantize(camel_cased_word)
         else
           begin
@@ -72,17 +70,17 @@ module Shoulda
       end
 
       def self.inspect_hash(hash)
-        output = '‹{'
-
-        output << hash.map { |key, value|
-          if key.is_a?(Symbol)
-            "#{key}: #{value.inspect}"
-          else
-            "#{key.inspect} => #{value.inspect}"
-          end
-        }.join(', ')
+        String.new('‹{').tap do |output|
+          output << hash.map { |key, value|
+            if key.is_a?(Symbol)
+              "#{key}: #{value.inspect}"
+            else
+              "#{key.inspect} => #{value.inspect}"
+            end
+          }.join(', ')
 
-        output << '}›'
+          output << '}›'
+        end
       end
 
       def self.dummy_value_for(column_type, array: false)
@@ -94,7 +92,7 @@ module Shoulda
             0
           when :date
             Date.new(2100, 1, 1)
-          when :datetime, :timestamp
+          when :datetime, :timestamp, :timestamptz
             DateTime.new(2100, 1, 1)
           when :time
             Time.new(2000, 1, 1)

data/lib/shoulda/matchers/version.rb

@@ -1,6 +1,6 @@
 module Shoulda
   module Matchers
     # @private
-    VERSION = '5.3.0'.freeze
+    VERSION = '6.1.0'.freeze
   end
 end

data/lib/shoulda/matchers.rb

@@ -14,8 +14,8 @@ require 'shoulda/matchers/active_model'
 require 'shoulda/matchers/active_record'
 require 'shoulda/matchers/routing'
 
-module Shoulda
-  module Matchers
+module Shoulda # :nodoc:
+  module Matchers # :nodoc:
     class << self
       # @private
       attr_accessor :assertion_exception_class

data/shoulda-matchers.gemspec

@@ -36,6 +36,6 @@ Gem::Specification.new do |s|
     'shoulda-matchers.gemspec']
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 3.0.5'
   s.add_dependency('activesupport', '>= 5.2.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Tammer Saleh
@@ -11,10 +11,10 @@ authors:
 - Matt Jankowski
 - Stafford Brunk
 - Elliot Winkler
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-16 00:00:00.000000000 Z
+date: 2024-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -69,12 +69,12 @@ files:
 - lib/shoulda/matchers/active_model/allow_value_matcher/attribute_setters_and_validators.rb
 - lib/shoulda/matchers/active_model/allow_value_matcher/successful_check.rb
 - lib/shoulda/matchers/active_model/allow_value_matcher/successful_setting.rb
+- lib/shoulda/matchers/active_model/comparison_matcher.rb
 - lib/shoulda/matchers/active_model/disallow_value_matcher.rb
 - lib/shoulda/matchers/active_model/errors.rb
 - lib/shoulda/matchers/active_model/have_secure_password_matcher.rb
 - lib/shoulda/matchers/active_model/helpers.rb
 - lib/shoulda/matchers/active_model/numericality_matchers.rb
-- lib/shoulda/matchers/active_model/numericality_matchers/comparison_matcher.rb
 - lib/shoulda/matchers/active_model/numericality_matchers/even_number_matcher.rb
 - lib/shoulda/matchers/active_model/numericality_matchers/numeric_type_matcher.rb
 - lib/shoulda/matchers/active_model/numericality_matchers/odd_number_matcher.rb
@@ -88,6 +88,7 @@ files:
 - lib/shoulda/matchers/active_model/qualifiers/ignoring_interference_by_writer.rb
 - lib/shoulda/matchers/active_model/validate_absence_of_matcher.rb
 - lib/shoulda/matchers/active_model/validate_acceptance_of_matcher.rb
+- lib/shoulda/matchers/active_model/validate_comparison_of_matcher.rb
 - lib/shoulda/matchers/active_model/validate_confirmation_of_matcher.rb
 - lib/shoulda/matchers/active_model/validate_exclusion_of_matcher.rb
 - lib/shoulda/matchers/active_model/validate_inclusion_of_matcher.rb
@@ -115,6 +116,7 @@ files:
 - lib/shoulda/matchers/active_record/association_matchers/source_matcher.rb
 - lib/shoulda/matchers/active_record/association_matchers/through_matcher.rb
 - lib/shoulda/matchers/active_record/define_enum_for_matcher.rb
+- lib/shoulda/matchers/active_record/encrypt_matcher.rb
 - lib/shoulda/matchers/active_record/have_attached_matcher.rb
 - lib/shoulda/matchers/active_record/have_db_column_matcher.rb
 - lib/shoulda/matchers/active_record/have_db_index_matcher.rb
@@ -122,6 +124,7 @@ files:
 - lib/shoulda/matchers/active_record/have_readonly_attribute_matcher.rb
 - lib/shoulda/matchers/active_record/have_rich_text_matcher.rb
 - lib/shoulda/matchers/active_record/have_secure_token_matcher.rb
+- lib/shoulda/matchers/active_record/normalize_matcher.rb
 - lib/shoulda/matchers/active_record/serialize_matcher.rb
 - lib/shoulda/matchers/active_record/uniqueness.rb
 - lib/shoulda/matchers/active_record/uniqueness/model.rb
@@ -180,7 +183,7 @@ metadata:
   documentation_uri: https://matchers.shoulda.io/docs
   homepage_uri: https://matchers.shoulda.io
   source_code_uri: https://github.com/thoughtbot/shoulda-matchers
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -188,15 +191,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Simple one-liner tests for common Rails functionality
 test_files: []

data/lib/shoulda/matchers/active_model/numericality_matchers/comparison_matcher.rb

@@ -1,136 +0,0 @@
-require 'active_support/core_ext/module/delegation'
-
-module Shoulda
-  module Matchers
-    module ActiveModel
-      module NumericalityMatchers
-        # @private
-        class ComparisonMatcher < ValidationMatcher
-          ERROR_MESSAGES = {
-            :> => {
-              label: :greater_than,
-              assertions: [false, false, true],
-            },
-            :>= => {
-              label: :greater_than_or_equal_to,
-              assertions: [false, true, true],
-            },
-            :< => {
-              label: :less_than,
-              assertions: [true, false, false],
-            },
-            :<= => {
-              label: :less_than_or_equal_to,
-              assertions: [true, true, false],
-            },
-            :== => {
-              label: :equal_to,
-              assertions: [false, true, false],
-            },
-            :!= => {
-              label: :other_than,
-              assertions: [true, false, true],
-            },
-          }.freeze
-
-          delegate :failure_message, :failure_message_when_negated, to: :submatchers
-
-          def initialize(numericality_matcher, value, operator)
-            super(nil)
-            unless numericality_matcher.respond_to? :diff_to_compare
-              raise ArgumentError, 'numericality_matcher is invalid'
-            end
-
-            @numericality_matcher = numericality_matcher
-            @value = value
-            @operator = operator
-            @message = ERROR_MESSAGES[operator][:label]
-          end
-
-          def simple_description
-            description = ''
-
-            if expects_strict?
-              description << ' strictly'
-            end
-
-            description +
-              "disallow :#{attribute} from being a number that is not " +
-              "#{comparison_expectation} #{@value}"
-          end
-
-          def for(attribute)
-            @attribute = attribute
-            self
-          end
-
-          def with_message(message)
-            @expects_custom_validation_message = true
-            @message = message
-            self
-          end
-
-          def expects_custom_validation_message?
-            @expects_custom_validation_message
-          end
-
-          def matches?(subject)
-            @subject = subject
-            submatchers.matches?(subject)
-          end
-
-          def comparison_description
-            "#{comparison_expectation} #{@value}"
-          end
-
-          def submatchers
-            @_submatchers ||= NumericalityMatchers::Submatchers.new(build_submatchers)
-          end
-
-          private
-
-          def build_submatchers
-            comparison_combos.map do |diff, submatcher_method_name|
-              matcher = __send__(submatcher_method_name, diff, nil)
-              matcher.with_message(@message, values: { count: @value })
-              matcher
-            end
-          end
-
-          def comparison_combos
-            diffs_to_compare.zip(submatcher_method_names)
-          end
-
-          def submatcher_method_names
-            assertions.map do |value|
-              if value
-                :allow_value_matcher
-              else
-                :disallow_value_matcher
-              end
-            end
-          end
-
-          def assertions
-            ERROR_MESSAGES[@operator][:assertions]
-          end
-
-          def diffs_to_compare
-            diff_to_compare = @numericality_matcher.diff_to_compare
-            values = [-1, 0, 1].map { |sign| @value + (diff_to_compare * sign) }
-
-            if @numericality_matcher.given_numeric_column?
-              values
-            else
-              values.map(&:to_s)
-            end
-          end
-
-          def comparison_expectation
-            ERROR_MESSAGES[@operator][:label].to_s.tr('_', ' ')
-          end
-        end
-      end
-    end
-  end
-end