rspec 1.2.2 → 1.2.3

data/lib/spec/matchers/be_kind_of.rb

@@ -1,28 +1,5 @@
 module Spec
   module Matchers
-    class BeKindOf
-      def initialize(expected)
-        @expected = expected
-      end
-      
-      def matches?(actual)
-        @actual = actual
-        @actual.kind_of?(@expected)
-      end
-      
-      def description
-        "be a kind of #{@expected}"
-      end
-      
-      def failure_message_for_should
-        "expected kind of #{@expected}, got #{@actual.inspect}"
-      end
-      
-      def failure_message_for_should_not
-        "expected #{@actual.inspect} not to be a kind of #{@expected}"
-      end
-    end
-
     # :call-seq:
     #   should be_kind_of(expected)
     #   should be_a_kind_of(expected)
@@ -36,10 +13,14 @@ module Spec
     #   5.should be_kind_of(Fixnum)
     #   5.should be_kind_of(Numeric)
     #   5.should_not be_kind_of(Float)
-    def be_kind_of(expected)
-      BeKindOf.new(expected)
+    def be_a_kind_of(expected)
+      Matcher.new :be_a_kind_of, expected do |expected|
+        match do |actual|
+          actual.kind_of?(expected)
+        end
+      end
     end
     
-    alias_method :be_a_kind_of, :be_kind_of
+    alias_method :be_kind_of, :be_a_kind_of
   end
 end

data/lib/spec/matchers/dsl.rb

@@ -1,15 +1,20 @@
 module Spec
   module Matchers
     module DSL
-      def create(name, &block_passed_to_create)
+      # See Spec::Matchers
+      def define(name, &declarations)
         define_method name do |*expected|
-          Spec::Matchers::Matcher.new name, *expected, &block_passed_to_create
+          Spec::Matchers::Matcher.new name, *expected, &declarations
         end
       end
+      
+      # Deprecated - use define
+      def create(name, &declarations)
+        Spec.deprecate("Spec::Matchers.create","Spec::Matchers.define")
+        define(name, &declarations)
+      end
     end
   end
 end
 
 Spec::Matchers.extend Spec::Matchers::DSL
-
-      

data/lib/spec/matchers/eql.rb

@@ -1,29 +1,5 @@
 module Spec
   module Matchers
-    class Eql
-      def initialize(expected)
-        @expected = expected
-      end
-      
-      def matches?(actual)
-        @actual = actual
-        @actual.eql?(@expected)
-      end
-      
-      def failure_message_for_should
-        return "expected #{@expected.inspect}, got #{@actual.inspect} (using .eql?)", @expected, @actual
-      end
-      
-      def failure_message_for_should_not
-        return "expected #{@actual.inspect} not to equal #{@expected.inspect} (using .eql?)", @expected, @actual
-      end
-      
-      def description
-        "eql #{@expected.inspect}"
-      end
-    end
-    
-  
     # :call-seq:
     #   should eql(expected)
     #   should_not eql(expected)
@@ -37,7 +13,30 @@ module Spec
     #   5.should eql(5)
     #   5.should_not eql(3)
     def eql(expected)
-      Eql.new(expected)
+      Matcher.new :eql, expected do |expected|
+        match do |actual|
+          actual.eql?(expected)
+        end
+
+        failure_message_for_should do |actual|
+          <<-MESSAGE
+
+expected #{expected.inspect}
+     got #{actual.inspect}
+
+(compared using eql?)
+MESSAGE
+        end
+
+        failure_message_for_should_not do |actual|
+          <<-MESSAGE
+
+expected #{actual.inspect} not to equal #{expected.inspect}
+
+(compared using eql?)
+MESSAGE
+        end
+      end
     end
   end
 end

data/lib/spec/matchers/equal.rb

@@ -1,29 +1,6 @@
 module Spec
   module Matchers
-    
-    class Equal
-      def initialize(expected)
-        @expected = expected
-      end
-      
-      def matches?(actual)
-        @actual = actual
-        @actual.equal?(@expected)
-      end
-      
-      def failure_message_for_should
-        return "expected #{@expected.inspect}, got #{@actual.inspect} (using .equal?)", @expected, @actual
-      end
-      
-      def failure_message_for_should_not
-        return "expected #{@actual.inspect} not to equal #{@expected.inspect} (using .equal?)", @expected, @actual
-      end
-      
-      def description
-        "equal #{@expected.inspect}"
-      end
-    end
-  
+
     # :call-seq:
     #   should equal(expected)
     #   should_not equal(expected)
@@ -37,7 +14,30 @@ module Spec
     #   5.should equal(5) #Fixnums are equal
     #   "5".should_not equal("5") #Strings that look the same are not the same object
     def equal(expected)
-      Equal.new(expected)
+      Matcher.new :equal, expected do |expected|
+        match do |actual|
+          actual.equal?(expected)
+        end
+        
+        failure_message_for_should do |actual|
+          <<-MESSAGE
+
+expected #{expected.inspect}
+     got #{actual.inspect}
+     
+(compared using equal?)
+MESSAGE
+        end
+
+        failure_message_for_should_not do |actual|
+          <<-MESSAGE
+
+expected #{actual.inspect} not to equal #{expected.inspect}
+
+(compared using equal?)
+MESSAGE
+        end
+      end
     end
   end
 end

data/lib/spec/matchers/exist.rb

@@ -1,32 +1,16 @@
 module Spec
   module Matchers
-
-    class Exist
-      def matches?(actual)
-        @actual = actual
-        actual.exist?
-      end
-
-      def failure_message_for_should
-        "expected #{@actual.inspect} to exist, but it doesn't."
-      end
-
-      def failure_message_for_should_not
-        "expected #{@actual.inspect} to not exist, but it does."
-      end
-
-      def description
-        "exists"
-      end
-    end
-
     # :call-seq:
     #   should exist
     #   should_not exist
     #
     # Passes if actual.exist?
     def exist
-      Exist.new
+      Matcher.new :exist do
+        match do |actual|
+          actual.exist?
+        end
+      end
     end
   end
 end

data/lib/spec/matchers/include.rb

@@ -1,48 +1,5 @@
 module Spec
   module Matchers
-    class Include #:nodoc:
-      include Spec::Matchers::Pretty
-
-      def initialize(*expecteds)
-        @expecteds = expecteds
-      end
-      
-      def matches?(actual)
-        @actual = actual
-        @expecteds.each do |expected|
-          if actual.is_a?(Hash)
-            if expected.is_a?(Hash)
-              expected.each_pair do |k,v|
-                return false unless actual[k] == v
-              end
-            else
-              return false unless actual.has_key?(expected)
-            end
-          else
-            return false unless actual.include?(expected)
-          end
-        end
-        true
-      end
-      
-      def failure_message_for_should
-        _message
-      end
-      
-      def failure_message_for_should_not
-        _message("not ")
-      end
-      
-      def description
-        "include #{_pretty_print(@expecteds)}"
-      end
-      
-      private
-        def _message(maybe_not="")
-          "expected #{@actual.inspect} #{maybe_not}to include #{_pretty_print(@expecteds)}"
-        end
-    end
-
     # :call-seq:
     #   should include(expected)
     #   should_not include(expected)
@@ -60,7 +17,28 @@ module Spec
     #   "spread".should include("read")
     #   "spread".should_not include("red")
     def include(*expected)
-      Matchers::Include.new(*expected)
+      Matcher.new :include, *expected do |*expecteds|
+        match do |actual|
+          helper(actual, *expecteds)
+        end
+        
+        def helper(actual, *expecteds)
+          expecteds.each do |expected|
+            if actual.is_a?(Hash)
+              if expected.is_a?(Hash)
+                expected.each_pair do |k,v|
+                  return false unless actual[k] == v
+                end
+              else
+                return false unless actual.has_key?(expected)
+              end
+            else
+              return false unless actual.include?(expected)
+            end
+          end
+          true
+        end
+      end
     end
   end
 end

data/lib/spec/matchers/match.rb

@@ -1,29 +1,5 @@
 module Spec
   module Matchers
-    class Match
-      def initialize(expected)
-        @expected = expected
-      end
-
-      def matches?(actual)
-        @actual = actual
-        actual =~ @expected
-      end
-
-      def failure_message_for_should
-        return "expected #{@actual.inspect} to match #{@expected.inspect}", @expected, @actual
-      end
-
-      def failure_message_for_should_not
-        return "expected #{@actual.inspect} not to match #{@expected.inspect}", @expected, @actual
-      end
-
-      def description
-        "match #{@expected.inspect}"
-      end
-    end
-    
-    
     # :call-seq:
     #   should match(regexp)
     #   should_not match(regexp)
@@ -34,7 +10,11 @@ module Spec
     #
     #   email.should match(/^([^\s]+)((?:[-a-z0-9]+\.)+[a-z]{2,})$/i)
     def match(expected)
-      Match.new(expected)
+      Matcher.new :match, expected do |expected|
+        match do |actual|
+          actual =~ expected
+        end
+      end
     end
   end
 end

data/lib/spec/matchers/match_array.rb

@@ -16,10 +16,10 @@ module Spec
       end
 
       def failure_message_for_should
-        message =  "expected collection contained:  #{@expected.sort.inspect}\n"
-        message += "actual collection contained:    #{@actual.sort.inspect}\n"
-        message += "the missing elements were:      #{@missing_items.sort.inspect}\n" unless @missing_items.empty?
-        message += "the extra elements were:        #{@extra_items.sort.inspect}\n" unless @extra_items.empty?
+        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
       end
       
@@ -33,6 +33,10 @@ module Spec
 
       private
 
+        def safe_sort(array)
+          array.all?{|item| item.respond_to?(:<=>)} ? array.sort : array
+        end
+
         def difference_between_arrays(array_1, array_2)
           difference = array_1.dup
           array_2.each do |element|

data/lib/spec/matchers/matcher.rb

@@ -3,14 +3,17 @@ module Spec
     class Matcher
       include Spec::Matchers::Pretty
       
+      attr_reader :expected, :actual
+      
       def initialize(name, *expected, &declarations)
         @name = name
         @expected = expected
         @declarations = declarations
+        @diffable = false
         @messages = {
           :description => lambda {"#{name_to_sentence}#{expected_to_sentence}"},
-          :failure_message_for_should => lambda {|actual| "expected #{actual} to #{name_to_sentence}#{expected_to_sentence}"},
-          :failure_message_for_should_not => lambda {|actual| "expected #{actual} not to #{name_to_sentence}#{expected_to_sentence}"}
+          :failure_message_for_should => lambda {|actual| "expected #{actual.inspect} to #{name_to_sentence}#{expected_to_sentence}"},
+          :failure_message_for_should_not => lambda {|actual| "expected #{actual.inspect} not to #{name_to_sentence}#{expected_to_sentence}"}
         }
       end
       
@@ -36,6 +39,14 @@ module Spec
         @match_block = block
       end
       
+      def diffable?
+        @diffable
+      end
+      
+      def diffable
+        @diffable = true
+      end
+      
     private
 
       def cache_or_call_cached(key, actual=nil, &block)

data/lib/spec/matchers/pretty.rb

@@ -6,6 +6,7 @@ module Spec
       end
 
       def to_sentence(words)
+        words = words.map{|w| w.inspect}
         case words.length
           when 0
             ""

data/lib/spec/matchers/simple_matcher.rb

@@ -23,11 +23,11 @@ module Spec
         @description || explanation
       end
 
-      def failure_message
+      def failure_message_for_should
         @failure_message || (@description.nil? ? explanation : %[expected #{@description.inspect} but got #{@given.inspect}])
       end
 
-      def negative_failure_message
+      def failure_message_for_should_not
         @negative_failure_message || (@description.nil? ? explanation : %[expected not to get #{@description.inspect}, but got #{@given.inspect}])
       end
 

data/lib/spec/mocks/mock.rb

@@ -21,16 +21,6 @@ module Spec
         other == __mock_proxy
       end
 
-      def method_missing(sym, *args, &block)
-        __mock_proxy.record_message_received(sym, args, block)
-        begin
-          return self if __mock_proxy.null_object?
-          super(sym, *args, &block)
-        rescue NameError
-          __mock_proxy.raise_unexpected_message_error sym, *args
-        end
-      end
-      
       def inspect
         "#<#{self.class}:#{sprintf '0x%x', self.object_id} @name=#{@name.inspect}>"
       end
@@ -40,6 +30,16 @@ module Spec
       end
       
       private
+
+        def method_missing(sym, *args, &block)
+          __mock_proxy.record_message_received(sym, args, block)
+          begin
+            return self if __mock_proxy.null_object?
+            super(sym, *args, &block)
+          rescue NameError
+            __mock_proxy.raise_unexpected_message_error sym, *args
+          end
+        end
       
         def parse_options(options)
           options.has_key?(:null_object) ? {:null_object => options.delete(:null_object)} : {}