shoulda-matchers 3.1.3 → 4.0.0.rc1

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

@@ -332,6 +332,7 @@ module Shoulda
           @context = nil
           @values_to_preset = {}
           @failure_message_preface = nil
+          @attribute_changed_value_message = nil
         end
 
         def for(attribute_name)

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

@@ -225,10 +225,6 @@ module Shoulda
           def active_resource_object?
             object.respond_to?(:known_attributes)
           end
-
-          def model
-            object.class
-          end
         end
       end
     end

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

@@ -88,6 +88,11 @@ module Shoulda
           disallows_value_of(value, @expected_message)
         end
 
+        def does_not_match?(subject)
+          super(subject)
+          allows_value_of(value, @expected_message)
+        end
+
         def simple_description
           "validate that :#{@attribute} is empty/falsy"
         end

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

@@ -91,6 +91,11 @@ module Shoulda
           disallows_value_of(false, @expected_message)
         end
 
+        def does_not_match?(subject)
+          super(subject)
+          allows_value_of(false, @expected_message)
+        end
+
         def simple_description
           %(validate that :#{@attribute} has been set to "1")
         end

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

@@ -100,8 +100,22 @@ module Shoulda
             allows_missing_confirmation
         end
 
+        def does_not_match?(subject)
+          super(subject)
+
+          allows_different_value ||
+            disallows_same_value ||
+            disallows_missing_confirmation
+        end
+
         private
 
+        def allows_different_value
+          allows_value_of('different value') do |matcher|
+            qualify_matcher(matcher, 'some value')
+          end
+        end
+
         def disallows_different_value
           disallows_value_of('different value') do |matcher|
             qualify_matcher(matcher, 'some value')
@@ -114,12 +128,24 @@ module Shoulda
           end
         end
 
+        def disallows_same_value
+          disallows_value_of('same value') do |matcher|
+            qualify_matcher(matcher, 'same value')
+          end
+        end
+
         def allows_missing_confirmation
           allows_value_of('any value') do |matcher|
             qualify_matcher(matcher, nil)
           end
         end
 
+        def disallows_missing_confirmation
+          disallows_value_of('any value') do |matcher|
+            qualify_matcher(matcher, nil)
+          end
+        end
+
         def qualify_matcher(matcher, confirmation_attribute_value)
           matcher.values_to_preset = {
             confirmation_attribute => confirmation_attribute_value
@@ -130,17 +156,6 @@ module Shoulda
             values: { attribute: attribute }
           )
         end
-
-        def set_confirmation(value)
-          @last_value_set_on_confirmation_attribute = value
-
-          AttributeSetter.set(
-            matcher_name: 'confirmation',
-            object: @subject,
-            attribute_name: confirmation_attribute,
-            value: value
-          )
-        end
       end
     end
   end

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

@@ -162,15 +162,34 @@ module Shoulda
           if @range
             allows_lower_value &&
               disallows_minimum_value &&
-              allows_higher_value &&
-              disallows_maximum_value
+              disallows_maximum_value &&
+              allows_higher_value
           elsif @array
             disallows_all_values_in_array?
           end
         end
 
+        def does_not_match?(subject)
+          super(subject)
+
+          if @range
+            disallows_lower_value ||
+              allows_minimum_value ||
+              allows_maximum_value ||
+              disallows_higher_value
+          elsif @array
+            allows_any_values_in_array?
+          end
+        end
+
         private
 
+        def allows_any_values_in_array?
+          @array.any? do |value|
+            allows_value_of(value, @expected_message)
+          end
+        end
+
         def disallows_all_values_in_array?
           @array.all? do |value|
             disallows_value_of(value, @expected_message)
@@ -181,18 +200,34 @@ module Shoulda
           @minimum == 0 || allows_value_of(@minimum - 1, @expected_message)
         end
 
-        def allows_higher_value
-          allows_value_of(@maximum + 1, @expected_message)
+        def disallows_lower_value
+          @minimum != 0 && disallows_value_of(@minimum - 1, @expected_message)
+        end
+
+        def allows_minimum_value
+          allows_value_of(@minimum, @expected_message)
         end
 
         def disallows_minimum_value
           disallows_value_of(@minimum, @expected_message)
         end
 
+        def allows_maximum_value
+          allows_value_of(@maximum, @expected_message)
+        end
+
         def disallows_maximum_value
           disallows_value_of(@maximum, @expected_message)
         end
 
+        def allows_higher_value
+          allows_value_of(@maximum + 1, @expected_message)
+        end
+
+        def disallows_higher_value
+          disallows_value_of(@maximum + 1, @expected_message)
+        end
+
         def inspect_message
           if @range
             @range.inspect

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

@@ -268,8 +268,9 @@ module Shoulda
 
       # @private
       class ValidateInclusionOfMatcher < ValidationMatcher
+        BLANK_VALUES = ['', ' ', "\n", "\r", "\t", "\f"]
         ARBITRARY_OUTSIDE_STRING = 'shoulda-matchers test string'
-        ARBITRARY_OUTSIDE_FIXNUM = 123456789
+        ARBITRARY_OUTSIDE_INTEGER = 123456789
         ARBITRARY_OUTSIDE_DECIMAL = BigDecimal('0.123456789')
         ARBITRARY_OUTSIDE_DATE = Date.jd(9999999)
         ARBITRARY_OUTSIDE_DATETIME = DateTime.jd(9999999)
@@ -294,8 +295,8 @@ EOT
           @range = nil
           @minimum = nil
           @maximum = nil
-          @low_message = nil
-          @high_message = nil
+          @low_message = :inclusion
+          @high_message = :inclusion
         end
 
         def in_array(array)
@@ -310,8 +311,8 @@ EOT
           self
         end
 
-        def allow_blank(allow_blank = true)
-          @options[:allow_blank] = allow_blank
+        def allow_blank
+          @options[:allow_blank] = true
           self
         end
 
@@ -319,9 +320,8 @@ EOT
           @options[:allow_blank]
         end
 
-        def allow_nil(allow_nil = true)
-          @options[:allow_nil] = allow_nil
-          self
+        def allow_nil
+          @options[:allow_nil] = true
         end
 
         def expects_to_allow_nil?
@@ -376,8 +376,6 @@ EOT
           super(subject)
 
           if @range
-            @low_message  ||= :inclusion
-            @high_message ||= :inclusion
             matches_for_range?
           elsif @array
             if matches_for_array?
@@ -389,47 +387,55 @@ EOT
           end
         end
 
+        def does_not_match?(subject)
+          super(subject)
+
+          if @range
+            does_not_match_for_range?
+          elsif @array
+            if does_not_match_for_array?
+              true
+            else
+              @failure_message = "#{@array} matches array in validation"
+              false
+            end
+          end
+        end
+
         private
 
         def matches_for_range?
           disallows_lower_value &&
             allows_minimum_value &&
-            disallows_higher_value &&
-            allows_maximum_value
+            allows_maximum_value &&
+            disallows_higher_value
+        end
+
+        def does_not_match_for_range?
+          allows_lower_value ||
+            disallows_minimum_value ||
+            disallows_maximum_value ||
+            allows_higher_value
         end
 
         def matches_for_array?
           allows_all_values_in_array? &&
-            allows_blank_value? &&
+            disallows_all_values_outside_of_array? &&
             allows_nil_value? &&
-            disallows_value_outside_of_array?
+            allows_blank_value?
         end
 
-        def allows_blank_value?
-          if @options.key?(:allow_blank)
-            blank_values = ['', ' ', "\n", "\r", "\t", "\f"]
-            @options[:allow_blank] == blank_values.all? { |value| allows_value_of(value) }
-          else
-            true
-          end
+        def does_not_match_for_array?
+          disallows_any_values_in_array? ||
+            allows_any_value_outside_of_array? ||
+            disallows_nil_value? ||
+            disallows_blank_value?
         end
 
-        def allows_nil_value?
-          if @options.key?(:allow_nil)
-            @options[:allow_nil] == allows_value_of(nil)
-          else
-            true
-          end
-        end
-
-        def inspect_message
-          @range.nil? ? @array.inspect : @range.inspect
-        end
-
-        def allows_all_values_in_array?
-          @array.all? do |value|
-            allows_value_of(value, @low_message)
-          end
+        def allows_lower_value
+          @minimum &&
+            @minimum != 0 &&
+            allows_value_of(@minimum - 1, @low_message)
         end
 
         def disallows_lower_value
@@ -438,19 +444,43 @@ EOT
             disallows_value_of(@minimum - 1, @low_message)
         end
 
-        def disallows_higher_value
-          disallows_value_of(@maximum + 1, @high_message)
-        end
-
         def allows_minimum_value
           allows_value_of(@minimum, @low_message)
         end
 
+        def disallows_minimum_value
+          disallows_value_of(@minimum, @low_message)
+        end
+
         def allows_maximum_value
           allows_value_of(@maximum, @high_message)
         end
 
-        def disallows_value_outside_of_array?
+        def disallows_maximum_value
+          disallows_value_of(@maximum, @high_message)
+        end
+
+        def allows_higher_value
+          allows_value_of(@maximum + 1, @high_message)
+        end
+
+        def disallows_higher_value
+          disallows_value_of(@maximum + 1, @high_message)
+        end
+
+        def allows_all_values_in_array?
+          @array.all? do |value|
+            allows_value_of(value, @low_message)
+          end
+        end
+
+        def disallows_any_values_in_array?
+          @array.any? do |value|
+            disallows_value_of(value, @low_message)
+          end
+        end
+
+        def allows_any_value_outside_of_array?
           if attribute_type == :boolean
             case @array
             when [false, true], [true, false]
@@ -466,11 +496,32 @@ EOT
             end
           end
 
-          !values_outside_of_array.any? do |value|
+          values_outside_of_array.any? do |value|
             allows_value_of(value, @low_message)
           end
         end
 
+        def disallows_all_values_outside_of_array?
+          if attribute_type == :boolean
+            case @array
+            when [false, true], [true, false]
+              Shoulda::Matchers.warn BOOLEAN_ALLOWS_BOOLEAN_MESSAGE
+              return true
+            when [nil]
+              if attribute_column.null
+                Shoulda::Matchers.warn BOOLEAN_ALLOWS_NIL_MESSAGE
+                return true
+              else
+                raise NonNullableBooleanError.create(@attribute)
+              end
+            end
+          end
+
+          values_outside_of_array.all? do |value|
+            disallows_value_of(value, @low_message)
+          end
+        end
+
         def values_outside_of_array
           if !(@array & outside_values).empty?
             raise CouldNotDetermineValueOutsideOfArray
@@ -483,8 +534,8 @@ EOT
           case attribute_type
           when :boolean
             boolean_outside_values
-          when :fixnum
-            [ARBITRARY_OUTSIDE_FIXNUM]
+          when :integer
+            [ARBITRARY_OUTSIDE_INTEGER]
           when :decimal
             [ARBITRARY_OUTSIDE_DECIMAL]
           when :date
@@ -538,7 +589,7 @@ EOT
 
         def column_type_to_attribute_type(type)
           case type
-            when :integer, :float then :fixnum
+            when :float then :integer
             when :timestamp then :datetime
             else type
           end
@@ -548,7 +599,7 @@ EOT
           case value
             when true, false then :boolean
             when BigDecimal then :decimal
-            when Fixnum then :fixnum
+            when Integer then :integer
             when Date then :date
             when DateTime then :datetime
             when Time then :time
@@ -556,6 +607,24 @@ EOT
           end
         end
 
+        def allows_nil_value?
+          @options[:allow_nil] != true || allows_value_of(nil)
+        end
+
+        def disallows_nil_value?
+          @options[:allow_nil] && disallows_value_of(nil)
+        end
+
+        def allows_blank_value?
+          @options[:allow_blank] != true ||
+            BLANK_VALUES.all? { |value| allows_value_of(value) }
+        end
+
+        def disallows_blank_value?
+          @options[:allow_blank] &&
+            BLANK_VALUES.any? { |value| disallows_value_of(value) }
+        end
+
         def inspected_array
           Shoulda::Matchers::Util.inspect_values(@array).to_sentence(
             two_words_connector: " or ",