dchelimsky-rspec 1.1.99.9 → 1.1.99.13

data/features/support/matchers/smart_match.rb

@@ -22,11 +22,11 @@ module Spec
       end
 
       def failure_message
-        "expected #{@actual.inspect} to smart_match #{@expected.inspect}, but it didn't"
+        "expected #{@actual} to smart_match #{@expected}"
       end
 
       def negative_failure_message
-        "expected #{@actual.inspect} not to smart_match #{@expected.inspect}, but it did"
+        "expected #{@actual} not to smart_match #{@expected}"
       end
     end
 

data/lib/spec.rb

@@ -1,7 +1,7 @@
+require 'spec/ruby'
 require 'spec/matchers'
 require 'spec/expectations'
 require 'spec/example'
 require 'spec/runner'
 require 'spec/version'
 require 'spec/dsl'
-require 'spec/ruby'

data/lib/spec/dsl.rb

@@ -1 +1,3 @@
-require 'spec/dsl/main'
+require 'spec/dsl/main'
+require 'spec/dsl/matchers'
+

data/lib/spec/dsl/matchers.rb

@@ -0,0 +1,13 @@
+module Spec
+  module DSL
+    module Matchers
+      def create(name, &block_passed_to_create)
+        define_method name do |expected|
+          Spec::Matchers::Matcher.new name, expected, &block_passed_to_create
+        end
+      end
+    end
+  end
+end
+
+Spec::Matchers.extend Spec::DSL::Matchers

data/lib/spec/example/example_group_methods.rb

@@ -72,9 +72,14 @@ WARNING
       def example(description=nil, options={}, backtrace=nil, &implementation)
         example_description = ExampleDescription.new(description, options, backtrace || caller(0)[1])
         example_descriptions << example_description
-        example_implementations[example_description] = implementation
+        example_implementations[example_description] = implementation || pending_implementation
         example_description
       end
+      
+      def pending_implementation
+        error = Spec::Example::NotYetImplementedError.new(caller)
+        lambda { raise(error) }
+      end
 
       alias_method :it, :example
       alias_method :specify, :example

data/lib/spec/example/example_methods.rb

@@ -110,7 +110,7 @@ WARNING
       def initialize(description, options={}, &implementation)
         @_options = options
         @_defined_description = description
-        @_implementation = implementation || pending_implementation
+        @_implementation = implementation
         @_backtrace = caller
       end
 
@@ -134,16 +134,15 @@ WARNING
       def described_class # :nodoc:
         self.class.described_class
       end
+      
+      def description_args
+        self.class.description_args
+      end
 
       def example_group_hierarchy
         self.class.example_group_hierarchy
       end
       
-      def pending_implementation
-        error = Spec::Example::NotYetImplementedError.new(caller)
-        lambda { raise(error) }
-      end
-
     end
   end
 end

data/lib/spec/example/subject.rb

@@ -16,7 +16,7 @@ module Spec
         # See +ExampleMethods#should+ for more information about this approach.
         def subject(&block)
           if block.nil?
-            @_subject_block || (described_class ? lambda {described_class.new} : lambda {})
+            @_subject_block || (described_class ? lambda {described_class.new} : lambda {description_args.first})
           else
             @_subject_block = block
           end

data/lib/spec/expectations/handler.rb

@@ -6,12 +6,14 @@ module Spec
       def self.handle_matcher(actual, matcher, &block)
         ::Spec::Matchers.last_should = :should
         ::Spec::Matchers.last_matcher = matcher
-
         return ::Spec::Matchers::PositiveOperatorMatcher.new(actual) if matcher.nil?
 
         match = matcher.matches?(actual, &block)
-        ::Spec::Expectations.fail_with(matcher.failure_message) unless match
-        match
+        return match if match
+
+        ::Spec::Expectations.fail_with matcher.respond_to?(:failure_message_for_should) ?
+                                       matcher.failure_message_for_should :
+                                       matcher.failure_message
       end
     end
 
@@ -22,14 +24,14 @@ module Spec
 
         return ::Spec::Matchers::NegativeOperatorMatcher.new(actual) if matcher.nil?
         
-        match = if matcher.respond_to?(:does_not_match?)
-                  !matcher.does_not_match?(actual, &block)
-                else
-                  matcher.matches?(actual, &block)
-                end
-        
-        ::Spec::Expectations.fail_with(matcher.negative_failure_message) if match
-        match
+        match = matcher.respond_to?(:does_not_match?) ?
+                !matcher.does_not_match?(actual, &block) :
+                matcher.matches?(actual, &block)
+        return match unless match
+
+        ::Spec::Expectations.fail_with matcher.respond_to?(:failure_message_for_should_not) ?
+                                       matcher.failure_message_for_should_not :
+                                       matcher.negative_failure_message
       end
     end
   end

data/lib/spec/matchers.rb

@@ -1,3 +1,5 @@
+require 'spec/matchers/extensions/instance_exec'
+require 'spec/matchers/matcher'
 require 'spec/matchers/operator_matcher'
 require 'spec/matchers/be'
 require 'spec/matchers/be_close'
@@ -28,12 +30,21 @@ module Spec
   # is any object that responds to the following methods:
   #
   #   matches?(actual)
-  #   failure_message
-  #   negative_failure_message #optional
+  #   failure_message_for_should
+  #
+  # These methods are also part of the matcher protocol, but are optional:
+  #
+  #   does_not_match?(actual)
+  #   failure_message_for_should_not
   #   description #optional
   #
+  # These methods are from older versions of the protocol. They are still supported,
+  # but are not recommended:
+  #
+  #   failure_message          (use failure_message_for_should instead)
+  #   negative_failure_message (use failure_message_for_should_not instead)
+  #
   # See Spec::Expectations to learn how to use these as Expectation Matchers.
-  # See Spec::Mocks to learn how to use them as Mock Argument Matchers.
   #
   # == Predicates
   #

data/lib/spec/matchers/be.rb

@@ -26,13 +26,13 @@ module Spec
         end
       end
       
-      def failure_message
+      def failure_message_for_should
         handling_predicate? ?
           "expected #{predicate}#{args_to_s} to return true, got #{@result.inspect}" :
           "expected #{@comparison_method} #{expected}, got #{@actual.inspect}".gsub('  ',' ')
       end
       
-      def negative_failure_message
+      def failure_message_for_should_not
         if handling_predicate?
           "expected #{predicate}#{args_to_s} to return false, got #{@result.inspect}"
         else

data/lib/spec/matchers/be_close.rb

@@ -11,7 +11,7 @@ module Spec
         (@actual - @expected).abs < @delta
       end
       
-      def failure_message
+      def failure_message_for_should
         "expected #{@expected} +/- (< #{@delta}), got #{@actual}"
       end
       

data/lib/spec/matchers/be_instance_of.rb

@@ -14,11 +14,11 @@ module Spec
         "be an instance of #{@expected}"
       end
       
-      def failure_message
+      def failure_message_for_should
         "expected instance of #{@expected}, got #{@actual.inspect}"
       end
       
-      def negative_failure_message
+      def failure_message_for_should_not
         "expected #{@actual.inspect} not to be an instance of #{@expected}"
       end
     end

data/lib/spec/matchers/be_kind_of.rb

@@ -14,11 +14,11 @@ module Spec
         "be a kind of #{@expected}"
       end
       
-      def failure_message
+      def failure_message_for_should
         "expected kind of #{@expected}, got #{@actual.inspect}"
       end
       
-      def negative_failure_message
+      def failure_message_for_should_not
         "expected #{@actual.inspect} not to be a kind of #{@expected}"
       end
     end

data/lib/spec/matchers/change.rb

@@ -15,7 +15,7 @@ module Spec
         event_proc.call
         @after = evaluate_value_proc
         
-        return false if @from unless @from == @before
+        return (@to = false) if @from unless @from == @before
         return false if @to unless @to == @after
         return (@before + @amount == @after) if @amount
         return ((@after - @before) >= @minimum) if @minimum
@@ -34,7 +34,7 @@ MESSAGE
         @value_proc.call
       end
       
-      def failure_message
+      def failure_message_for_should
         if @to
           "#{@message} should have been changed to #{@to.inspect}, but is now #{@after.inspect}"
         elsif @from
@@ -54,7 +54,7 @@ MESSAGE
         @after - @before
       end
       
-      def negative_failure_message
+      def failure_message_for_should_not
         "#{@message} should not have changed, but did change from #{@before.inspect} to #{@after.inspect}"
       end
       

data/lib/spec/matchers/eql.rb

@@ -10,11 +10,11 @@ module Spec
         @actual.eql?(@expected)
       end
       
-      def failure_message
+      def failure_message_for_should
         return "expected #{@expected.inspect}, got #{@actual.inspect} (using .eql?)", @expected, @actual
       end
       
-      def negative_failure_message
+      def failure_message_for_should_not
         return "expected #{@actual.inspect} not to equal #{@expected.inspect} (using .eql?)", @expected, @actual
       end
       

data/lib/spec/matchers/equal.rb

@@ -11,11 +11,11 @@ module Spec
         @actual.equal?(@expected)
       end
       
-      def failure_message
+      def failure_message_for_should
         return "expected #{@expected.inspect}, got #{@actual.inspect} (using .equal?)", @expected, @actual
       end
       
-      def negative_failure_message
+      def failure_message_for_should_not
         return "expected #{@actual.inspect} not to equal #{@expected.inspect} (using .equal?)", @expected, @actual
       end
       

data/lib/spec/matchers/exist.rb

@@ -7,11 +7,11 @@ module Spec
         actual.exist?
       end
 
-      def failure_message
+      def failure_message_for_should
         "expected #{@actual.inspect} to exist, but it doesn't."
       end
 
-      def negative_failure_message
+      def failure_message_for_should_not
         "expected #{@actual.inspect} to not exist, but it does."
       end
 

data/lib/spec/matchers/extensions/instance_exec.rb

@@ -0,0 +1,25 @@
+require 'spec/ruby'
+
+if ::Spec::Ruby.version < "1.8.7"
+  # based on Bounded Spec InstanceExec (Mauricio Fernandez)
+  # http://eigenclass.org/hiki/bounded+space+instance_exec
+  class Object
+    module InstanceExecHelper; end
+    include InstanceExecHelper
+    def instance_exec(*args, &block)
+      begin
+        orig_critical, Thread.critical = Thread.critical, true
+        n = 0
+        n += 1 while respond_to?(method_name="__instance_exec#{n}")
+        InstanceExecHelper.module_eval{ define_method(method_name, &block) }
+      ensure
+        Thread.critical = orig_critical
+      end
+      begin
+        return send(method_name, *args)
+      ensure
+        InstanceExecHelper.module_eval{ remove_method(method_name) } rescue nil
+      end
+    end
+  end
+end

data/lib/spec/matchers/has.rb

@@ -11,11 +11,11 @@ module Spec
         actual.__send__(predicate(@expected), *@args)
       end
       
-      def failure_message
+      def failure_message_for_should
         "expected ##{predicate(@expected)}(#{@args[0].inspect}) to return true, got false"
       end
       
-      def negative_failure_message
+      def failure_message_for_should_not
         "expected ##{predicate(@expected)}(#{@args[0].inspect}) to return false, got true"
       end
       

data/lib/spec/matchers/have.rb

@@ -36,11 +36,11 @@ module Spec
         "expected #{@collection_name} to be a collection but it does not respond to #length or #size"
       end
     
-      def failure_message
+      def failure_message_for_should
         "expected #{relative_expectation} #{@collection_name}, got #{@given}"
       end
 
-      def negative_failure_message
+      def failure_message_for_should_not
         if @relativity == :exactly
           return "expected target not to have #{@expected} #{@collection_name}, got #{@given}"
         elsif @relativity == :at_most

data/lib/spec/matchers/include.rb

@@ -25,11 +25,11 @@ module Spec
         true
       end
       
-      def failure_message
+      def failure_message_for_should
         _message
       end
       
-      def negative_failure_message
+      def failure_message_for_should_not
         _message("not ")
       end
       

data/lib/spec/matchers/match.rb

@@ -10,11 +10,11 @@ module Spec
         actual =~ @expected
       end
 
-      def failure_message
+      def failure_message_for_should
         return "expected #{@actual.inspect} to match #{@expected.inspect}", @expected, @actual
       end
 
-      def negative_failure_message
+      def failure_message_for_should_not
         return "expected #{@actual.inspect} not to match #{@expected.inspect}", @expected, @actual
       end
 

data/lib/spec/matchers/match_array.rb

@@ -14,7 +14,7 @@ module Spec
         @extra_items.empty? & @missing_items.empty?
       end
 
-      def failure_message
+      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?
@@ -22,7 +22,7 @@ module Spec
         message
       end
       
-      def negative_failure_message
+      def failure_message_for_should_not
         "Matcher does not support should_not"
       end
       

data/lib/spec/matchers/matcher.rb

@@ -0,0 +1,51 @@
+module Spec
+  module Matchers
+    class Matcher
+      def initialize(name, expected=nil, &block_passed_to_init)
+        @name = name
+        @expected = expected
+        @block = block_passed_to_init
+        @messages = {
+          :description => lambda {"#{name_to_sentence} #{expected}"},
+          :failure_message_for_should => lambda {|actual| "expected #{actual} to #{name_to_sentence} #{expected}"},
+          :failure_message_for_should_not => lambda {|actual| "expected #{actual} not to #{name_to_sentence} #{expected}"}
+        }
+      end
+      
+      def matches?(actual)
+        @actual = actual
+        instance_exec @expected, &@block
+        instance_exec @actual, &@match_block
+      end
+      
+      def description(&block)
+        cache_or_call_cached(:description, &block)
+      end
+      
+      def failure_message_for_should(&block)
+        cache_or_call_cached(:failure_message_for_should, @actual, &block)
+      end
+      
+      def failure_message_for_should_not(&block)
+        cache_or_call_cached(:failure_message_for_should_not, @actual, &block)
+      end
+      
+      def match(&block)
+        @match_block = block
+      end
+      
+    private
+
+      def cache_or_call_cached(key, actual=nil, &block)
+        block ? @messages[key] = block :
+                actual.nil? ? @messages[key].call :
+                              @messages[key].call(actual)
+      end
+    
+      def name_to_sentence
+        @name_to_sentence ||= @name.to_s.gsub(/_/,' ')
+      end
+    
+    end
+  end
+end