shoulda-matchers 4.4.1 → 4.5.0

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

@@ -26,7 +26,7 @@ module Shoulda
             attribute.to_sym,
             type,
             model_name,
-            options
+            options,
           )
         end
       end

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

@@ -5,23 +5,42 @@ module Shoulda
         # @private
         class ComparisonMatcher < ValidationMatcher
           ERROR_MESSAGES = {
-            :> => :greater_than,
-            :>= => :greater_than_or_equal_to,
-            :< => :less_than,
-            :<= => :less_than_or_equal_to,
-            :== => :equal_to,
-            :!= => :other_than,
-          }
+            :> => {
+              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
 
           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]
+            @message = ERROR_MESSAGES[operator][:label]
           end
 
           def simple_description
@@ -94,10 +113,9 @@ module Shoulda
           end
 
           def submatchers_and_results
-            @_submatchers_and_results ||=
-              submatchers.map do |matcher|
-                { matcher: matcher, matched: matcher.matches?(@subject) }
-              end
+            @_submatchers_and_results ||= submatchers.map do |matcher|
+              { matcher: matcher, matched: matcher.matches?(@subject) }
+            end
           end
 
           def comparison_combos
@@ -115,20 +133,7 @@ module Shoulda
           end
 
           def assertions
-            case @operator
-            when :>
-              [false, false, true]
-            when :>=
-              [false, true, true]
-            when :==
-              [false, true, false]
-            when :<
-              [true, false, false]
-            when :<=
-              [true, true, false]
-            when :!=
-               [true, false, true]
-            end
+            ERROR_MESSAGES[@operator][:assertions]
           end
 
           def diffs_to_compare
@@ -143,14 +148,7 @@ module Shoulda
           end
 
           def comparison_expectation
-            case @operator
-              when :> then "greater than"
-              when :>= then "greater than or equal to"
-              when :== then "equal to"
-              when :< then "less than"
-              when :<= then "less than or equal to"
-              when :!= then 'other than'
-            end
+            ERROR_MESSAGES[@operator][:label].to_s.tr('_', ' ')
           end
         end
       end

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

@@ -44,7 +44,7 @@ module Shoulda
 
           attr_reader :attribute
 
-          def wrap_disallow_value_matcher(matcher)
+          def wrap_disallow_value_matcher(_matcher)
             raise NotImplementedError
           end
 

data/lib/shoulda/matchers/active_model/qualifiers/ignoring_interference_by_writer.rb

@@ -6,7 +6,7 @@ module Shoulda
         module IgnoringInterferenceByWriter
           attr_reader :ignore_interference_by_writer
 
-          def initialize(*args)
+          def initialize(*)
             @ignore_interference_by_writer = IgnoreInterferenceByWriter.new
           end
 

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

@@ -103,10 +103,12 @@ module Shoulda
           if reflection
             obj = reflection.klass.new
             if collection?
-              [ obj ]
+              [obj]
             else
               obj
             end
+          elsif array_column?
+            ['an arbitary value']
           else
             case column_type
             when :integer, :float then 1
@@ -137,6 +139,12 @@ module Shoulda
           @subject.class.respond_to?(:reflect_on_association) &&
             @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
       end
     end
   end

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

@@ -148,12 +148,12 @@ module Shoulda
 
         def qualify_matcher(matcher, confirmation_attribute_value)
           matcher.values_to_preset = {
-            confirmation_attribute => confirmation_attribute_value
+            confirmation_attribute => confirmation_attribute_value,
           }
           matcher.with_message(
             @expected_message,
             against: confirmation_attribute,
-            values: { attribute: attribute }
+            values: { attribute: attribute },
           )
         end
       end

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

@@ -146,11 +146,12 @@ module Shoulda
           else
             description = "validate that :#{@attribute}"
 
-            if @array.many?
-              description << " is neither #{inspected_array}"
-            else
-              description << " is not #{inspected_array}"
-            end
+            description <<
+              if @array.many?
+                " is neither #{inspected_array}"
+              else
+                " is not #{inspected_array}"
+              end
 
             description
           end
@@ -238,8 +239,8 @@ module Shoulda
 
         def inspected_array
           Shoulda::Matchers::Util.inspect_values(@array).to_sentence(
-            two_words_connector: " nor ",
-            last_word_connector: ", nor "
+            two_words_connector: ' nor ',
+            last_word_connector: ', nor ',
           )
         end
       end

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