rspec 1.2.6 → 1.2.7

data/lib/spec/example/example_methods.rb

@@ -1,10 +1,10 @@
 module Spec
   module Example
     module ExampleMethods
-      
+
       extend  Spec::Example::ModuleReopeningFix
       include Spec::Example::Subject::ExampleMethods
-      
+
       def violated(message="")
         raise Spec::Expectations::ExpectationNotMetError.new(message)
       end
@@ -21,10 +21,10 @@ module Spec
         if description = @_proxy.description || ::Spec::Matchers.generated_description
           description
         else
-          raise Spec::Example::NoDescriptionError.new("example", @_proxy.location)
+          Spec.warn Spec::Example::NoDescriptionError.message("example", @_proxy.location)
         end
       end
-      
+
       def options # :nodoc:
         @_proxy.options
       end
@@ -32,7 +32,7 @@ module Spec
       def execute(run_options, instance_variables) # :nodoc:
         run_options.reporter.example_started(@_proxy)
         set_instance_variables_from_hash(instance_variables)
-        
+
         execution_error = nil
         Timeout.timeout(run_options.timeout) do
           begin
@@ -51,12 +51,12 @@ module Spec
         run_options.reporter.example_finished(@_proxy.update(description), execution_error)
         success = execution_error.nil? || ExamplePendingError === execution_error
       end
-      
+
       module BlockAliases
         alias_method :to,     :should
         alias_method :to_not, :should_not
       end
-      
+
       # Extends the submitted block with aliases to and to_not
       # for should and should_not. Allows expectations like this:
       #
@@ -115,10 +115,10 @@ module Spec
       end
 
     private
-    
+
       include Matchers
       include Pending
-      
+
       def before_each_example
         setup_mocks_for_rspec
         run_before_each
@@ -134,7 +134,7 @@ module Spec
       def described_class
         self.class.described_class
       end
-      
+
       def description_args
         self.class.description_args
       end
@@ -142,7 +142,7 @@ module Spec
       def example_group_hierarchy
         self.class.example_group_hierarchy
       end
-      
+
     end
   end
 end

data/lib/spec/example/example_proxy.rb

@@ -7,32 +7,32 @@ module Spec
       def initialize(description=nil, options={}, location=nil) # :nodoc:
         @description, @options, @location = description, options, location
       end
-      
+
       # Optional hash passed to the example declaration
       attr_reader :options
 
       # This is the docstring passed to the <tt>it()</tt> method or any
       # of its aliases
       attr_reader :description
-      
+
       # The file and line number at which the represented example
       # was declared. This is extracted from <tt>caller</tt>, and is therefore
       # formatted as an individual line in a backtrace.
       attr_reader :location
-      
+
       # Deprecated - use location()
       def backtrace
         Spec.deprecate("ExampleProxy#backtrace","ExampleProxy#location")
         location
       end
-      
+
       # Convenience method for example group - updates the value of
       # <tt>description</tt> and returns self.
       def update(description) # :nodoc:
         @description = description
         self
       end
-      
+
       def ==(other) # :nodoc:
         (other.description == description) & (other.location == location)
       end

data/lib/spec/example/module_reopening_fix.rb

@@ -2,23 +2,23 @@ module Spec
   module Example
     # When you reopen a module that is included in another module that is included in a class,
     # the new material you define does not make it to the class. This fixes that.
-    # 
+    #
     # == Example
-    # 
+    #
     #   module M1; end
-    # 
+    #
     #   module M2
     #     def foo; "FOO"; end
     #   end
-    # 
+    #
     #   class C
     #     include M1
     #   end
-    # 
+    #
     #   module M1
     #     include M2
     #   end
-    # 
+    #
     #   c = C.new
     #   c.foo
     #   NoMethodError: undefined method `foo' for #<C:0x5e89a4>
@@ -40,4 +40,4 @@ module Spec
       end
     end
   end
-end
+end

data/lib/spec/example/pending.rb

@@ -1,5 +1,5 @@
 module Spec
-  module Example      
+  module Example
     module Pending
       def pending(message = "TODO")
         if block_given?

data/lib/spec/example/predicate_matchers.rb

@@ -44,4 +44,3 @@ module Spec
     end
   end
 end
-

data/lib/spec/example/shared_example_group.rb

@@ -7,7 +7,7 @@ module Spec
           shared_example_groups << new_example_group unless already_registered?(new_example_group)
           new_example_group
         end
-        
+
         def find(example_group_description)
           shared_example_groups.find {|b| b.description == example_group_description}
         end
@@ -15,21 +15,21 @@ module Spec
         def clear
           shared_example_groups.clear
         end
-        
+
         def include?(group)
           shared_example_groups.include?(group)
         end
-        
+
         def count
           shared_example_groups.length
         end
 
       private
-      
+
         def shared_example_groups
           @shared_example_groups ||= []
         end
-      
+
         def already_registered?(new_example_group)
           existing_example_group = find(new_example_group.description)
           return false unless existing_example_group

data/lib/spec/example/subject.rb

@@ -18,11 +18,11 @@ module Spec
           block.nil? ?
             explicit_subject || implicit_subject : @explicit_subject_block = block
         end
-        
+
         attr_reader :explicit_subject_block # :nodoc:
-        
+
       private
-      
+
         def explicit_subject
           group = self
           while group.respond_to?(:explicit_subject_block)
@@ -30,13 +30,17 @@ module Spec
             group = group.superclass
           end
         end
-        
+
         def implicit_subject
           (described_class ? lambda {described_class.new} : lambda {description_args.first})
         end
       end
-      
+
       module ExampleMethods
+
+        alias_method :__should_for_example_group__,     :should
+        alias_method :__should_not_for_example_group__, :should_not
+
         # Returns the subject defined in ExampleGroupMethods#subject. The
         # subject block is only executed once per example, the result of which
         # is cached and returned by any subsequent calls to +subject+.
@@ -76,11 +80,7 @@ module Spec
         #     it { should be_eligible_to_vote }
         #   end
         def should(matcher=nil)
-          if matcher
-            subject.should(matcher)
-          else
-            subject.should
-          end
+          self == subject ? self.__should_for_example_group__(matcher) : subject.should(matcher)
         end
 
         # Just like +should+, +should_not+ delegates to the subject (implicit or
@@ -92,13 +92,9 @@ module Spec
         #     it { should_not be_eligible_to_vote }
         #   end
         def should_not(matcher=nil)
-          if matcher
-            subject.should_not(matcher)
-          else
-            subject.should_not
-          end
+          self == subject ? self.__should_not_for_example_group__(matcher) : subject.should_not(matcher)
         end
       end
     end
   end
-end
+end

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

@@ -26,7 +26,7 @@ module Kernel
   def should(matcher=nil, &block)
     Spec::Expectations::PositiveExpectationHandler.handle_matcher(self, matcher, &block)
   end
-
+  
   # :call-seq:
   #   should_not(matcher)
   #   should_not == expected

data/lib/spec/expectations/fail_with.rb

@@ -9,6 +9,10 @@ module Spec
       # <code>expected</code> and <code>target</code>, passes them
       # to the differ to append a diff message to the failure message.
       def fail_with(message, expected=nil, target=nil) # :nodoc:
+        if message.nil?
+          raise ArgumentError, "Failure message is nil. Does your matcher define the " +
+                               "appropriate failure_message_for_* method to return a string?"
+        end
         if (Array === message) & (message.length == 3)
           ::Spec.warn(<<-NOTICE
 

data/lib/spec/matchers/generated_descriptions.rb

@@ -1,19 +1,7 @@
 module Spec
   module Matchers
-    def self.last_matcher
-      @last_matcher
-    end
-
-    def self.last_matcher=(last_matcher)
-      @last_matcher = last_matcher
-    end
-
-    def self.last_should
-      @last_should
-    end
-
-    def self.last_should=(last_should)
-      @last_should = last_should
+    class << self
+      attr_accessor :last_matcher, :last_should # :nodoc:
     end
 
     def self.clear_generated_description
@@ -26,7 +14,7 @@ module Spec
       "#{last_should.to_s.gsub('_',' ')} #{last_description}"
     end
     
-    private
+  private
     
     def self.last_description
       last_matcher.respond_to?(:description) ? last_matcher.description : <<-MESSAGE
@@ -38,7 +26,7 @@ or this:
 
 it { should matcher }
 
-the runner expects the matcher to have a #description method. You should either
+RSpec expects the matcher to have a #description method. You should either
 add a String to the example this matcher is being used in, or give it a
 description method. Then you won't have to suffer this lengthy warning again.
 MESSAGE

data/lib/spec/matchers/match.rb

@@ -1,18 +1,19 @@
 module Spec
   module Matchers
     # :call-seq:
-    #   should match(regexp)
-    #   should_not match(regexp)
+    #   should match(pattern)
+    #   should_not match(pattern)
     #
-    # Given a Regexp, passes if actual =~ regexp
+    # Given a Regexp or String, passes if actual.match(pattern)
     #
     # == Examples
     #
     #   email.should match(/^([^\s]+)((?:[-a-z0-9]+\.)+[a-z]{2,})$/i)
+    #   email.should match("@example.com")
     def match(expected)
       Matcher.new :match, expected do |_expected_|
         match do |actual|
-          actual =~ _expected_
+          actual.match(_expected_)
         end
       end
     end

data/lib/spec/matchers/matcher.rb

@@ -8,18 +8,19 @@ module Spec
       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.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}"}
         }
+        making_declared_methods_public do
+          instance_exec(*@expected, &declarations)
+        end
       end
       
       def matches?(actual)
         @actual = actual
-        instance_exec(*@expected, &@declarations)
         instance_exec(@actual,    &@match_block)
       end
       
@@ -46,9 +47,26 @@ module Spec
       def diffable
         @diffable = true
       end
-      
+            
     private
 
+      def making_declared_methods_public # :nodoc:
+        # Our home-grown instance_exec in ruby 1.8.6 results in any methods
+        # declared in the block eval'd by instance_exec in the block to which we
+        # are yielding here are scoped private. This is NOT the case for Ruby
+        # 1.8.7 or 1.9.
+        # 
+        # Also, due some crazy scoping that I don't understand, these methods
+        # are actually available in the specs (something about the matcher being
+        # defined in the scope of Spec::Matchers or within an example), so not
+        # doing the following will not cause specs to fail, but they *will*
+        # cause features to fail and that will make users unhappy. So don't.
+        orig_private_methods = private_methods
+        yield
+        st = (class << self; self; end)
+        (private_methods - orig_private_methods).each {|m| st.__send__ :public, m}
+      end
+
       def cache_or_call_cached(key, actual=nil, &block)
         block ? @messages[key] = block : 
                 actual.nil? ? @messages[key].call : @messages[key].call(actual)

data/lib/spec/matchers/operator_matcher.rb

@@ -68,7 +68,7 @@ module Spec
 
     class NegativeOperatorMatcher < OperatorMatcher #:nodoc:
       def __delegate_operator(actual, operator, expected)
-        return true unless actual.__send__(operator, expected)
+        return false unless actual.__send__(operator, expected)
         return fail_with_message("expected not: #{operator} #{expected.inspect},\n         got: #{operator.gsub(/./, ' ')} #{actual.inspect}")
       end
 

data/lib/spec/mocks/errors.rb

@@ -1,6 +1,6 @@
 module Spec
   module Mocks
-    class MockExpectationError < StandardError
+    class MockExpectationError < Exception
     end
     
     class AmbiguousReturnError < StandardError

data/lib/spec/mocks/message_expectation.rb

@@ -8,7 +8,7 @@ module Spec
       attr_accessor :error_generator
       protected :error_generator, :error_generator=
       
-      def initialize(error_generator, expectation_ordering, expected_from, sym, method_block, expected_received_count=1, opts={})
+      def initialize(error_generator, expectation_ordering, expected_from, sym, method_block, expected_received_count=1, opts={}, &implementation)
         @error_generator = error_generator
         @error_generator.opts = opts
         @expected_from = expected_from
@@ -27,6 +27,7 @@ module Spec
         @args_to_yield = []
         @failed_fast = nil
         @args_to_yield_were_cloned = false
+        @return_block = implementation
       end
       
       def build_child(expected_from, method_block, expected_received_count, opts={})
@@ -167,7 +168,7 @@ module Spec
         # Ruby 1.9 - when we set @return_block to return values
         # regardless of arguments, any arguments will result in
         # a "wrong number of arguments" error
-        @return_block.arity > 0 ? @return_block.call(*args) : @return_block.call()
+        @return_block.arity == 0 ? @return_block.call : @return_block.call(*args)
       end
       
       def clone_args_to_yield(args)

data/lib/spec/mocks/methods.rb

@@ -9,21 +9,24 @@ module Spec
         __mock_proxy.add_negative_message_expectation(caller(1)[0], sym.to_sym, &block)
       end
       
-      def stub!(sym_or_hash, opts={})
+      def stub!(sym_or_hash, opts={}, &block)
         if Hash === sym_or_hash
           sym_or_hash.each {|method, value| stub!(method).and_return value }
         else
-          __mock_proxy.add_stub(caller(1)[0], sym_or_hash.to_sym, opts)
+          __mock_proxy.add_stub(caller(1)[0], sym_or_hash.to_sym, opts, &block)
         end
       end
       
       alias_method :stub, :stub!
 
       def stub_chain(*methods)
-        while methods.length > 1
-          stub!(methods.shift).and_return(self)
+        if methods.length > 1
+          next_in_chain = Object.new
+          stub!(methods.shift) {next_in_chain}
+          next_in_chain.stub_chain(*methods)
+        else
+          stub!(methods.shift)
         end
-        stub!(methods.shift)
       end
       
       def received_message?(sym, *args, &block) #:nodoc: