rspec 1.2.0 → 1.2.1

data/lib/spec/matchers/dsl.rb

@@ -0,0 +1,15 @@
+module Spec
+  module Matchers
+    module DSL
+      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::Matchers::DSL
+
+      

data/lib/spec/matchers/have.rb

@@ -4,6 +4,7 @@ module Spec
       def initialize(expected, relativity=:exactly)
         @expected = (expected == :no ? 0 : expected)
         @relativity = relativity
+        @actual = nil
       end
     
       def relativities
@@ -24,12 +25,12 @@ module Spec
         else
           collection_owner.__send__(@collection_name, *@args, &@block)
         end
-        @given = collection.size if collection.respond_to?(:size)
-        @given = collection.length if collection.respond_to?(:length)
-        raise not_a_collection if @given.nil?
-        return @given >= @expected if @relativity == :at_least
-        return @given <= @expected if @relativity == :at_most
-        return @given == @expected
+        @actual = collection.size if collection.respond_to?(:size)
+        @actual = collection.length if collection.respond_to?(:length)
+        raise not_a_collection if @actual.nil?
+        return @actual >= @expected if @relativity == :at_least
+        return @actual <= @expected if @relativity == :at_most
+        return @actual == @expected
       end
       
       def not_a_collection
@@ -37,12 +38,12 @@ module Spec
       end
     
       def failure_message_for_should
-        "expected #{relative_expectation} #{@collection_name}, got #{@given}"
+        "expected #{relative_expectation} #{@collection_name}, got #{@actual}"
       end
 
       def failure_message_for_should_not
         if @relativity == :exactly
-          return "expected target not to have #{@expected} #{@collection_name}, got #{@given}"
+          return "expected target not to have #{@expected} #{@collection_name}, got #{@actual}"
         elsif @relativity == :at_most
           return <<-EOF
 Isn't life confusing enough?

data/lib/spec/matchers/include.rb

@@ -1,8 +1,8 @@
 module Spec
   module Matchers
-
     class Include #:nodoc:
-      
+      include Spec::Matchers::Pretty
+
       def initialize(*expecteds)
         @expecteds = expecteds
       end
@@ -41,20 +41,6 @@ module Spec
         def _message(maybe_not="")
           "expected #{@actual.inspect} #{maybe_not}to include #{_pretty_print(@expecteds)}"
         end
-        
-        def _pretty_print(array)
-          result = ""
-          array.each_with_index do |item, index|
-            if index < (array.length - 2)
-              result << "#{item.inspect}, "
-            elsif index < (array.length - 1)
-              result << "#{item.inspect} and "
-            else
-              result << "#{item.inspect}"
-            end
-          end
-          result
-        end
     end
 
     # :call-seq:

data/lib/spec/matchers/match_array.rb

@@ -2,7 +2,8 @@ module Spec
   module Matchers
 
     class MatchArray #:nodoc:
-
+      include Spec::Matchers::Pretty
+      
       def initialize(expected)
         @expected = expected
       end
@@ -42,19 +43,6 @@ module Spec
           difference
         end
 
-        def _pretty_print(array)
-          result = ""
-          array.each_with_index do |item, index|
-            if index < (array.length - 2)
-              result << "#{item.inspect}, "
-            elsif index < (array.length - 1)
-              result << "#{item.inspect} and "
-            else
-              result << "#{item.inspect}"
-            end
-          end
-          result
-        end
 
     end
 

data/lib/spec/matchers/matcher.rb

@@ -1,21 +1,23 @@
 module Spec
   module Matchers
     class Matcher
-      def initialize(name, expected=nil, &block_passed_to_init)
+      include Spec::Matchers::Pretty
+      
+      def initialize(name, *expected, &declarations)
         @name = name
         @expected = expected
-        @block = block_passed_to_init
+        @declarations = declarations
         @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}"}
+          :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}"}
         }
       end
       
       def matches?(actual)
         @actual = actual
-        instance_exec @expected, &@block
-        instance_exec @actual, &@match_block
+        instance_exec(*@expected, &@declarations)
+        instance_exec(@actual,    &@match_block)
       end
       
       def description(&block)
@@ -37,13 +39,16 @@ module Spec
     private
 
       def cache_or_call_cached(key, actual=nil, &block)
-        block ? @messages[key] = block :
-                actual.nil? ? @messages[key].call :
-                              @messages[key].call(actual)
+        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(/_/,' ')
+        split_words(@name)
+      end
+      
+      def expected_to_sentence
+        to_sentence(@expected)
       end
     
     end

data/lib/spec/matchers/pretty.rb

@@ -0,0 +1,36 @@
+module Spec
+  module Matchers
+    module Pretty
+      def split_words(sym)
+        sym.to_s.gsub(/_/,' ')
+      end
+
+      def to_sentence(words)
+        case words.length
+          when 0
+            ""
+          when 1
+            " #{words[0]}"
+          when 2
+            " #{words[0]} and #{words[1]}"
+          else
+            " #{words[0...-1].join(', ')}, and #{words[-1]}"
+        end
+      end
+
+      def _pretty_print(array)
+        result = ""
+        array.each_with_index do |item, index|
+          if index < (array.length - 2)
+            result << "#{item.inspect}, "
+          elsif index < (array.length - 1)
+            result << "#{item.inspect} and "
+          else
+            result << "#{item.inspect}"
+          end
+        end
+        result
+      end
+    end
+  end
+end

data/lib/spec/matchers/raise_error.rb

@@ -3,6 +3,7 @@ module Spec
     class RaiseError #:nodoc:
       def initialize(expected_error_or_message=Exception, expected_message=nil, &block)
         @block = block
+        @actual_error = nil
         case expected_error_or_message
         when String, Regexp
           @expected_error, @expected_message = Exception, expected_error_or_message
@@ -18,10 +19,10 @@ module Spec
         @eval_block_passed = false
         begin
           given_proc.call
-        rescue @expected_error => @given_error
+        rescue @expected_error => @actual_error
           @raised_expected_error = true
           @with_expected_message = verify_message
-        rescue Exception => @given_error
+        rescue Exception => @actual_error
           # This clause should be empty, but rcov will not report it as covered
           # unless something (anything) is executed within the clause
           rcov_error_report = "http://eigenclass.org/hiki.rb?rcov-0.8.0"
@@ -37,10 +38,10 @@ module Spec
       def eval_block
         @eval_block = true
         begin
-          @block[@given_error]
+          @block[@actual_error]
           @eval_block_passed = true
         rescue Exception => err
-          @given_error = err
+          @actual_error = err
         end
       end
 
@@ -49,14 +50,14 @@ module Spec
         when nil
           true
         when Regexp
-          @expected_message =~ @given_error.message
+          @expected_message =~ @actual_error.message
         else
-          @expected_message == @given_error.message
+          @expected_message == @actual_error.message
         end
       end
       
       def failure_message_for_should
-        @eval_block ? @given_error.message : "expected #{expected_error}#{given_error}"
+        @eval_block ? @actual_error.message : "expected #{expected_error}#{given_error}"
       end
 
       def failure_message_for_should_not
@@ -80,7 +81,7 @@ module Spec
         end
 
         def given_error
-          @given_error.nil? ? " but nothing was raised" : ", got #{@given_error.inspect}"
+          @actual_error.nil? ? " but nothing was raised" : ", got #{@actual_error.inspect}"
         end
         
         def negative_expectation?

data/lib/spec/matchers/simple_matcher.rb

@@ -6,6 +6,7 @@ module Spec
       def initialize(description, &match_block)
         @description = description
         @match_block = match_block
+        @failure_message = @negative_failure_message = nil
       end
 
       def matches?(given)

data/lib/spec/matchers/throw_symbol.rb

@@ -5,7 +5,7 @@ module Spec
       def initialize(expected_symbol = nil, expected_arg=nil)
         @expected_symbol = expected_symbol
         @expected_arg = expected_arg
-        @caught_symbol = nil
+        @caught_symbol = @caught_arg = nil
       end
       
       def matches?(given_proc)

data/lib/spec/mocks/argument_expectation.rb

@@ -7,6 +7,8 @@ module Spec
       def initialize(args, &block)
         @args = args
         @matchers_block = block
+        @match_any_args = false
+        @matchers = nil
         
         if ArgumentMatchers::AnyArgsMatcher === args.first
           @match_any_args = true

data/lib/spec/mocks/message_expectation.rb

@@ -25,6 +25,8 @@ module Spec
         @at_least = nil
         @at_most = nil
         @args_to_yield = []
+        @failed_fast = nil
+        @args_to_yield_were_cloned = false
       end
       
       def build_child(expected_from, method_block, expected_received_count, opts={})

data/lib/spec/mocks/proxy.rb

@@ -25,6 +25,7 @@ module Spec
         @stubs = []
         @proxied_methods = []
         @options = options ? DEFAULT_OPTIONS.dup.merge(options) : DEFAULT_OPTIONS
+        @already_proxied_respond_to = false
       end
 
       def null_object?
@@ -128,8 +129,8 @@ module Spec
       end
       
       def define_expected_method(sym)
-        visibility_string = "#{visibility(sym)} :#{sym}"
         unless @proxied_methods.include?(sym)
+          visibility_string = "#{visibility(sym)} :#{sym}"
           if target_responds_to?(sym)
             munged_sym = munge(sym)
             target_metaclass.instance_eval do
@@ -137,14 +138,13 @@ module Spec
             end
             @proxied_methods << sym
           end
+          target_metaclass.class_eval(<<-EOF, __FILE__, __LINE__)
+            def #{sym}(*args, &block)
+              __mock_proxy.message_received :#{sym}, *args, &block
+            end
+            #{visibility_string}
+          EOF
         end
-
-        target_metaclass.class_eval(<<-EOF, __FILE__, __LINE__)
-          def #{sym}(*args, &block)
-            __mock_proxy.message_received :#{sym}, *args, &block
-          end
-          #{visibility_string}
-        EOF
       end
 
       def target_responds_to?(sym)
@@ -195,11 +195,10 @@ module Spec
         @proxied_methods.each do |sym|
           munged_sym = munge(sym)
           target_metaclass.instance_eval do
+            remove_method sym
             if method_defined?(munged_sym)
               alias_method sym, munged_sym
               remove_method munged_sym
-            else
-              remove_method sym
             end
           end
         end

data/lib/spec/runner.rb

@@ -8,6 +8,7 @@ require 'spec/runner/backtrace_tweaker'
 require 'spec/runner/reporter'
 require 'spec/runner/spec_parser'
 require 'spec/runner/class_and_arguments_parser'
+require 'spec/runner/extensions/kernel'
 
 module Spec
   module Runner

data/lib/spec/runner/extensions/kernel.rb

@@ -0,0 +1,9 @@
+module Kernel
+  unless respond_to?(:debugger)
+    # Start a debugging session if ruby-debug is loaded with the -u/--debugger option
+    def debugger(steps=1)
+      # If not then just comment and proceed
+      $stderr.puts "debugger statement ignored, use -u or --debugger option on rspec to enable debugging"
+    end
+  end
+end

data/lib/spec/runner/formatter/base_formatter.rb

@@ -1,7 +1,9 @@
 module Spec
   module Runner
     module Formatter
-      # Baseclass for formatters that implements all required methods as no-ops. 
+      # Formatter base-class, which implements all required methods.
+      # Almost all of the implementations are no-ops, with the exception
+      # of +add_example_group+ (see below).
       class BaseFormatter
         attr_accessor :example_group, :options, :where
         def initialize(options, where)
@@ -19,26 +21,35 @@ module Spec
         end
 
         # This method is invoked at the beginning of the execution of each example_group.
-        # +example_group+ is the example_group.
+        # +example_group_proxy+ is an instance of Spec::Example::ExampleGroupProxy, and
+        # is assigned as the value returned by subsequent calls to +example_group()+
         #
-        # The next method to be invoked after this is #example_failed or #example_finished
-        def add_example_group(example_group)
-          @example_group = example_group
+        # The next method to be invoked after this is #example_started
+        def add_example_group(example_group_proxy)
+          @example_group = example_group_proxy
         end
 
         # This method is invoked when an +example+ starts.
-        def example_started(example)
+        # +example_proxy+ is an instance of Spec::Example::ExampleProxy
+        #
+        # The next method to be invoked after this is #example_passed, #example_failed,
+        # or #example_pending
+        def example_started(example_proxy)
         end
 
         # This method is invoked when an +example+ passes.
-        def example_passed(example)
+        # +example_proxy+ is the same instance of Spec::Example::ExampleProxy
+        # that was passed to example_started
+        def example_passed(example_proxy)
         end
 
         # This method is invoked when an +example+ fails, i.e. an exception occurred
         # inside it (such as a failed should or other exception). +counter+ is the 
         # sequence number of the failure (starting at 1) and +failure+ is the associated 
         # Failure object.
-        def example_failed(example, counter, failure)
+        # +example_proxy+ is the same instance of Spec::Example::ExampleProxy
+        # that was passed to example_started
+        def example_failed(example_proxy, counter, failure)
         end
         
         # This method is invoked when an example is not yet implemented (i.e. has not
@@ -47,7 +58,9 @@ module Spec
         # default value of "Not Yet Implemented"
         # +pending_caller+ is the file and line number of the spec which
         # has called the pending method
-        def example_pending(example, message, pending_caller)
+        # +example_proxy+ is the same instance of Spec::Example::ExampleProxy
+        # that was passed to example_started
+        def example_pending(example_proxy, message, pending_caller)
         end
 
         # This method is invoked after all of the examples have executed. The next method

data/lib/spec/runner/formatter/html_formatter.rb

@@ -11,6 +11,7 @@ module Spec
           super
           @example_group_number = 0
           @example_number = 0
+          @header_red = nil
         end
         
         def method_missing(sym, *args)
@@ -172,7 +173,7 @@ EOF
 
 <div id="rspec-header">
   <div id="label">
-    <h1>RSpec Results</h1>
+    <h1>RSpec Code Examples</h1>
   </div>
 
   <div id="summary">