shoulda-matchers 2.4.0 → 2.5.0

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

@@ -26,13 +26,15 @@ module Shoulda
           description
         end
 
-        def failure_message_for_should
+        def failure_message
           "Expected #{expectation}"
         end
+        alias failure_message_for_should failure_message
 
-        def failure_message_for_should_not
+        def failure_message_when_negated
           "Did not expect #{expectation}"
         end
+        alias failure_message_for_should_not failure_message_when_negated
 
         private
 

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

@@ -30,13 +30,15 @@ module Shoulda # :nodoc:
           correct_status_code? || correct_status_code_range?
         end
 
-        def failure_message_for_should
+        def failure_message
           "Expected #{expectation}"
         end
+        alias failure_message_for_should failure_message
 
-        def failure_message_for_should_not
+        def failure_message_when_negated
           "Did not expect #{expectation}"
         end
+        alias failure_message_for_should_not failure_message_when_negated
 
         def description
           "respond with #{@status}"

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

@@ -13,15 +13,19 @@ module Shoulda # :nodoc:
       #
       #   it { should route(:get, '/posts').
       #                 to(:controller => :posts, :action => :index) }
+      #   it { should route(:get, '/posts').to('posts#index') }
       #   it { should route(:get, '/posts/new').to(:action => :new) }
       #   it { should route(:post, '/posts').to(:action => :create) }
       #   it { should route(:get, '/posts/1').to(:action => :show, :id => 1) }
+      #   it { should route(:get, '/posts/1').to('posts#show', :id => 1) }
       #   it { should route(:get, '/posts/1/edit').to(:action => :edit, :id => 1) }
       #   it { should route(:put, '/posts/1').to(:action => :update, :id => 1) }
       #   it { should route(:delete, '/posts/1').
       #                 to(:action => :destroy, :id => 1) }
       #   it { should route(:get, '/users/1/posts/1').
       #                 to(:action => :show, :id => 1, :user_id => 1) }
+      #   it { should route(:get, '/users/1/posts/1').
+      #                 to('posts#show', :id => 1, :user_id => 1) }
       def route(method, path)
         RouteMatcher.new(method, path, self)
       end
@@ -33,10 +37,13 @@ module Shoulda # :nodoc:
           @context = context
         end
 
-        attr_reader :failure_message_for_should, :failure_message_for_should_not
+        attr_reader :failure_message, :failure_message_when_negated
+
+        alias failure_message_for_should failure_message
+        alias failure_message_for_should_not failure_message_when_negated
 
-        def to(params)
-          @params = stringify_params(params)
+        def to(*args)
+          @params = RouteParams.new(args).normalize
           self
         end
 
@@ -60,19 +67,6 @@ module Shoulda # :nodoc:
           @params[:controller] ||= controller.controller_path
         end
 
-        def stringify_params(params)
-          params.each do |key, value|
-            params[key] = stringify(value)
-          end
-        end
-
-        def stringify(value)
-          if value.is_a?(Array)
-            value.map(&:to_param)
-          else
-            value.to_param
-          end
-        end
 
         def route_recognized?
           begin
@@ -80,13 +74,13 @@ module Shoulda # :nodoc:
                           { :method => @method, :path => @path },
                           @params)
 
-            @failure_message_for_should_not = "Didn't expect to #{description}"
+            @failure_message_when_negated = "Didn't expect to #{description}"
             true
           rescue ::ActionController::RoutingError => error
-            @failure_message_for_should = error.message
+            @failure_message = error.message
             false
           rescue Shoulda::Matchers::AssertionError => error
-            @failure_message_for_should = error.message
+            @failure_message = error.message
             false
           end
         end

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

@@ -0,0 +1,47 @@
+module Shoulda # :nodoc:
+  module Matchers
+    module ActionController # :nodoc:
+      class RouteParams
+        def initialize(args)
+          @args = args
+        end
+
+        def normalize
+          if controller_and_action_given_as_string?
+            extract_params_from_string
+          else
+            stringify_params
+          end
+        end
+
+        private
+
+        attr_reader :args
+
+        def controller_and_action_given_as_string?
+          args[0].is_a?(String)
+        end
+
+        def extract_params_from_string
+          params = args[1] || {}
+          controller, action = args[0].split('#')
+          params.merge!(:controller => controller, :action => action)
+        end
+
+        def stringify_params
+          args[0].each do |key, value|
+            args[0][key] = stringify(value)
+          end
+        end
+
+        def stringify(value)
+          if value.is_a?(Array)
+            value.map(&:to_param)
+          else
+            value.to_param
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -32,13 +32,15 @@ module Shoulda # :nodoc:
           assigned_correct_value? || cleared_value?
         end
 
-        def failure_message_for_should
+        def failure_message
           "Expected #{expectation}, but #{result}"
         end
+        alias failure_message_for_should failure_message
 
-        def failure_message_for_should_not
+        def failure_message_when_negated
           "Didn't expect #{expectation}, but #{result}"
         end
+        alias failure_message_for_should_not failure_message_when_negated
 
         def description
           description = "set session variable #{@key.inspect}"

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

@@ -51,13 +51,15 @@ module Shoulda # :nodoc:
           description
         end
 
-        def failure_message_for_should
+        def failure_message
           "Expected #{expectation}"
         end
+        alias failure_message_for_should failure_message
 
-        def failure_message_for_should_not
+        def failure_message_when_negated
           "Did not expect #{expectation}"
         end
+        alias failure_message_for_should_not failure_message_when_negated
 
         private
 

data/lib/shoulda/matchers/active_model.rb

@@ -4,17 +4,18 @@ require 'shoulda/matchers/active_model/validation_message_finder'
 require 'shoulda/matchers/active_model/exception_message_finder'
 require 'shoulda/matchers/active_model/allow_value_matcher'
 require 'shoulda/matchers/active_model/disallow_value_matcher'
-require 'shoulda/matchers/active_model/only_integer_matcher'
-require 'shoulda/matchers/active_model/odd_even_number_matcher'
-require 'shoulda/matchers/active_model/comparison_matcher'
 require 'shoulda/matchers/active_model/ensure_length_of_matcher'
 require 'shoulda/matchers/active_model/ensure_inclusion_of_matcher'
 require 'shoulda/matchers/active_model/ensure_exclusion_of_matcher'
+require 'shoulda/matchers/active_model/validate_absence_of_matcher'
 require 'shoulda/matchers/active_model/validate_presence_of_matcher'
 require 'shoulda/matchers/active_model/validate_uniqueness_of_matcher'
 require 'shoulda/matchers/active_model/validate_acceptance_of_matcher'
 require 'shoulda/matchers/active_model/validate_confirmation_of_matcher'
 require 'shoulda/matchers/active_model/validate_numericality_of_matcher'
+require 'shoulda/matchers/active_model/numericality_matchers/comparison_matcher'
+require 'shoulda/matchers/active_model/numericality_matchers/odd_even_number_matcher'
+require 'shoulda/matchers/active_model/numericality_matchers/only_integer_matcher'
 require 'shoulda/matchers/active_model/allow_mass_assignment_of_matcher'
 require 'shoulda/matchers/active_model/errors'
 require 'shoulda/matchers/active_model/have_secure_password_matcher'

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

@@ -16,7 +16,10 @@ module Shoulda # :nodoc:
       end
 
       class AllowMassAssignmentOfMatcher # :nodoc:
-        attr_reader :failure_message_for_should, :failure_message_for_should_not
+        attr_reader :failure_message, :failure_message_when_negated
+
+        alias failure_message_for_should failure_message
+        alias failure_message_for_should_not failure_message_when_negated
 
         def initialize(attribute)
           @attribute = attribute.to_s
@@ -35,12 +38,12 @@ module Shoulda # :nodoc:
           @subject = subject
           if attr_mass_assignable?
             if whitelisting?
-              @failure_message_for_should_not = "#{@attribute} was made accessible"
+              @failure_message_when_negated = "#{@attribute} was made accessible"
             else
               if protected_attributes.empty?
-                @failure_message_for_should_not = 'no attributes were protected'
+                @failure_message_when_negated = 'no attributes were protected'
               else
-                @failure_message_for_should_not = "#{class_name} is protecting " <<
+                @failure_message_when_negated = "#{class_name} is protecting " <<
                   "#{protected_attributes.to_a.to_sentence}, " <<
                   "but not #{@attribute}."
               end
@@ -48,9 +51,9 @@ module Shoulda # :nodoc:
             true
           else
             if whitelisting?
-              @failure_message_for_should = "Expected #{@attribute} to be accessible"
+              @failure_message = "Expected #{@attribute} to be accessible"
             else
-              @failure_message_for_should = "Did not expect #{@attribute} to be protected"
+              @failure_message = "Did not expect #{@attribute} to be protected"
             end
             false
           end

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

@@ -73,13 +73,15 @@ module Shoulda # :nodoc:
           end
         end
 
-        def failure_message_for_should
+        def failure_message
           "Did not expect #{expectation}, got error: #{matched_error}"
         end
+        alias failure_message_for_should failure_message
 
-        def failure_message_for_should_not
+        def failure_message_when_negated
           "Expected #{expectation}, got #{error_description}"
         end
+        alias failure_message_for_should_not failure_message_when_negated
 
         def description
           message_finder.allow_description(allowed_values)

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

@@ -25,13 +25,15 @@ module Shoulda # :nodoc:
           self
         end
 
-        def failure_message_for_should
-          @allow_matcher.failure_message_for_should_not
+        def failure_message
+          @allow_matcher.failure_message_when_negated
         end
+        alias failure_message_for_should failure_message
 
-        def failure_message_for_should_not
-          @allow_matcher.failure_message_for_should
+        def failure_message_when_negated
+          @allow_matcher.failure_message
         end
+        alias failure_message_for_should_not failure_message_when_negated
 
         def allowed_types
           ''

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

@@ -24,6 +24,7 @@ module Shoulda # :nodoc:
       class EnsureInclusionOfMatcher < ValidationMatcher # :nodoc:
         ARBITRARY_OUTSIDE_STRING = 'shouldamatchersteststring'
         ARBITRARY_OUTSIDE_FIXNUM = 123456789
+        ARBITRARY_OUTSIDE_DECIMAL = 0.123456789
 
         def initialize(attribute)
           super(attribute)
@@ -89,7 +90,7 @@ module Shoulda # :nodoc:
             if allows_all_values_in_array? && allows_blank_value? && allows_nil_value? && disallows_value_outside_of_array?
               true
             else
-              @failure_message_for_should = "#{@array} doesn't match array in validation"
+              @failure_message = "#{@array} doesn't match array in validation"
               false
             end
           end
@@ -160,6 +161,8 @@ module Shoulda # :nodoc:
           case @subject.send(@attribute.to_s)
           when Fixnum
             ARBITRARY_OUTSIDE_FIXNUM
+          when BigDecimal
+            ARBITRARY_OUTSIDE_DECIMAL 
           else
             ARBITRARY_OUTSIDE_STRING
           end

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

@@ -68,7 +68,6 @@ module Shoulda # :nodoc:
           end
           self
         end
-        alias_method :with_message, :with_short_message
 
         def with_long_message(message)
           if message
@@ -77,6 +76,14 @@ module Shoulda # :nodoc:
           self
         end
 
+        def with_message(message)
+          if message
+            @short_message = message
+            @long_message = message
+          end
+          self
+        end
+
         def description
           description =  "ensure #{@attribute} has a length "
           if @options.key?(:minimum) && @options.key?(:maximum)

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

@@ -11,7 +11,9 @@ module Shoulda # :nodoc:
       end
 
       class HaveSecurePasswordMatcher # :nodoc:
-        attr_reader :failure_message_for_should
+        attr_reader :failure_message
+
+        alias failure_message_for_should failure_message
 
         CORRECT_PASSWORD = "aBcDe12345"
         INCORRECT_PASSWORD = "password"
@@ -39,7 +41,7 @@ module Shoulda # :nodoc:
 
           if failure = validate
             key, params = failure
-            @failure_message_for_should = MESSAGES[key] % { subject: subject.class }.merge(params)
+            @failure_message = MESSAGES[key] % { subject: subject.class }.merge(params)
           end
 
           failure.nil?

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

@@ -0,0 +1,59 @@
+module Shoulda # :nodoc:
+  module Matchers
+    module ActiveModel # :nodoc:
+      module NumericalityMatchers
+        # Examples:
+        #   it { should validate_numericality_of(:attr).
+        #                 is_greater_than(6).
+        #                 less_than(20)...(and so on) }
+        class ComparisonMatcher < ValidationMatcher
+          def initialize(value, operator)
+            @value = value
+            @operator = operator
+            @message = nil
+          end
+
+          def for(attribute)
+            @attribute = attribute
+            self
+          end
+
+          def matches?(subject)
+            @subject = subject
+            disallows_value_of(value_to_compare, @message)
+          end
+
+          def allowed_types
+            'integer'
+          end
+
+          def with_message(message)
+            @message = message
+          end
+
+          private
+
+          def value_to_compare
+            case @operator
+              when :> then [@value, @value - 1].sample
+              when :>= then @value - 1
+              when :== then @value + 1
+              when :< then [@value, @value + 1].sample
+              when :<= then @value + 1
+            end
+          end
+
+          def 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"
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+module Shoulda # :nodoc:
+  module Matchers
+    module ActiveModel # :nodoc:
+      module NumericalityMatchers
+        class OddEvenNumberMatcher # :nodoc:
+          NON_EVEN_NUMBER_VALUE = 1
+          NON_ODD_NUMBER_VALUE  = 2
+
+          def initialize(attribute, options = {})
+            @attribute = attribute
+            options[:odd]   ||= true
+            options[:even]  ||= false
+
+            if options[:odd] && !options[:even]
+              @disallow_value_matcher = DisallowValueMatcher.new(NON_ODD_NUMBER_VALUE).
+                for(@attribute).
+                with_message(:odd)
+            else
+              @disallow_value_matcher = DisallowValueMatcher.new(NON_EVEN_NUMBER_VALUE).
+                for(@attribute).
+                with_message(:even)
+            end
+          end
+
+          def matches?(subject)
+            @disallow_value_matcher.matches?(subject)
+          end
+
+          def with_message(message)
+            @disallow_value_matcher.with_message(message)
+            self
+          end
+
+          def allowed_types
+            'integer'
+          end
+
+          def failure_message
+            @disallow_value_matcher.failure_message
+          end
+          alias failure_message_for_should failure_message
+
+          def failure_message_when_negated
+            @disallow_value_matcher.failure_message_when_negated
+          end
+          alias failure_message_for_should_not failure_message_when_negated
+        end
+      end
+    end
+  end
+end