shoulda-matchers 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '00039d1c47436bb88b431784a2b956713382face294b6bbe5c7599378ce03a55'
-  data.tar.gz: 27640030d1ada19757e5da4d9c10465f422234f8dde9242a54bcb002585c71d5
+  metadata.gz: 500d5928f097ad1ca9d9c1ed3a0e0c925f504549c1594b57e93efc92316df558
+  data.tar.gz: 8a94b930a96fe1f2e3a78c916ca4fa6b68c21ab61ae9baccb109ec51e9a2961c
 SHA512:
-  metadata.gz: 51aff6ac4ab386f8df5dec81dfca4f197604d206263b29b711146820dda54ef5f9a9aa723aa6ce14084364eccdcbfbb8c3b1c38f2a4cdcbfc5d3ae8e8c965806
-  data.tar.gz: 476b055e38257cc8d6841a96779a012ef68cd01239c26c15b170c251a4f7655bab6344a7c163361e9ef283142994bc04ed69f8c6bbccf1bae3acfafc5fd62176
+  metadata.gz: 43d89cf2b6684f31f6fee6611fe694732446d50aee9fea5b8a5fefc79cd5ec4dc08337cb098e531cbfe4eac3ac46ed6cda46c6207b2f35956cf9b07d2925af1a
+  data.tar.gz: 586d777927cdafba0aa92ecc6c437b562a24a44aa343a8be309ee7563a3a2b98e4426c8804f1c40ad46a1987ff7f160e97473fcd178f3fdb57c2c471d210044b

data/README.md

@@ -55,7 +55,7 @@ Start by including `shoulda-matchers` in your Gemfile:
 
 ```ruby
 group :test do
-  gem 'shoulda-matchers', '~> 5.0'
+  gem 'shoulda-matchers', '~> 6.0'
 end
 ```
 
@@ -117,7 +117,7 @@ Otherwise, add `shoulda-matchers` to your Gemfile:
 
 ```ruby
 group :test do
-  gem 'shoulda-matchers', '~> 5.0'
+  gem 'shoulda-matchers', '~> 6.0'
 end
 ```
 
@@ -411,6 +411,8 @@ about any of them, make sure to [consult the documentation][rubydocs]!
   tests usage of `validates_uniqueness_of`.
 * **[normalize](lib/shoulda/matchers/active_record/normalize_matcher.rb)** tests
   usage of the `normalize` macro
+* **[encrypt](lib/shoulda/matchers/active_record/encrypt_matcher.rb)**
+  tests usage of the `encrypts` macro.
 
 ### ActionController matchers
 

data/lib/shoulda/matchers/action_controller/permit_matcher.rb

@@ -276,16 +276,14 @@ module Shoulda
           :context, :subparameter_name, :parameters_double_registry
 
         def expectation
-          message = 'restrict parameters '
+          String.new('restrict parameters ').tap do |message|
+            if subparameter_name
+              message << "on #{subparameter_name.inspect} "
+            end
 
-          if subparameter_name
-            message << "on #{subparameter_name.inspect} "
+            message << 'to '\
+              "#{format_parameter_names(expected_permitted_parameter_names)}"
           end
-
-          message << 'to '\
-            "#{format_parameter_names(expected_permitted_parameter_names)}"
-
-          message
         end
 
         def reality

data/lib/shoulda/matchers/action_controller/set_session_or_flash_matcher.rb

@@ -83,25 +83,23 @@ module Shoulda
         end
 
         def expectation_description
-          string = 'set'
-
-          string <<
-            if key_set?
-              " #{store.name}[#{key.inspect}]"
-            else
-              " any key in #{store.name}"
-            end
-
-          if expected_value_set?
+          String.new('set').tap do |string|
             string <<
-              if expected_value.is_a?(Regexp)
-                " to a value matching #{expected_value.inspect}"
+              if key_set?
+                " #{store.name}[#{key.inspect}]"
               else
-                " to #{expected_value.inspect}"
+                " any key in #{store.name}"
               end
-          end
 
-          string
+            if expected_value_set?
+              string <<
+                if expected_value.is_a?(Regexp)
+                  " to a value matching #{expected_value.inspect}"
+                else
+                  " to #{expected_value.inspect}"
+                end
+            end
+          end
         end
       end
     end

data/lib/shoulda/matchers/active_model/allow_value_matcher.rb

@@ -550,7 +550,7 @@ module Shoulda
         end
 
         def default_failure_message_preface
-          ''.tap do |preface|
+          String.new.tap do |preface|
             if descriptions_for_preset_values.any?
               preface << 'After setting '
               preface << descriptions_for_preset_values.to_sentence

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

@@ -50,7 +50,7 @@ module Shoulda
           description = ''
 
           if expects_strict?
-            description << ' strictly'
+            description = ' strictly'
           end
 
           description +
@@ -78,11 +78,6 @@ module Shoulda
           comparison_submatchers.matches?(subject)
         end
 
-        def does_not_match?(subject)
-          @subject = subject
-          comparison_submatchers.does_not_match?(subject)
-        end
-
         def comparison_description
           "#{comparison_expectation} #{@value}"
         end

data/lib/shoulda/matchers/active_model/have_secure_password_matcher.rb

@@ -47,6 +47,8 @@ module Shoulda
           did_not_authenticate_correct_password: 'expected %{subject} to'\
             ' authenticate the correct %{attribute}',
           method_not_found: 'expected %{subject} to respond to %{methods}',
+          should_not_have_secure_password: 'expected %{subject} to'\
+            ' not %{description}!',
         }.freeze
 
         def initialize(attribute)
@@ -69,6 +71,11 @@ module Shoulda
           failure.nil?
         end
 
+        def failure_message_when_negated
+          MESSAGES[:should_not_have_secure_password] %
+            { subject: @subject.class, description: description }
+        end
+
         protected
 
         attr_reader :subject

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

@@ -13,11 +13,6 @@ module Shoulda
             failing_submatchers.empty?
           end
 
-          def does_not_match?(subject)
-            @subject = subject
-            non_failing_submatchers.empty?
-          end
-
           def failure_message
             failing_submatcher.failure_message
           end

data/lib/shoulda/matchers/active_model/validate_absence_of_matcher.rb

@@ -143,12 +143,6 @@ module Shoulda
             @subject.class.reflect_on_association(@attribute)
         end
 
-        def array_column?
-          @subject.class.respond_to?(:columns_hash) &&
-            @subject.class.columns_hash[@attribute.to_s].respond_to?(:array) &&
-            @subject.class.columns_hash[@attribute.to_s].array
-        end
-
         def enum_column?
           @subject.class.respond_to?(:defined_enums) &&
             @subject.class.defined_enums.key?(@attribute.to_s)

data/lib/shoulda/matchers/active_model/validate_comparison_of_matcher.rb

@@ -353,16 +353,14 @@ module Shoulda
         end
 
         def simple_description
-          description = ''
+          String.new.tap do |description|
+            description << "validate that :#{attribute} looks like "
+            description << Shoulda::Matchers::Util.a_or_an(allowed_type_name)
 
-          description << "validate that :#{attribute} looks like "
-          description << Shoulda::Matchers::Util.a_or_an(allowed_type_name)
-
-          if comparison_descriptions.present?
-            description << " #{comparison_descriptions}"
+            if comparison_descriptions.present?
+              description << " #{comparison_descriptions}"
+            end
           end
-
-          description
         end
 
         def failure_message
@@ -465,7 +463,7 @@ module Shoulda
         def first_submatcher_that_fails_to_not_match
           @_first_submatcher_that_fails_to_not_match ||=
             @submatchers.detect do |submatcher|
-              !submatcher.does_not_match?(subject)
+              submatcher.matches?(subject)
             end
         end
 

data/lib/shoulda/matchers/active_model/validate_numericality_of_matcher.rb

@@ -453,20 +453,18 @@ module Shoulda
         end
 
         def simple_description
-          description = ''
+          String.new.tap do |description|
+            description << "validate that :#{attribute} looks like "
+            description << Shoulda::Matchers::Util.a_or_an(full_allowed_type)
 
-          description << "validate that :#{attribute} looks like "
-          description << Shoulda::Matchers::Util.a_or_an(full_allowed_type)
-
-          if range_description.present?
-            description << " #{range_description}"
-          end
+            if range_description.present?
+              description << " #{range_description}"
+            end
 
-          if comparison_descriptions.present?
-            description << " #{comparison_descriptions}"
+            if comparison_descriptions.present?
+              description << " #{comparison_descriptions}"
+            end
           end
-
-          description
         end
 
         def failure_message

data/lib/shoulda/matchers/active_model/validation_matcher/build_description.rb

@@ -42,13 +42,12 @@ module Shoulda
             description_clauses = []
 
             if matcher.try(:expects_strict?)
-              description_clauses << 'raising a validation exception'
-
-              if matcher.try(:expects_custom_validation_message?)
-                description_clauses.last << ' with a custom message'
-              end
-
-              description_clauses.last << ' on failure'
+              description_clauses <<
+                if matcher.try(:expects_custom_validation_message?)
+                  'raising a validation exception with a custom message on failure'
+                else
+                  'raising a validation exception on failure'
+                end
             elsif matcher.try(:expects_custom_validation_message?)
               description_clauses <<
                 'producing a custom validation error on failure'

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

@@ -1093,6 +1093,11 @@ module Shoulda
           self
         end
 
+        def with_query_constraints(query_constraints)
+          @options[:query_constraints] = query_constraints
+          self
+        end
+
         def required(required = true)
           remove_submatcher(AssociationMatchers::OptionalMatcher)
           add_submatcher(
@@ -1157,6 +1162,7 @@ module Shoulda
             (polymorphic? || class_exists?) &&
             foreign_key_exists? &&
             primary_key_exists? &&
+            query_constraints_exists? &&
             class_name_correct? &&
             join_table_correct? &&
             autosave_correct? &&
@@ -1258,7 +1264,7 @@ module Shoulda
           false
         end
 
-        def macro_supports_primary_key?
+        def macro_is_not_through?
           macro == :belongs_to ||
             ([:has_many, :has_one].include?(macro) && !through?)
         end
@@ -1268,7 +1274,25 @@ module Shoulda
         end
 
         def primary_key_exists?
-          !macro_supports_primary_key? || primary_key_correct?(model_class)
+          !macro_is_not_through? || primary_key_correct?(model_class)
+        end
+
+        def query_constraints_exists?
+          !macro_is_not_through? || query_constraints_correct?
+        end
+
+        def query_constraints_correct?
+          if options.key?(:query_constraints)
+            if option_verifier.correct_for_string?(:query_constraints, options[:query_constraints])
+              true
+            else
+              @missing = "#{model_class} should have \:query_constraints"\
+              " options set to #{options[:query_constraints]}"
+              false
+            end
+          else
+            true
+          end
         end
 
         def belongs_foreign_key_missing?
@@ -1299,10 +1323,7 @@ module Shoulda
         end
 
         def join_table_correct?
-          if (
-            macro != :has_and_belongs_to_many ||
-            join_table_matcher.matches?(@subject)
-          )
+          if macro != :has_and_belongs_to_many || join_table_matcher.matches?(@subject)
             true
           else
             @missing = join_table_matcher.failure_message
@@ -1457,11 +1478,10 @@ module Shoulda
         end
 
         def foreign_key_reflection
-          if (
-            [:has_one, :has_many].include?(macro) &&
-            reflection.options.include?(:inverse_of) &&
-            reflection.options[:inverse_of] != false
-          )
+          if [:has_one, :has_many].include?(macro) &&
+             reflection.options.include?(:inverse_of) &&
+             reflection.options[:inverse_of] != false
+
             associated_class.reflect_on_association(
               reflection.options[:inverse_of],
             )

data/lib/shoulda/matchers/active_record/association_matchers/optional_matcher.rb

@@ -22,44 +22,48 @@ module Shoulda
             if submatcher_passes?(subject)
               true
             else
-              @missing_option = 'and for the record '
+              @missing_option = build_missing_option
 
-              missing_option <<
+              false
+            end
+          end
+
+          private
+
+          attr_reader :attribute_name, :optional, :submatcher
+
+          def submatcher_passes?(subject)
+            if optional
+              submatcher.matches?(subject)
+            else
+              submatcher.does_not_match?(subject)
+            end
+          end
+
+          def build_missing_option
+            String.new('and for the record ').tap do |missing_option_string|
+              missing_option_string <<
                 if optional
                   'not to '
                 else
                   'to '
                 end
 
-              missing_option << (
+              missing_option_string << (
                 'fail validation if '\
                 ":#{attribute_name} is unset; i.e., either the association "\
                 'should have been defined with `optional: '\
                 "#{optional.inspect}`, or there "
               )
 
-              missing_option <<
+              missing_option_string <<
                 if optional
                   'should not '
                 else
                   'should '
                 end
 
-              missing_option << "be a presence validation on :#{attribute_name}"
-
-              false
-            end
-          end
-
-          private
-
-          attr_reader :attribute_name, :optional, :submatcher
-
-          def submatcher_passes?(subject)
-            if optional
-              submatcher.matches?(subject)
-            else
-              submatcher.does_not_match?(subject)
+              missing_option_string << "be a presence validation on :#{attribute_name}"
             end
           end
         end

data/lib/shoulda/matchers/active_record/association_matchers/required_matcher.rb

@@ -23,50 +23,54 @@ module Shoulda
             if submatcher_passes?(subject)
               true
             else
-              @missing_option = 'and for the record '
+              @missing_option = build_missing_option
 
-              missing_option <<
+              false
+            end
+          end
+
+          private
+
+          attr_reader :attribute_name, :required, :submatcher
+
+          def submatcher_passes?(subject)
+            if required
+              submatcher.matches?(subject)
+            else
+              submatcher.does_not_match?(subject)
+            end
+          end
+
+          def validation_message_key
+            :required
+          end
+
+          def build_missing_option
+            String.new('and for the record ').tap do |missing_option_string|
+              missing_option_string <<
                 if required
                   'to '
                 else
                   'not to '
                 end
 
-              missing_option << (
+              missing_option_string << (
                 'fail validation if '\
                 ":#{attribute_name} is unset; i.e., either the association "\
                 'should have been defined with `required: '\
                 "#{required.inspect}`, or there "
               )
 
-              missing_option <<
+              missing_option_string <<
                 if required
                   'should '
                 else
                   'should not '
                 end
 
-              missing_option << "be a presence validation on :#{attribute_name}"
-
-              false
+              missing_option_string << "be a presence validation on :#{attribute_name}"
             end
           end
-
-          private
-
-          attr_reader :attribute_name, :required, :submatcher
-
-          def submatcher_passes?(subject)
-            if required
-              submatcher.matches?(subject)
-            else
-              submatcher.does_not_match?(subject)
-            end
-          end
-
-          def validation_message_key
-            :required
-          end
         end
       end
     end

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

@@ -0,0 +1,174 @@
+module Shoulda
+  module Matchers
+    module ActiveRecord
+      # The `encrypt` matcher tests usage of the
+      # `encrypts` macro (Rails 7+ only).
+      #
+      #     class Survey < ActiveRecord::Base
+      #       encrypts :access_code
+      #     end
+      #
+      #     # RSpec
+      #     RSpec.describe Survey, type: :model do
+      #       it { should encrypt(:access_code) }
+      #     end
+      #
+      #     # Minitest (Shoulda)
+      #     class SurveyTest < ActiveSupport::TestCase
+      #       should encrypt(:access_code)
+      #     end
+      #
+      # #### Qualifiers
+      #
+      # ##### deterministic
+      #
+      #     class Survey < ActiveRecord::Base
+      #       encrypts :access_code, deterministic: true
+      #     end
+      #
+      #     # RSpec
+      #     RSpec.describe Survey, type: :model do
+      #       it { should encrypt(:access_code).deterministic(true) }
+      #     end
+      #
+      #     # Minitest (Shoulda)
+      #     class SurveyTest < ActiveSupport::TestCase
+      #       should encrypt(:access_code).deterministic(true)
+      #     end
+      #
+      # ##### downcase
+      #
+      #     class Survey < ActiveRecord::Base
+      #       encrypts :access_code, downcase: true
+      #     end
+      #
+      #     # RSpec
+      #     RSpec.describe Survey, type: :model do
+      #       it { should encrypt(:access_code).downcase(true) }
+      #     end
+      #
+      #     # Minitest (Shoulda)
+      #     class SurveyTest < ActiveSupport::TestCase
+      #       should encrypt(:access_code).downcase(true)
+      #     end
+      #
+      # ##### ignore_case
+      #
+      #     class Survey < ActiveRecord::Base
+      #       encrypts :access_code, deterministic: true, ignore_case: true
+      #     end
+      #
+      #     # RSpec
+      #     RSpec.describe Survey, type: :model do
+      #       it { should encrypt(:access_code).ignore_case(true) }
+      #     end
+      #
+      #     # Minitest (Shoulda)
+      #     class SurveyTest < ActiveSupport::TestCase
+      #       should encrypt(:access_code).ignore_case(true)
+      #     end
+      #
+      # @return [EncryptMatcher]
+      #
+      def encrypt(value)
+        EncryptMatcher.new(value)
+      end
+
+      # @private
+      class EncryptMatcher
+        def initialize(attribute)
+          @attribute = attribute.to_sym
+          @options = {}
+        end
+
+        attr_reader :failure_message, :failure_message_when_negated
+
+        def deterministic(deterministic)
+          with_option(:deterministic, deterministic)
+        end
+
+        def downcase(downcase)
+          with_option(:downcase, downcase)
+        end
+
+        def ignore_case(ignore_case)
+          with_option(:ignore_case, ignore_case)
+        end
+
+        def matches?(subject)
+          @subject = subject
+          result = encrypted_attributes_included? &&
+                   options_correct?(
+                     :deterministic,
+                     :downcase,
+                     :ignore_case,
+                   )
+
+          if result
+            @failure_message_when_negated = "Did not expect to #{description} of #{class_name}"
+            if @options.present?
+              @failure_message_when_negated += "
+using "
+              @failure_message_when_negated += @options.map { |opt, expected|
+                ":#{opt} option as ‹#{expected}›"
+              }.join(' and
+')
+            end
+
+            @failure_message_when_negated += ",
+but it did"
+          end
+
+          result
+        end
+
+        def description
+          "encrypt :#{@attribute}"
+        end
+
+        private
+
+        def encrypted_attributes_included?
+          if encrypted_attributes.include?(@attribute)
+            true
+          else
+            @failure_message = "Expected to #{description} of #{class_name}, but it did not"
+            false
+          end
+        end
+
+        def with_option(option_name, value)
+          @options[option_name] = value
+          self
+        end
+
+        def options_correct?(*opts)
+          opts.all? do |opt|
+            next true unless @options.key?(opt)
+
+            expected = @options[opt]
+            actual = encrypted_attribute_scheme.send("#{opt}?")
+            next true if expected == actual
+
+            @failure_message = "Expected to #{description} of #{class_name} using :#{opt} option
+as ‹#{expected}›, but got ‹#{actual}›"
+
+            false
+          end
+        end
+
+        def encrypted_attributes
+          @_encrypted_attributes ||= @subject.class.encrypted_attributes || []
+        end
+
+        def encrypted_attribute_scheme
+          @subject.class.type_for_attribute(@attribute).scheme
+        end
+
+        def class_name
+          @subject.class.name
+        end
+      end
+    end
+  end
+end

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

@@ -152,18 +152,18 @@ module Shoulda
         end
 
         def description
-          description = 'have '
-
-          description <<
-            if qualifiers.include?(:unique)
-              "#{Shoulda::Matchers::Util.a_or_an(index_type)} "
-            else
-              'an '
-            end
+          String.new('have ').tap do |description|
+            description <<
+              if qualifiers.include?(:unique)
+                "#{Shoulda::Matchers::Util.a_or_an(index_type)} "
+              else
+                'an '
+              end
 
-          description << 'index on '
+            description << 'index on '
 
-          description << inspected_expected_columns
+            description << inspected_expected_columns
+          end
         end
 
         private

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

@@ -59,7 +59,7 @@ module Shoulda
         private
 
         def readonly_attributes
-          @_readonly_attributes ||= (@subject.class.readonly_attributes || [])
+          @_readonly_attributes ||= @subject.class.readonly_attributes || []
         end
 
         def class_name

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

@@ -25,6 +25,7 @@ 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

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

data/lib/shoulda/matchers/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Tammer Saleh
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-22 00:00:00.000000000 Z
+date: 2024-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -116,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
@@ -197,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Simple one-liner tests for common Rails functionality