rspec-mocks 2.0.0.beta.19 → 2.0.0.beta.20

data/.gitignore

@@ -7,3 +7,4 @@ doc
 tmp
 rerun.txt
 Gemfile.lock
+.bundle

data/Rakefile

@@ -19,13 +19,6 @@ begin
     gem.rubyforge_project = "rspec"
     gem.add_development_dependency 'rspec-core', RSpec::Mocks::Version::STRING
     gem.add_development_dependency 'rspec-expectations', RSpec::Mocks::Version::STRING
-    gem.post_install_message = <<-EOM
-#{"*"*50}
-
-  Thank you for installing #{gem.summary}
-  
-#{"*"*50}
-EOM
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.19
+2.0.0.beta.20

data/lib/rspec/mocks/argument_expectation.rb

@@ -1,10 +1,9 @@
 module RSpec
   module Mocks
-    
     class ArgumentExpectation
       attr_reader :args
       
-      def initialize(args, &block)
+      def initialize(*args, &block)
         @args = args
         @matchers_block = block if args.empty?
         @match_any_args = false
@@ -29,23 +28,21 @@ module RSpec
         return obj.respond_to?(:matches?) & obj.respond_to?(:description)
       end
       
-      def args_match?(given_args)
-        match_any_args? || matchers_block_matches?(given_args) || matchers_match?(given_args)
+      def args_match?(*args)
+        match_any_args? || matchers_block_matches?(*args) || matchers_match?(*args)
       end
       
-      def matchers_block_matches?(given_args)
-        @matchers_block ? @matchers_block.call(*given_args) : nil
+      def matchers_block_matches?(*args)
+        @matchers_block ? @matchers_block.call(*args) : nil
       end
       
-      def matchers_match?(given_args)
-        @matchers == given_args
+      def matchers_match?(*args)
+        @matchers == args
       end
       
       def match_any_args?
         @match_any_args
       end
-      
     end
-    
   end
 end

data/lib/rspec/mocks/extensions/instance_exec.rb

@@ -15,14 +15,14 @@ module RSpec
             orig_critical, Thread.critical = Thread.critical, true
             n = 0
             n += 1 while respond_to?(method_name="__instance_exec#{n}")
-            singleton_class.module_eval{ define_method(:__instance_exec, &block) }
+            singleton_class.module_eval{ define_method(method_name, &block) }
           ensure
             Thread.critical = orig_critical
           end
           begin
-            return send(:__instance_exec, *args)
+            return send(method_name, *args)
           ensure
-            singleton_class.module_eval{ remove_method(:__instance_exec) } rescue nil
+            singleton_class.module_eval{ remove_method(method_name) } rescue nil
           end
         end
       end

data/lib/rspec/mocks/message_expectation.rb

@@ -17,7 +17,7 @@ module RSpec
         @return_block = nil
         @actual_received_count = 0
         @expected_received_count = expected_received_count
-        @args_expectation = ArgumentExpectation.new([ArgumentMatchers::AnyArgsMatcher.new])
+        @args_expectation = ArgumentExpectation.new(ArgumentMatchers::AnyArgsMatcher.new)
         @consecutive = false
         @exception_to_raise = nil
         @symbol_to_throw = nil
@@ -40,7 +40,7 @@ module RSpec
         new_gen = error_generator.clone
         new_gen.opts = opts
         child.error_generator = new_gen
-        child.clone_args_to_yield @args_to_yield
+        child.clone_args_to_yield *@args_to_yield
         child
       end
       
@@ -97,15 +97,15 @@ module RSpec
         self
       end
       
-      def matches(sym, args)
-        @sym == sym and @args_expectation.args_match?(args)
+      def matches?(sym, *args)
+        @sym == sym and @args_expectation.args_match?(*args)
       end
       
-      def invoke(args, block)
+      def invoke(*args, &block)
         if @expected_received_count == 0
           @failed_fast = true
           @actual_received_count += 1
-          @error_generator.raise_expectation_error @sym, @expected_received_count, @actual_received_count, *args
+          @error_generator.raise_expectation_error(@sym, @expected_received_count, @actual_received_count, *args)
         end
         
         @order_group.handle_order_constraint self
@@ -114,20 +114,20 @@ module RSpec
           Kernel::raise @exception_to_raise unless @exception_to_raise.nil?
           Kernel::throw @symbol_to_throw unless @symbol_to_throw.nil?
           
-          if !@method_block.nil?
-            default_return_val = invoke_method_block(args)
-          elsif @args_to_yield.size > 0 || @eval_context
-            default_return_val = invoke_with_yield(&block)
-          else
-            default_return_val = nil
-          end
+          default_return_val = if !@method_block.nil?
+                                 invoke_method_block(*args)
+                               elsif !@args_to_yield.empty? || @eval_context
+                                 invoke_with_yield(&block)
+                               else
+                                 nil
+                               end
           
           if @consecutive
-            return invoke_consecutive_return_block(args, block)
+            invoke_consecutive_return_block(*args, &block)
           elsif @return_block
-            return invoke_return_block(args, block)
+            invoke_return_block(*args, &block)
           else
-            return default_return_val
+            default_return_val
           end
         ensure
           @actual_received_count += 1
@@ -141,11 +141,11 @@ module RSpec
       
       protected
 
-      def invoke_method_block(args)
+      def invoke_method_block(*args)
         begin
           @method_block.call(*args)
         rescue => detail
-          @error_generator.raise_block_failed_error @sym, detail.message
+          @error_generator.raise_block_failed_error(@sym, detail.message)
         end
       end
       
@@ -171,13 +171,13 @@ module RSpec
         end
       end
 
-      def invoke_consecutive_return_block(args, block)
-        value = invoke_return_block(args, block)
+      def invoke_consecutive_return_block(*args, &block)
+        value = invoke_return_block(*args, &block)
         index = [@actual_received_count, value.size-1].min
         value[index]
       end
       
-      def invoke_return_block(args, block)
+      def invoke_return_block(*args, &block)
         args << block unless block.nil?
         # Ruby 1.9 - when we set @return_block to return values
         # regardless of arguments, any arguments will result in
@@ -185,7 +185,7 @@ module RSpec
         @return_block.arity == 0 ? @return_block.call : @return_block.call(*args)
       end
       
-      def clone_args_to_yield(args)
+      def clone_args_to_yield(*args)
         @args_to_yield = args.clone
         @args_to_yield_were_cloned = true
       end
@@ -197,8 +197,8 @@ module RSpec
     
     class MessageExpectation < BaseExpectation
       
-      def matches_name_but_not_args(sym, args)
-        @sym == sym and not @args_expectation.args_match?(args)
+      def matches_name_but_not_args(sym, *args)
+        @sym == sym and not @args_expectation.args_match?(*args)
       end
        
       def verify_messages_received
@@ -235,7 +235,7 @@ module RSpec
         @similar_messages ||= []
       end
 
-      def advise(args, block)
+      def advise(*args)
         similar_messages << args
       end
       
@@ -249,7 +249,7 @@ module RSpec
 
       def with(*args, &block)
         @return_block = block if block_given?
-        @args_expectation = ArgumentExpectation.new(args, &block)
+        @args_expectation = ArgumentExpectation.new(*args, &block)
         self
       end
       

data/lib/rspec/mocks/methods.rb

@@ -23,14 +23,30 @@ module RSpec
       
       alias_method :stub!, :stub
       alias_method :unstub!, :unstub
-
-      def stub_chain(*methods)
+      
+      # :call-seq:
+      #   double.stub_chain("foo.bar") { :baz }
+      #   double.stub_chain(:foo, :bar) { :baz }
+      #
+      # Stubs a chain of methods. Especially useful with fluent and/or
+      # composable interfaces.
+      #
+      # == Examples
+      #
+      #   Article.stub_chain("recent.published") { [Article.new] }
+      def stub_chain(*chain)
+        methods = chain.join('.').split('.')
         if methods.length > 1
-          next_in_chain = Object.new
-          stub!(methods.shift) {next_in_chain}
-          next_in_chain.stub_chain(*methods)
+          if matching_stub = __mock_proxy.__send__(:find_matching_method_stub, methods[0].to_sym)
+            methods.shift
+            matching_stub.invoke.stub_chain(*methods)
+          else
+            next_in_chain = Object.new
+            stub(methods.shift) { next_in_chain }
+            next_in_chain.stub_chain(*methods)
+          end
         else
-          stub!(methods.shift)
+          stub(methods.shift)
         end
       end
       

data/lib/rspec/mocks/mock.rb

@@ -37,12 +37,12 @@ module RSpec
     private
 
       def method_missing(sym, *args, &block)
-        __mock_proxy.record_message_received(sym, args, block)
+        __mock_proxy.record_message_received(sym, *args, &block)
         begin
           return self if __mock_proxy.null_object?
-          super(sym, *args, &block)
+          super
         rescue NameError
-          __mock_proxy.raise_unexpected_message_error sym, *args
+          __mock_proxy.raise_unexpected_message_error(sym, *args)
         end
       end
 

data/lib/rspec/mocks/proxy.rb

@@ -87,7 +87,7 @@ module RSpec
         method_double[method_name].expectations.detect {|expectation| expectation.negative_expectation_for?(method_name)}
       end
       
-      def record_message_received(method_name, args, block)
+      def record_message_received(method_name, *args, &block)
         @messages_received << [method_name, args, block]
       end
 
@@ -97,18 +97,18 @@ module RSpec
 
         if (stub && expectation && expectation.called_max_times?) || (stub && !expectation)
           if expectation = find_almost_matching_expectation(method_name, *args)
-            expectation.advise(args, block) unless expectation.expected_messages_received?
+            expectation.advise(*args) unless expectation.expected_messages_received?
           end
-          stub.invoke(args, block)
+          stub.invoke(*args, &block)
         elsif expectation
-          expectation.invoke(args, block)
+          expectation.invoke(*args, &block)
         elsif expectation = find_almost_matching_expectation(method_name, *args)
-          expectation.advise(args, block) if null_object? unless expectation.expected_messages_received?
+          expectation.advise(*args) if null_object? unless expectation.expected_messages_received?
           raise_unexpected_message_args_error(expectation, *args) unless (has_negative_expectation?(method_name) or null_object?)
         elsif @object.is_a?(Class)
           @object.superclass.send(method_name, *args, &block)
         else
-          @object.__send__ :method_missing, method_name, *args, &block
+          @object.__send__(:method_missing, method_name, *args, &block)
         end
       end
 
@@ -133,16 +133,16 @@ module RSpec
       end
       
       def find_matching_expectation(method_name, *args)
-        method_double[method_name].expectations.find {|expectation| expectation.matches(method_name, args) && !expectation.called_max_times?} || 
-        method_double[method_name].expectations.find {|expectation| expectation.matches(method_name, args)}
+        method_double[method_name].expectations.find {|expectation| expectation.matches?(method_name, *args) && !expectation.called_max_times?} || 
+        method_double[method_name].expectations.find {|expectation| expectation.matches?(method_name, *args)}
       end
 
       def find_almost_matching_expectation(method_name, *args)
-        method_double[method_name].expectations.find {|expectation| expectation.matches_name_but_not_args(method_name, args)}
+        method_double[method_name].expectations.find {|expectation| expectation.matches_name_but_not_args(method_name, *args)}
       end
 
       def find_matching_method_stub(method_name, *args)
-        method_double[method_name].stubs.find {|stub| stub.matches(method_name, args)}
+        method_double[method_name].stubs.find {|stub| stub.matches?(method_name, *args)}
       end
 
     end

data/rspec-mocks.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-mocks}
-  s.version = "2.0.0.beta.19"
+  s.version = "2.0.0.beta.20"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-07-25}
+  s.date = %q{2010-08-24}
   s.description = %q{RSpec's 'test double' framework, with support for stubbing and mocking}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -99,17 +99,11 @@ Gem::Specification.new do |s|
      "specs.watchr"
   ]
   s.homepage = %q{http://github.com/rspec/mocks}
-  s.post_install_message = %q{**************************************************
-
-  Thank you for installing rspec-mocks-2.0.0.beta.19
-  
-**************************************************
-}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{rspec-mocks-2.0.0.beta.19}
+  s.summary = %q{rspec-mocks-2.0.0.beta.20}
   s.test_files = [
     "spec/rspec/mocks/and_yield_spec.rb",
      "spec/rspec/mocks/any_number_of_times_spec.rb",
@@ -162,15 +156,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec-core>, ["= 2.0.0.beta.19"])
-      s.add_development_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.19"])
+      s.add_development_dependency(%q<rspec-core>, ["= 2.0.0.beta.20"])
+      s.add_development_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.20"])
     else
-      s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.19"])
-      s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.19"])
+      s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.20"])
+      s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.20"])
     end
   else
-    s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.19"])
-    s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.19"])
+    s.add_dependency(%q<rspec-core>, ["= 2.0.0.beta.20"])
+    s.add_dependency(%q<rspec-expectations>, ["= 2.0.0.beta.20"])
   end
 end
 

data/spec/rspec/mocks/any_number_of_times_spec.rb

@@ -8,23 +8,23 @@ module RSpec
         @mock = RSpec::Mocks::Mock.new("test mock")
       end
 
-      it "should pass if any number of times method is called many times" do
+      it "passes if any number of times method is called many times" do
         @mock.should_receive(:random_call).any_number_of_times
         (1..10).each do
           @mock.random_call
         end
       end
 
-      it "should pass if any number of times method is called once" do
+      it "passes if any number of times method is called once" do
         @mock.should_receive(:random_call).any_number_of_times
         @mock.random_call
       end
       
-      it "should pass if any number of times method is not called" do
+      it "passes if any number of times method is not called" do
         @mock.should_receive(:random_call).any_number_of_times
       end
 
-      it "should return the mocked value when called after a similar stub" do
+      it "returns the mocked value when called after a similar stub" do
         @mock.stub(:message).and_return :stub_value
         @mock.should_receive(:message).any_number_of_times.and_return(:mock_value)
         @mock.message.should == :mock_value

data/spec/rspec/mocks/argument_expectation_spec.rb

@@ -3,16 +3,16 @@ require 'spec_helper'
 module RSpec
   module Mocks
     describe ArgumentExpectation do
-      it "should consider an object that responds to #matches? and #description to be a matcher" do
-        argument_expecatation = RSpec::Mocks::ArgumentExpectation.new([])
+      it "considers an object that responds to #matches? and #description to be a matcher" do
+        argument_expecatation = RSpec::Mocks::ArgumentExpectation.new
         obj = double("matcher")
         obj.should_receive(:respond_to?).with(:matches?).and_return(true)
         obj.should_receive(:respond_to?).with(:description).and_return(true)
         argument_expecatation.is_matcher?(obj).should be_true
       end
 
-      it "should NOT consider an object that only responds to #matches? to be a matcher" do
-        argument_expecatation = RSpec::Mocks::ArgumentExpectation.new([])
+      it "does NOT consider an object that only responds to #matches? to be a matcher" do
+        argument_expecatation = RSpec::Mocks::ArgumentExpectation.new
         obj = double("matcher")
         obj.should_receive(:respond_to?).with(:matches?).and_return(true)
         obj.should_receive(:respond_to?).with(:description).and_return(false)

data/spec/rspec/mocks/at_least_spec.rb

@@ -7,14 +7,14 @@ module RSpec
         @mock = RSpec::Mocks::Mock.new("test mock")
       end
 
-      it "should fail if method is never called" do
+      it "fails if method is never called" do
         @mock.should_receive(:random_call).at_least(4).times
           lambda do
         @mock.rspec_verify
         end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
 
-      it "should fail when called less than n times" do
+      it "fails when called less than n times" do
         @mock.should_receive(:random_call).at_least(4).times
         @mock.random_call
         @mock.random_call
@@ -24,14 +24,14 @@ module RSpec
         end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
 
-      it "should fail when at least once method is never called" do
+      it "fails when at least once method is never called" do
         @mock.should_receive(:random_call).at_least(:once)
         lambda do
           @mock.rspec_verify
         end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
 
-      it "should fail when at least twice method is called once" do
+      it "fails when at least twice method is called once" do
         @mock.should_receive(:random_call).at_least(:twice)
         @mock.random_call
         lambda do
@@ -39,14 +39,14 @@ module RSpec
         end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
 
-      it "should fail when at least twice method is never called" do
+      it "fails when at least twice method is never called" do
         @mock.should_receive(:random_call).at_least(:twice)
         lambda do
           @mock.rspec_verify
         end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
 
-      it "should pass when at least n times method is called exactly n times" do
+      it "passes when at least n times method is called exactly n times" do
         @mock.should_receive(:random_call).at_least(4).times
         @mock.random_call
         @mock.random_call
@@ -55,7 +55,7 @@ module RSpec
         @mock.rspec_verify
       end
 
-      it "should pass when at least n times method is called n plus 1 times" do
+      it "passes when at least n times method is called n plus 1 times" do
         @mock.should_receive(:random_call).at_least(4).times
         @mock.random_call
         @mock.random_call
@@ -65,20 +65,20 @@ module RSpec
         @mock.rspec_verify
       end
 
-      it "should pass when at least once method is called once" do
+      it "passes when at least once method is called once" do
         @mock.should_receive(:random_call).at_least(:once)
         @mock.random_call
         @mock.rspec_verify
       end
 
-      it "should pass when at least once method is called twice" do
+      it "passes when at least once method is called twice" do
         @mock.should_receive(:random_call).at_least(:once)
         @mock.random_call
         @mock.random_call
         @mock.rspec_verify
       end
 
-      it "should pass when at least twice method is called three times" do
+      it "passes when at least twice method is called three times" do
         @mock.should_receive(:random_call).at_least(:twice)
         @mock.random_call
         @mock.random_call
@@ -86,7 +86,7 @@ module RSpec
         @mock.rspec_verify
       end
 
-      it "should pass when at least twice method is called twice" do
+      it "passes when at least twice method is called twice" do
         @mock.should_receive(:random_call).at_least(:twice)
         @mock.random_call
         @mock.random_call