shoulda-matchers 4.4.0 → 5.0.0

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

@@ -268,20 +268,20 @@ module Shoulda
 
       # @private
       class ValidateInclusionOfMatcher < ValidationMatcher
-        BLANK_VALUES = ['', ' ', "\n", "\r", "\t", "\f"]
-        ARBITRARY_OUTSIDE_STRING = 'shoulda-matchers test string'
+        BLANK_VALUES = ['', ' ', "\n", "\r", "\t", "\f"].freeze
+        ARBITRARY_OUTSIDE_STRING = 'shoulda-matchers test string'.freeze
         ARBITRARY_OUTSIDE_INTEGER = 123456789
         ARBITRARY_OUTSIDE_DECIMAL = BigDecimal('0.123456789')
         ARBITRARY_OUTSIDE_DATE = Date.jd(9999999)
         ARBITRARY_OUTSIDE_DATETIME = DateTime.jd(9999999)
         ARBITRARY_OUTSIDE_TIME = Time.at(9999999999)
-        BOOLEAN_ALLOWS_BOOLEAN_MESSAGE = <<EOT
+        BOOLEAN_ALLOWS_BOOLEAN_MESSAGE = <<EOT.freeze
 You are using `validate_inclusion_of` to assert that a boolean column allows
 boolean values and disallows non-boolean ones. Be aware that it is not possible
 to fully test this, as boolean columns will automatically convert non-boolean
 values to boolean ones. Hence, you should consider removing this test.
 EOT
-        BOOLEAN_ALLOWS_NIL_MESSAGE = <<EOT
+        BOOLEAN_ALLOWS_NIL_MESSAGE = <<EOT.freeze
 You are using `validate_inclusion_of` to assert that a boolean column allows nil.
 Be aware that it is not possible to fully test this, as anything other than
 true, false or nil will be converted to false. Hence, you should consider
@@ -354,11 +354,12 @@ EOT
           else
             description = "validate that :#{@attribute}"
 
-            if @array.many?
-              description << " is either #{inspected_array}"
-            else
-              description << " is #{inspected_array}"
-            end
+            description <<
+              if @array.many?
+                " is either #{inspected_array}"
+              else
+                " is #{inspected_array}"
+              end
 
             description
           end
@@ -545,10 +546,10 @@ EOT
           values = []
 
           values << case @array
-            when [true]  then false
-            when [false] then true
-            else              raise CouldNotDetermineValueOutsideOfArray
-          end
+                    when [true]  then false
+                    when [false] then true
+                    else              raise CouldNotDetermineValueOutsideOfArray
+                    end
 
           if attribute_allows_nil?
             values << nil
@@ -581,21 +582,21 @@ EOT
 
         def column_type_to_attribute_type(type)
           case type
-            when :float then :integer
-            when :timestamp then :datetime
-            else type
+          when :float then :integer
+          when :timestamp then :datetime
+          else type
           end
         end
 
         def value_to_attribute_type(value)
           case value
-            when true, false then :boolean
-            when BigDecimal then :decimal
-            when Integer then :integer
-            when Date then :date
-            when DateTime then :datetime
-            when Time then :time
-            else :unknown
+          when true, false then :boolean
+          when BigDecimal then :decimal
+          when Integer then :integer
+          when Date then :date
+          when DateTime then :datetime
+          when Time then :time
+          else :unknown
           end
         end
 
@@ -609,8 +610,8 @@ EOT
 
         def inspected_array
           Shoulda::Matchers::Util.inspect_values(@array).to_sentence(
-            two_words_connector: " or ",
-            last_word_connector: ", or "
+            two_words_connector: ' or ',
+            last_word_connector: ', or ',
           )
         end
       end

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

@@ -392,7 +392,7 @@ module Shoulda
             @options[:minimum] > 0 &&
             allows_length_of?(
               @options[:minimum] - 1,
-              translated_short_message
+              translated_short_message,
             )
         end
 
@@ -402,7 +402,7 @@ module Shoulda
             (@options[:minimum] == 1 && expects_to_allow_blank?) ||
             disallows_length_of?(
               @options[:minimum] - 1,
-              translated_short_message
+              translated_short_message,
             )
         end
 
@@ -410,7 +410,7 @@ module Shoulda
           @options.key?(:maximum) &&
             allows_length_of?(
               @options[:maximum] + 1,
-              translated_long_message
+              translated_long_message,
             )
         end
 
@@ -418,7 +418,7 @@ module Shoulda
           !@options.key?(:maximum) ||
             disallows_length_of?(
               @options[:maximum] + 1,
-              translated_long_message
+              translated_long_message,
             )
         end
 
@@ -470,7 +470,7 @@ module Shoulda
                 model_name: @subject.class.to_s.underscore,
                 instance: @subject,
                 attribute: @attribute,
-                count: @options[:minimum]
+                count: @options[:minimum],
               )
             else
               @short_message
@@ -485,7 +485,7 @@ module Shoulda
                 model_name: @subject.class.to_s.underscore,
                 instance: @subject,
                 attribute: @attribute,
-                count: @options[:maximum]
+                count: @options[:maximum],
               )
             else
               @long_message

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

@@ -331,8 +331,7 @@ module Shoulda
 
       # @private
       class ValidateNumericalityOfMatcher
-        NUMERIC_NAME = 'number'
-        NON_NUMERIC_VALUE = 'abcd'
+        NUMERIC_NAME = 'number'.freeze
         DEFAULT_DIFF_TO_COMPARE = 1
 
         include Qualifiers::IgnoringInterferenceByWriter
@@ -364,7 +363,7 @@ module Shoulda
 
         def only_integer
           prepare_submatcher(
-            NumericalityMatchers::OnlyIntegerMatcher.new(self, @attribute)
+            NumericalityMatchers::OnlyIntegerMatcher.new(self, @attribute),
           )
           self
         end
@@ -372,9 +371,9 @@ module Shoulda
         def allow_nil
           @expects_to_allow_nil = true
           prepare_submatcher(
-            AllowValueMatcher.new(nil)
-              .for(@attribute)
-              .with_message(:not_a_number)
+            AllowValueMatcher.new(nil).
+              for(@attribute).
+              with_message(:not_a_number),
           )
           self
         end
@@ -385,14 +384,14 @@ module Shoulda
 
         def odd
           prepare_submatcher(
-            NumericalityMatchers::OddNumberMatcher.new(self, @attribute)
+            NumericalityMatchers::OddNumberMatcher.new(self, @attribute),
           )
           self
         end
 
         def even
           prepare_submatcher(
-            NumericalityMatchers::EvenNumberMatcher.new(self, @attribute)
+            NumericalityMatchers::EvenNumberMatcher.new(self, @attribute),
           )
           self
         end
@@ -459,7 +458,7 @@ module Shoulda
           description << Shoulda::Matchers::Util.a_or_an(full_allowed_type)
 
           if comparison_descriptions.present?
-            description << ' ' + comparison_descriptions
+            description << " #{comparison_descriptions}"
           end
 
           description
@@ -479,7 +478,8 @@ module Shoulda
         def failure_message_when_negated
           overall_failure_message_when_negated.dup.tap do |message|
             message << "\n"
-            message << failure_message_for_first_submatcher_that_fails_to_not_match
+            message <<
+              failure_message_for_first_submatcher_that_fails_to_not_match
           end
         end
 
@@ -500,15 +500,15 @@ module Shoulda
 
         def overall_failure_message
           Shoulda::Matchers.word_wrap(
-            "Expected #{model.name} to #{description}, but this could not " +
-            'be proved.'
+            "Expected #{model.name} to #{description}, but this could not "\
+            'be proved.',
           )
         end
 
         def overall_failure_message_when_negated
           Shoulda::Matchers.word_wrap(
-            "Expected #{model.name} not to #{description}, but this could not " +
-            'be proved.'
+            "Expected #{model.name} not to #{description}, but this could not "\
+            'be proved.',
           )
         end
 
@@ -530,7 +530,7 @@ module Shoulda
 
         def add_disallow_value_matcher
           disallow_value_matcher = DisallowValueMatcher.
-            new(NON_NUMERIC_VALUE).
+            new(non_numeric_value).
             for(@attribute).
             with_message(:not_a_number)
 
@@ -558,7 +558,10 @@ module Shoulda
           end
 
           if submatcher.respond_to?(:diff_to_compare)
-            @diff_to_compare = [@diff_to_compare, submatcher.diff_to_compare].max
+            @diff_to_compare = [
+              @diff_to_compare,
+              submatcher.diff_to_compare,
+            ].max
           end
 
           @submatchers << submatcher
@@ -579,7 +582,7 @@ module Shoulda
             end
 
             submatcher.ignoring_interference_by_writer(
-              ignore_interference_by_writer
+              ignore_interference_by_writer,
             )
           end
         end
@@ -600,28 +603,30 @@ module Shoulda
         end
 
         def first_submatcher_that_fails_to_match
-          @_failing_submatchers ||= @submatchers.detect do |submatcher|
-            !submatcher.matches?(@subject)
-          end
+          @_first_submatcher_that_fails_to_match ||=
+            @submatchers.detect do |submatcher|
+              !submatcher.matches?(@subject)
+            end
         end
 
         def first_submatcher_that_fails_to_not_match
-          @_failing_submatchers ||= @submatchers.detect do |submatcher|
-            !submatcher.does_not_match?(@subject)
-          end
+          @_first_submatcher_that_fails_to_not_match ||=
+            @submatchers.detect do |submatcher|
+              !submatcher.does_not_match?(@subject)
+            end
         end
 
         def failure_message_for_first_submatcher_that_fails_to_match
           build_submatcher_failure_message_for(
             first_submatcher_that_fails_to_match,
-            :failure_message
+            :failure_message,
           )
         end
 
         def failure_message_for_first_submatcher_that_fails_to_not_match
           build_submatcher_failure_message_for(
             first_submatcher_that_fails_to_not_match,
-            :failure_message_when_negated
+            :failure_message_when_negated,
           )
         end
 
@@ -638,7 +643,7 @@ module Shoulda
             if number_of_submatchers_for_failure_message > 1
               "In checking that #{model.name} #{submatcher_description}, " +
                 failure_message[0].downcase +
-                failure_message[1..-1]
+                failure_message[1..]
             else
               failure_message
             end
@@ -652,7 +657,11 @@ module Shoulda
 
         def comparison_descriptions
           description_array = submatcher_comparison_descriptions
-          description_array.empty? ? '' : submatcher_comparison_descriptions.join(' and ')
+          if description_array.empty?
+            ''
+          else
+            submatcher_comparison_descriptions.join(' and ')
+          end
         end
 
         def submatcher_comparison_descriptions
@@ -667,6 +676,10 @@ module Shoulda
         def model
           @subject.class
         end
+
+        def non_numeric_value
+          'abcd'
+        end
       end
     end
   end

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

@@ -260,11 +260,11 @@ validation for you? Instead of using `validate_presence_of`, try
 
         def reason_for_existing_presence_validation
           if belongs_to_association_configured_to_be_required?
-            "you've instructed your `belongs_to` association to add a " +
+            "you've instructed your `belongs_to` association to add a "\
               'presence validation to the attribute'
           else
             # assume ::ActiveRecord::Base.belongs_to_required_by_default == true
-            'ActiveRecord is configured to add a presence validation to all ' +
+            'ActiveRecord is configured to add a presence validation to all '\
               '`belongs_to` associations, and this includes yours'
           end
         end
@@ -327,8 +327,8 @@ validation for you? Instead of using `validate_presence_of`, try
         end
 
         def collection_association?
-          association? && association_reflection.macro.in?(
-            [:has_many, :has_and_belongs_to_many],
+          association? && [:has_many, :has_and_belongs_to_many].include?(
+            association_reflection.macro,
           )
         end
 

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

@@ -3,8 +3,6 @@ module Shoulda
     module ActiveModel
       # @private
       class ValidationMatcher
-        autoload :BuildDescription, 'shoulda/matchers/active_model/validation_matcher/build_description'
-
         include Qualifiers::IgnoringInterferenceByWriter
 
         def initialize(attribute)
@@ -69,7 +67,7 @@ module Shoulda
               message << "\n"
               message << Shoulda::Matchers.word_wrap(
                 failure_reason,
-                indent: 2
+                indent: 2,
               )
             end
           end
@@ -81,7 +79,7 @@ module Shoulda
               message << "\n"
               message << Shoulda::Matchers.word_wrap(
                 failure_reason,
-                indent: 2
+                indent: 2,
               )
             end
           end
@@ -139,15 +137,15 @@ module Shoulda
 
         def overall_failure_message
           Shoulda::Matchers.word_wrap(
-            "Expected #{model.name} to #{description}, but this could not be " +
-            'proved.'
+            "Expected #{model.name} to #{description}, but this could not be "\
+            'proved.',
           )
         end
 
         def overall_failure_message_when_negated
           Shoulda::Matchers.word_wrap(
-            "Expected #{model.name} not to #{description}, but this could " +
-            'not be proved.'
+            "Expected #{model.name} not to #{description}, but this could "\
+            'not be proved.',
           )
         end
 

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

@@ -15,10 +15,8 @@ module Shoulda
 
           def call
             if description_clauses_for_qualifiers.any?
-              main_description +
-                clause_for_allow_blank_or_nil +
-                ', ' +
-                description_clauses_for_qualifiers.to_sentence
+              "#{main_description}#{clause_for_allow_blank_or_nil},"\
+              " #{description_clauses_for_qualifiers.to_sentence}"
             else
               main_description + clause_for_allow_blank_or_nil
             end

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

@@ -5,7 +5,7 @@ module Shoulda
       class ValidationMessageFinder
         include Helpers
 
-        def initialize(instance, attribute, context=nil)
+        def initialize(instance, attribute, context = nil)
           @instance = instance
           @attribute = attribute
           @context = context
@@ -50,7 +50,7 @@ module Shoulda
         end
 
         def validated_instance
-          @validated_instance ||= validate_instance
+          @_validated_instance ||= validate_instance
         end
 
         def validate_instance
@@ -58,8 +58,6 @@ module Shoulda
           @instance
         end
       end
-
     end
   end
 end
-

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

@@ -98,24 +98,19 @@ module Shoulda
 
           all_validation_errors = record.errors.dup
 
-          validation_error_messages =
-            if record.errors.respond_to?(:[])
-              record.errors[attribute]
-            else
-              record.errors.on(attribute)
-            end
+          validation_error_messages = record.errors[attribute]
 
           {
             all_validation_errors: all_validation_errors,
             validation_error_messages: validation_error_messages,
-            validation_exception_message: nil
+            validation_exception_message: nil,
           }
-        rescue ::ActiveModel::StrictValidationFailed => exception
+        rescue ::ActiveModel::StrictValidationFailed => e
           @captured_validation_exception = true
           {
             all_validation_errors: nil,
             validation_error_messages: [],
-            validation_exception_message: exception.message
+            validation_exception_message: e.message,
           }
         end
       end