rspec-expectations 2.10.0 → 2.11.0

data/lib/rspec/matchers/built_in/base_matcher.rb

@@ -11,39 +11,42 @@ module RSpec
       # This class is for internal use, and subject to change without notice.  We
       # strongly recommend that you do not base your custom matchers on this
       # class. If/when this changes, we will announce it and remove this warning.
-      module BaseMatcher
+      class BaseMatcher
         include RSpec::Matchers::Pretty
 
         attr_reader :actual, :expected, :rescued_exception
 
-        def initialize(expected=nil)
+        def initialize(expected = nil)
           @expected = expected
         end
 
         def matches?(actual)
           @actual = actual
+          match(expected, actual)
         end
 
         def match_unless_raises(*exceptions)
           exceptions.unshift Exception if exceptions.empty?
           begin
             yield
+            true
           rescue *exceptions => @rescued_exception
-            return false
+            false
           end
-          true
         end
 
         def failure_message_for_should
-          "expected #{actual.inspect} to #{name_to_sentence}#{expected_to_sentence}"
+          assert_ivars :@actual, :@expected
+          "expected #{@actual.inspect} to #{name_to_sentence}#{expected_to_sentence}"
         end
 
         def failure_message_for_should_not
-          "expected #{actual.inspect} not to #{name_to_sentence}#{expected_to_sentence}"
+          assert_ivars :@actual, :@expected
+          "expected #{@actual.inspect} not to #{name_to_sentence}#{expected_to_sentence}"
         end
 
         def description
-          expected ? "#{name_to_sentence} #{expected.inspect}" : name_to_sentence
+          expected ? "#{name_to_sentence} #{@expected.inspect}" : name_to_sentence
         end
 
         def diffable?
@@ -53,6 +56,12 @@ module RSpec
         def ==(other)
           matches?(other)
         end
+
+        private
+
+        def assert_ivars *ivars
+          raise "#{self.class.name} needs to supply #{to_sentence ivars}" unless ivars.all? { |v| instance_variables.map(&:intern).include? v }
+        end
       end
     end
   end

data/lib/rspec/matchers/built_in/be.rb

@@ -3,27 +3,37 @@ require 'rspec/matchers/dsl'
 module RSpec
   module Matchers
     module BuiltIn
-      class BeTrue
-        include BaseMatcher
+      class BeTrue < BaseMatcher
+        def match(_, actual)
+          !!actual
+        end
 
-        def matches?(actual)
-          super(actual)
+        def failure_message_for_should
+          "expected: true value\n     got: #{actual.inspect}"
+        end
+
+        def failure_message_for_should_not
+          "expected: non-true value\n     got: #{actual.inspect}"
         end
       end
 
-      class BeFalse
-        include BaseMatcher
+      class BeFalse < BaseMatcher
+        def match(_, actual)
+          !actual
+        end
 
-        def matches?(actual)
-          !super(actual)
+        def failure_message_for_should
+          "expected: false value\n     got: #{actual.inspect}"
         end
-      end
 
-      class BeNil
-        include BaseMatcher
+        def failure_message_for_should_not
+          "expected: non-false value\n     got: #{actual.inspect}"
+        end
+      end
 
-        def matches?(actual)
-          super(actual).nil?
+      class BeNil < BaseMatcher
+        def match(_, actual)
+          actual.nil?
         end
 
         def failure_message_for_should
@@ -35,16 +45,13 @@ module RSpec
         end
       end
 
-      class Be
-        include RSpec::Matchers::Pretty
-
+      class Be < BaseMatcher
         def initialize(*args, &block)
           @args = args
         end
 
-        def matches?(actual)
-          @actual = actual
-          !!@actual
+        def match(_, actual)
+          !!actual
         end
 
         def failure_message_for_should
@@ -55,10 +62,6 @@ module RSpec
           "expected #{@actual.inspect} to evaluate to false"
         end
 
-        def description
-          "be"
-        end
-
         [:==, :<, :<=, :>=, :>, :===].each do |operator|
           define_method operator do |operand|
             BeComparedTo.new(operand, operator)
@@ -96,7 +99,7 @@ module RSpec
 
         def matches?(actual)
           @actual = actual
-          @actual.__send__(@operator, @expected)
+          @actual.send @operator, @expected
         end
 
         def failure_message_for_should
@@ -178,6 +181,5 @@ it is a bit confusing.
         end
       end
     end
-
   end
 end

data/lib/rspec/matchers/built_in/be_instance_of.rb

@@ -1,11 +1,9 @@
 module RSpec
   module Matchers
     module BuiltIn
-      class BeAnInstanceOf
-        include BaseMatcher
-
-        def matches?(actual)
-          super(actual).instance_of?(expected)
+      class BeAnInstanceOf < BaseMatcher
+        def match(expected, actual)
+          actual.instance_of? expected
         end
       end
     end

data/lib/rspec/matchers/built_in/be_kind_of.rb

@@ -1,11 +1,9 @@
 module RSpec
   module Matchers
     module BuiltIn
-      class BeAKindOf
-        include BaseMatcher
-
-        def matches?(actual)
-          super(actual).kind_of?(expected)
+      class BeAKindOf < BaseMatcher
+        def match(expected, actual)
+          actual.kind_of? expected
         end
       end
     end

data/lib/rspec/matchers/built_in/be_within.rb

@@ -2,19 +2,15 @@ module RSpec
   module Matchers
     module BuiltIn
       class BeWithin
-        include BaseMatcher
-
-        attr_reader :delta
-
         def initialize(delta)
           @delta = delta
         end
 
         def matches?(actual)
-          unless defined?(@expected)
-            raise ArgumentError.new("You must set an expected value using #of: be_within(#{delta}).of(expected_value)")
-          end
-          (super(actual) - expected).abs <= delta
+          @actual = actual
+          raise needs_expected unless defined? @expected 
+          raise needs_numeric  unless @actual.is_a? Numeric 
+          (@actual - @expected).abs <= @delta
         end
 
         def of(expected)
@@ -23,15 +19,25 @@ module RSpec
         end
 
         def failure_message_for_should
-          "expected #{actual} to #{description}"
+          "expected #{@actual} to #{description}"
         end
 
         def failure_message_for_should_not
-          "expected #{actual} not to #{description}"
+          "expected #{@actual} not to #{description}"
         end
 
         def description
-          "be within #{delta} of #{expected}"
+          "be within #{@delta} of #{@expected}"
+        end
+
+        private
+
+        def needs_numeric
+          ArgumentError.new "The actual value (#{@actual.inspect}) must be of a `Numeric` type"
+        end
+
+        def needs_expected
+          ArgumentError.new "You must set an expected value using #of: be_within(#{@delta}).of(expected_value)"
         end
       end
     end

data/lib/rspec/matchers/built_in/cover.rb

@@ -1,20 +1,19 @@
 module RSpec
   module Matchers
     module BuiltIn
-      class Cover
-        include BaseMatcher
-
+      class Cover < BaseMatcher
         def initialize(*expected)
-          super(expected)
+          @expected = expected
         end
 
         def matches?(range)
-          expected.all? {|e| super(range).cover?(e)}
+          @actual = range
+          @expected.all? { |e| range.cover?(e) }
         end
 
         def does_not_match?(range)
           @actual = range
-          expected.none? {|e| range.cover?(e)}
+          expected.none? { |e| range.cover?(e) }
         end
       end
     end

data/lib/rspec/matchers/built_in/eq.rb

@@ -1,11 +1,9 @@
 module RSpec
   module Matchers
     module BuiltIn
-      class Eq
-        include BaseMatcher
-
-        def matches?(actual)
-          super(actual) == expected
+      class Eq < BaseMatcher
+        def match(expected, actual)
+          actual == expected
         end
 
         def failure_message_for_should
@@ -16,9 +14,7 @@ module RSpec
           "\nexpected: value != #{expected.inspect}\n     got: #{actual.inspect}\n\n(compared using ==)\n"
         end
 
-        def diffable?
-          true
-        end
+        def diffable?; true; end
       end
     end
   end

data/lib/rspec/matchers/built_in/eql.rb

@@ -1,11 +1,9 @@
 module RSpec
   module Matchers
     module BuiltIn
-      class Eql
-        include BaseMatcher
-
-        def matches?(actual)
-          super(actual).eql?(expected)
+      class Eql < BaseMatcher
+        def match(expected, actual)
+          actual.eql? expected
         end
 
         def failure_message_for_should

data/lib/rspec/matchers/built_in/equal.rb

@@ -1,11 +1,9 @@
 module RSpec
   module Matchers
     module BuiltIn
-      class Equal
-        include BaseMatcher
-
-        def matches?(actual)
-          super(actual).equal?(expected)
+      class Equal < BaseMatcher
+        def match(expected, actual)
+          actual.equal? expected
         end
 
         def failure_message_for_should
@@ -16,7 +14,7 @@ expected #{inspect_object(expected)}
 
 Compared using equal?, which compares object identity,
 but expected and actual are not the same object. Use
-'actual.should == expected' if you don't care about
+'actual.should eq(expected)' if you don't care about
 object identity in this example.
 
 MESSAGE
@@ -33,11 +31,9 @@ Compared using equal?, which compares object identity.
 MESSAGE
         end
 
-        def diffable?
-          true
-        end
+        def diffable?; true; end
 
-      private
+        private
 
         def inspect_object(o)
           "#<#{o.class}:#{o.object_id}> => #{o.inspect}"

data/lib/rspec/matchers/built_in/exist.rb

@@ -1,25 +1,23 @@
 module RSpec
   module Matchers
     module BuiltIn
-      class Exist
-        include BaseMatcher
-
-        def initialize(*args)
-          super(args)
+      class Exist < BaseMatcher
+        def initialize(*expected)
+          @expected = expected
         end
 
         def matches?(actual)
-          super(actual)
-          predicates = [:exist?, :exists?].select { |p| actual.respond_to?(p) }
-          existance_values = predicates.map { |p| actual.send(p, *expected) }
-          uniq_truthy_values = existance_values.map { |v| !!v }.uniq
+          @actual = actual
+          predicates = [:exist?, :exists?].select { |p| @actual.respond_to?(p) }
+          existence_values = predicates.map { |p| @actual.send(p, *@expected) }
+          uniq_truthy_values = existence_values.map { |v| !!v }.uniq
 
           case uniq_truthy_values.size
-          when 0; raise NoMethodError.new("#{actual.inspect} does not respond to either #exist? or #exists?")
-          when 1; existance_values.first
+          when 0; raise NoMethodError.new("#{@actual.inspect} does not respond to either #exist? or #exists?")
+          when 1; existence_values.first
           else raise "#exist? and #exists? returned different values:\n\n" +
-            " exist?: #{existance_values.first}\n" +
-            "exists?: #{existance_values.last}"
+            " exist?: #{existence_values.first}\n" +
+            "exists?: #{existence_values.last}"
           end
         end
       end

data/lib/rspec/matchers/built_in/include.rb

@@ -1,20 +1,19 @@
 module RSpec
   module Matchers
     module BuiltIn
-      class Include
-        include BaseMatcher
-
+      class Include < BaseMatcher
         def initialize(*expected)
-          super(expected)
+          @expected = expected
         end
 
         def matches?(actual)
-          perform_match(:all?, :all?, super(actual), expected)
+          @actual = actual
+          perform_match(:all?, :all?, @actual, @expected)
         end
 
         def does_not_match?(actual)
           @actual = actual
-          perform_match(:none?, :any?, actual, expected)
+          perform_match(:none?, :any?, @actual, @expected)
         end
 
         def description

data/lib/rspec/matchers/built_in/match.rb

@@ -1,11 +1,10 @@
 module RSpec
   module Matchers
     module BuiltIn
-      class Match
-        include BaseMatcher
+      class Match < BaseMatcher
 
-        def matches?(actual)
-          super(actual).match(expected)
+        def match(expected, actual)
+          actual.match expected
         end
       end
     end

data/lib/rspec/matchers/built_in/match_array.rb

@@ -1,23 +1,16 @@
 module RSpec
   module Matchers
     module BuiltIn
-      class MatchArray
-        include RSpec::Matchers::Pretty
-
-        def initialize(expected)
-          @expected = expected
-        end
-
-        def matches?(actual)
-          @actual = actual        
-          @extra_items = difference_between_arrays(@actual, @expected)
-          @missing_items = difference_between_arrays(@expected, @actual)
+      class MatchArray < BaseMatcher
+        def match(expected, actual)
+          @extra_items = difference_between_arrays(actual, expected)
+          @missing_items = difference_between_arrays(expected, actual)
           @extra_items.empty? & @missing_items.empty?
         end
 
         def failure_message_for_should
-          message =  "expected collection contained:  #{safe_sort(@expected).inspect}\n"
-          message += "actual collection contained:    #{safe_sort(@actual).inspect}\n"
+          message =  "expected collection contained:  #{safe_sort(expected).inspect}\n"
+          message += "actual collection contained:    #{safe_sort(actual).inspect}\n"
           message += "the missing elements were:      #{safe_sort(@missing_items).inspect}\n" unless @missing_items.empty?
           message += "the extra elements were:        #{safe_sort(@extra_items).inspect}\n"   unless @extra_items.empty?
           message
@@ -28,7 +21,7 @@ module RSpec
         end
 
         def description
-          "contain exactly #{_pretty_print(@expected)}"
+          "contain exactly #{_pretty_print(expected)}"
         end
 
         private