rr 0.1.15 → 0.2.1

data/CHANGES

@@ -1,3 +1,12 @@
+* 0.2.1
+- Added mock_probe
+- Added stub_probe
+- Probe returns the return value of the passed in block, instead of ignoring its return value
+- Scenario#after_call returns the return value of the passed in block
+- Not using method aliasing to store original method
+- Renamed DoubleMethods to InstanceMethods
+- Added InstanceMethods#mock_probe
+
 * 0.1.15
 - Fixed [#12333] Rebinding original_methods causes blocks not to work
 

data/Rakefile

@@ -21,7 +21,7 @@ def run_suite
 end
 
 PKG_NAME = "rr"
-PKG_VERSION = "0.1.15"
+PKG_VERSION = "0.2.1"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',

data/examples/example_helper.rb

@@ -2,7 +2,7 @@ dir = File.dirname(__FILE__)
 require "#{dir}/environment_fixture_setup"
 require "examples/rr/space/space_helper"
 require "examples/rr/expectations/times_called_expectation/times_called_expectation_helper"
-require "examples/rr/extensions/double_methods_example_helper"
+require "examples/rr/extensions/instance_methods_example_helper"
 
 require "rr/adapters/rspec"
 Spec::Runner.configure do |config|

data/examples/high_level_example.rb

@@ -4,7 +4,7 @@ require "#{dir}/example_helper"
 describe "RR", :shared => true do
   before(:each) do
     @obj = Object.new
-    extend RR::Extensions::DoubleMethods
+    extend RR::Extensions::InstanceMethods
   end
 
   after(:each) do

data/examples/rr/double/double_bind_example.rb

@@ -28,12 +28,6 @@ describe Double, "#bind with an existing method" do
     @object.foobar
     rr_foobar_called.should == true
   end
-
-  it "stores original method in __rr__original_method_name" do
-    @double.bind
-    @object.respond_to?(:__rr__original_foobar).should == true
-    @object.method(:__rr__original_foobar).should == @original_method
-  end
 end
 
 describe Double, "#bind without an existing method" do
@@ -61,10 +55,5 @@ describe Double, "#bind without an existing method" do
     @object.foobar
     rr_foobar_called.should == true
   end
-
-  it "stores original method in __rr__original_method_name" do
-    @double.bind
-    @object.respond_to?(:__rr__original_foobar).should == false
-  end
 end
 end

data/examples/rr/double/double_reset_example.rb

@@ -55,14 +55,6 @@ describe Double, "#reset when method exists" do
     @object.methods.should include(@method_name.to_s)
     @object.foobar.should == :original_foobar
   end
-
-  it "cleans up by removing the __rr__original_method" do
-    @double.bind
-    @object.methods.should include("__rr__foobar")
-
-    @double.reset
-    @object.methods.should_not include("__rr__foobar")
-  end
 end
 
 describe Double, "#reset when method with block exists" do

data/examples/rr/extensions/{double_methods_argument_matcher_example.rb → instance_methods_argument_matcher_example.rb}

@@ -2,8 +2,8 @@ require "examples/example_helper"
 
 module RR
 module Extensions
-  describe DoubleMethods, "#anything" do
-    it_should_behave_like "RR::Extensions::DoubleMethods"
+  describe InstanceMethods, "#anything" do
+    it_should_behave_like "RR::Extensions::InstanceMethods"
     
     it "returns an Anything matcher" do
       anything.should == WildcardMatchers::Anything.new
@@ -14,8 +14,8 @@ module Extensions
     end
   end
 
-  describe DoubleMethods, "#is_a" do
-    it_should_behave_like "RR::Extensions::DoubleMethods"
+  describe InstanceMethods, "#is_a" do
+    it_should_behave_like "RR::Extensions::InstanceMethods"
 
     it "returns an IsA matcher" do
       is_a(Integer).should == WildcardMatchers::IsA.new(Integer)
@@ -26,8 +26,8 @@ module Extensions
     end
   end
 
-  describe DoubleMethods, "#numeric" do
-    it_should_behave_like "RR::Extensions::DoubleMethods"
+  describe InstanceMethods, "#numeric" do
+    it_should_behave_like "RR::Extensions::InstanceMethods"
 
     it "returns an Numeric matcher" do
       numeric.should == WildcardMatchers::Numeric.new
@@ -38,8 +38,8 @@ module Extensions
     end
   end
 
-  describe DoubleMethods, "#boolean" do
-    it_should_behave_like "RR::Extensions::DoubleMethods"
+  describe InstanceMethods, "#boolean" do
+    it_should_behave_like "RR::Extensions::InstanceMethods"
 
     it "returns an Boolean matcher" do
       boolean.should == WildcardMatchers::Boolean.new
@@ -50,8 +50,8 @@ module Extensions
     end
   end
 
-  describe DoubleMethods, "#duck_type" do
-    it_should_behave_like "RR::Extensions::DoubleMethods"
+  describe InstanceMethods, "#duck_type" do
+    it_should_behave_like "RR::Extensions::InstanceMethods"
 
     it "returns a DuckType matcher" do
       duck_type(:one, :two).should == WildcardMatchers::DuckType.new(:one, :two)

data/examples/rr/extensions/{double_methods_creator_example.rb → instance_methods_creator_example.rb}

@@ -2,8 +2,8 @@ require "examples/example_helper"
 
 module RR
 module Extensions
-  describe DoubleMethods, "#mock" do
-    it_should_behave_like "RR::Extensions::DoubleMethods"
+  describe InstanceMethods, "#mock" do
+    it_should_behave_like "RR::Extensions::InstanceMethods"
 
     before do
       @subject = Object.new
@@ -33,8 +33,8 @@ module Extensions
     end
   end
 
-  describe DoubleMethods, "#stub" do
-    it_should_behave_like "RR::Extensions::DoubleMethods"
+  describe InstanceMethods, "#stub" do
+    it_should_behave_like "RR::Extensions::InstanceMethods"
 
     before do
       @subject = Object.new
@@ -62,22 +62,26 @@ module Extensions
     end
   end
 
-  describe DoubleMethods, "#probe" do
-    it_should_behave_like "RR::Extensions::DoubleMethods"
+  describe InstanceMethods, "#probe and #mock_probe" do
+    it_should_behave_like "RR::Extensions::InstanceMethods"
 
     before do
       @subject = Object.new
     end
 
     it "sets up the RR probe call chain" do
-      should_create_probe_call_chain probe(@subject)
+      should_create_mock_probe_call_chain probe(@subject)
+    end
+
+    it "sets up the RR probe call chain" do
+      should_create_mock_probe_call_chain mock_probe(@subject)
     end
 
     it "sets up the RR probe call chain with rr_probe" do
-      should_create_probe_call_chain rr_probe(@subject)
+      should_create_mock_probe_call_chain rr_mock_probe(@subject)
     end
 
-    def should_create_probe_call_chain(creator)
+    def should_create_mock_probe_call_chain(creator)
       class << @subject
         def foobar(*args)
           :original_value
@@ -93,8 +97,38 @@ module Extensions
     end
   end
 
-  describe DoubleMethods, "#do_not_allow" do
-    it_should_behave_like "RR::Extensions::DoubleMethods"
+  describe InstanceMethods, "#stub_probe" do
+    it_should_behave_like "RR::Extensions::InstanceMethods"
+
+    before do
+      @subject = Object.new
+    end
+
+    it "sets up the RR probe call chain" do
+      should_create_stub_probe_call_chain stub_probe(@subject)
+    end
+
+    it "sets up the RR probe call chain" do
+      should_create_stub_probe_call_chain rr_stub_probe(@subject)
+    end
+
+    def should_create_stub_probe_call_chain(creator)
+      class << @subject
+        def foobar(*args)
+          :original_value
+        end
+      end
+
+      scenario = creator.foobar
+      scenario.times_matcher.should == TimesCalledMatchers::AnyTimesMatcher.new
+      scenario.argument_expectation.class.should == RR::Expectations::AnyArgumentExpectation
+
+      @subject.foobar(:something).should == :original_value
+    end
+  end
+
+  describe InstanceMethods, "#do_not_allow" do
+    it_should_behave_like "RR::Extensions::InstanceMethods"
     
     before do
       @subject = Object.new

data/examples/rr/extensions/{double_methods_example_helper.rb → instance_methods_example_helper.rb}

@@ -2,9 +2,9 @@ require "examples/example_helper"
 
 module RR
 module Extensions
-  describe DoubleMethods, :shared => true do
+  describe InstanceMethods, :shared => true do
     before do
-      extend RR::Extensions::DoubleMethods
+      extend RR::Extensions::InstanceMethods
     end
   end
 end

data/examples/rr/extensions/{double_methods_times_matcher_example.rb → instance_methods_times_matcher_example.rb}

@@ -2,8 +2,8 @@ require "examples/example_helper"
 
 module RR
 module Extensions
-  describe DoubleMethods, "#any_times" do
-    it_should_behave_like "RR::Extensions::DoubleMethods"
+  describe InstanceMethods, "#any_times" do
+    it_should_behave_like "RR::Extensions::InstanceMethods"
     
     it "returns an AnyTimesMatcher" do
       any_times.should == TimesCalledMatchers::AnyTimesMatcher.new

data/examples/rr/{probe_creator_example.rb → mock_probe_creator_example.rb}

@@ -1,7 +1,7 @@
 require "examples/example_helper"
 
 module RR
-describe ProbeCreator, :shared => true do
+describe MockProbeCreator, :shared => true do
   before(:each) do
     @space = Space.new
     @subject = Object.new
@@ -15,15 +15,15 @@ describe ProbeCreator, :shared => true do
   end
 end
 
-describe ProbeCreator, ".new without block" do
-  it_should_behave_like "RR::ProbeCreator"
+describe MockProbeCreator, ".new without block" do
+  it_should_behave_like "RR::MockProbeCreator"
 
   before do
-    @creator = ProbeCreator.new(@space, @subject)
+    @creator = MockProbeCreator.new(@space, @subject)
   end
 
   it "clears out all methods from creator" do
-    creator_subclass = Class.new(ProbeCreator) do
+    creator_subclass = Class.new(MockProbeCreator) do
       def i_should_be_a_scenario
       end
     end
@@ -34,14 +34,14 @@ describe ProbeCreator, ".new without block" do
   end
 end
 
-describe ProbeCreator, ".new with block" do
-  it_should_behave_like "RR::ProbeCreator"
+describe MockProbeCreator, ".new with block" do
+  it_should_behave_like "RR::MockProbeCreator"
 
   before do
     def @subject.foobar(*args)
       :original_foobar
     end
-    @creator = ProbeCreator.new(@space, @subject) do |c|
+    @creator = MockProbeCreator.new(@space, @subject) do |c|
       c.foobar(1, 2)
       c.foobar(1)
       c.foobar.with_any_args
@@ -56,7 +56,7 @@ describe ProbeCreator, ".new with block" do
   end
 
   it "clears out all methods from creator" do
-    creator_subclass = Class.new(ProbeCreator) do
+    creator_subclass = Class.new(MockProbeCreator) do
       def i_should_be_a_scenario
       end
     end
@@ -68,14 +68,14 @@ describe ProbeCreator, ".new with block" do
   end
 end
 
-describe ProbeCreator, ".new where method takes a block" do
-  it_should_behave_like "RR::ProbeCreator"
+describe MockProbeCreator, ".new where method takes a block" do
+  it_should_behave_like "RR::MockProbeCreator"
 
   before do
     def @subject.foobar(*args, &block)
       yield(*args)
     end
-    @creator = ProbeCreator.new(@space, @subject)
+    @creator = MockProbeCreator.new(@space, @subject)
   end
 
   it "calls the block" do
@@ -85,12 +85,12 @@ describe ProbeCreator, ".new where method takes a block" do
 end
 
 
-describe ProbeCreator, "#method_missing" do
-  it_should_behave_like "RR::ProbeCreator"
+describe MockProbeCreator, "#method_missing" do
+  it_should_behave_like "RR::MockProbeCreator"
   
   before do
     @subject = Object.new
-    @creator = ProbeCreator.new(@space, @subject)
+    @creator = MockProbeCreator.new(@space, @subject)
   end
 
   it "sets expectations on the subject while calling the original method" do
@@ -106,7 +106,10 @@ describe ProbeCreator, "#method_missing" do
     (class << @subject; self; end).class_eval do
       define_method(:foobar) {real_value}
     end
-    @creator.foobar(1, 2) {|value| mock(value).a_method {99}}
+    @creator.foobar(1, 2) do |value|
+      mock(value).a_method {99}
+      value
+    end
 
     return_value = @subject.foobar(1, 2)
     return_value.should === return_value

data/examples/rr/scenario_example.rb

@@ -262,10 +262,11 @@ describe Scenario, "#after_call" do
     @scenario.after_call {}.should === @scenario
   end
 
-  it "receives the return value in the block" do
+  it "sends return value of Scenario implementation to after_call" do
     return_value = {}
     @scenario.returns(return_value).after_call do |value|
       value[:foo] = :bar
+      value
     end
 
     actual_value = @scenario.call
@@ -273,10 +274,21 @@ describe Scenario, "#after_call" do
     actual_value.should == {:foo => :bar}
   end
 
+  it "receives the return value in the after_call callback" do
+    return_value = :returns_value
+    @scenario.returns(return_value).after_call do |value|
+      :after_call_value
+    end
+
+    actual_value = @scenario.call
+    actual_value.should == :after_call_value
+  end
+
   it "allows after_call to mock the return value" do
     return_value = Object.new
     @scenario.with_any_args.returns(return_value).after_call do |value|
       mock(value).inner_method(1) {:baz}
+      value
     end
 
     @object.foobar.inner_method(1).should == :baz
@@ -343,11 +355,18 @@ end
 describe Scenario, "#call implemented by a proc" do
   it_should_behave_like "RR::Scenario"
   
-  it "calls the return proc when scheduled to call a proc" do
+  it "calls the return proc when implemented by a proc" do
     @scenario.returns {|arg| "returning #{arg}"}
     @scenario.call(:foobar).should == "returning foobar"
   end
 
+  it "calls and returns the after_call when after_call is set" do
+    @scenario.returns {|arg| "returning #{arg}"}.after_call do |value|
+      "#{value} after call"
+    end
+    @scenario.call(:foobar).should == "returning foobar after call"
+  end
+
   it "returns nil when to returns is not set" do
     @scenario.call.should be_nil
   end

data/examples/rr/space/space_create_example.rb

@@ -53,7 +53,7 @@ describe Space, "#create_stub_creator" do
   end
 end
 
-describe Space, "#create_probe_creator" do
+describe Space, "#create_mock_probe_creator" do
   it_should_behave_like "RR::Space"
 
   before do
@@ -65,15 +65,15 @@ describe Space, "#create_probe_creator" do
     end
   end
 
-  it "creates a ProbeCreator" do
-    creator = @space.create_probe_creator(@object)
+  it "creates a MockProbeCreator" do
+    creator = @space.create_mock_probe_creator(@object)
     creator.foobar(1)
     @object.foobar(1).should == :original_foobar
     proc {@object.foobar(1)}.should raise_error(Errors::TimesCalledError)
   end
 
   it "uses block definition when passed a block" do
-    creator = @space.create_probe_creator(@object) do |c|
+    creator = @space.create_mock_probe_creator(@object) do |c|
       c.foobar(1)
     end
     @object.foobar(1).should == :original_foobar
@@ -81,6 +81,34 @@ describe Space, "#create_probe_creator" do
   end
 end
 
+describe Space, "#create_stub_probe_creator" do
+  it_should_behave_like "RR::Space"
+
+  before do
+    @space = Space.new
+    @object = Object.new
+    @method_name = :foobar
+    def @object.foobar(*args)
+      :original_foobar
+    end
+  end
+
+  it "creates a StubProbeCreator" do
+    creator = @space.create_stub_probe_creator(@object)
+    creator.foobar
+    @object.foobar(1).should == :original_foobar
+    @object.foobar(1).should == :original_foobar
+  end
+
+  it "uses block definition when passed a block" do
+    creator = @space.create_stub_probe_creator(@object) do |c|
+      c.foobar(1)
+    end
+    @object.foobar(1).should == :original_foobar
+    @object.foobar(1).should == :original_foobar
+  end
+end
+
 describe Space, "#create_do_not_allow_creator" do
   it_should_behave_like "RR::Space"
 

data/examples/rr/stub_probe_creator_example.rb

@@ -0,0 +1,127 @@
+require "examples/example_helper"
+
+module RR
+describe StubProbeCreator, :shared => true do
+  before(:each) do
+    @space = Space.new
+    @subject = Object.new
+  end
+
+  it "initializes creator with passed in object" do
+    class << @creator
+      attr_reader :subject
+    end
+    @creator.subject.should === @subject
+  end
+end
+
+describe StubProbeCreator, ".new without block" do
+  it_should_behave_like "RR::StubProbeCreator"
+
+  before do
+    @creator = StubProbeCreator.new(@space, @subject)
+  end
+
+  it "clears out all methods from creator" do
+    creator_subclass = Class.new(StubProbeCreator) do
+      def i_should_be_a_scenario
+      end
+    end
+    creator_subclass.instance_methods.should include('i_should_be_a_scenario')
+
+    creator = creator_subclass.new(@space, @subject)
+    creator.i_should_be_a_scenario.should be_instance_of(Scenario)
+  end
+end
+
+describe StubProbeCreator, ".new with block" do
+  it_should_behave_like "RR::StubProbeCreator"
+
+  before do
+    def @subject.foobar(*args)
+      :original_foobar
+    end
+    @creator = StubProbeCreator.new(@space, @subject) do |c|
+      c.foobar
+    end
+  end
+
+  it "creates doubles" do
+    @subject.foobar(1, 2).should == :original_foobar
+    @subject.foobar(1, 2).should == :original_foobar
+    @subject.foobar(1).should == :original_foobar
+    @subject.foobar(1).should == :original_foobar
+    @subject.foobar(:something).should == :original_foobar
+    @subject.foobar(:something).should == :original_foobar
+  end
+
+  it "clears out all methods from creator" do
+    creator_subclass = Class.new(StubProbeCreator) do
+      def i_should_be_a_scenario
+      end
+    end
+    creator_subclass.instance_methods.should include('i_should_be_a_scenario')
+
+    creator_subclass.new(@space, @subject) do |m|
+      m.i_should_be_a_scenario.should be_instance_of(Scenario)
+    end
+  end
+end
+
+describe StubProbeCreator, ".new where method takes a block" do
+  it_should_behave_like "RR::StubProbeCreator"
+
+  before do
+    def @subject.foobar(*args, &block)
+      yield(*args)
+    end
+    @creator = StubProbeCreator.new(@space, @subject)
+  end
+
+  it "calls the block" do
+    @creator.foobar(1, 2)
+    @subject.foobar(1, 2) {|arg1, arg2| [arg2, arg1]}.should == [2, 1]
+  end
+end
+
+describe StubProbeCreator, "#method_missing" do
+  it_should_behave_like "RR::StubProbeCreator"
+  
+  before do
+    @subject = Object.new
+    @creator = StubProbeCreator.new(@space, @subject)
+  end
+  
+  it "sets up a scenario with passed in arguments" do
+    def @subject.foobar(*args); :baz; end
+      @creator.foobar(1, 2)
+    proc do
+      @subject.foobar
+    end.should raise_error(Errors::ScenarioNotFoundError)
+  end
+
+  it "sets expectations on the subject while calling the original method" do
+    def @subject.foobar(*args); :baz; end
+    @creator.foobar(1, 2) {:new_value}
+    10.times do
+      @subject.foobar(1, 2).should == :new_value
+    end
+  end
+
+  it "sets after_call on the scenario when passed a block" do
+    real_value = Object.new
+    (class << @subject; self; end).class_eval do
+      define_method(:foobar) {real_value}
+    end
+    @creator.foobar(1, 2) do |value|
+      mock(value).a_method {99}
+      value
+    end
+
+    return_value = @subject.foobar(1, 2)
+    return_value.should === return_value
+    return_value.a_method.should == 99
+  end
+end
+
+end

data/lib/rr.rb

@@ -4,7 +4,8 @@ require "rr/double"
 require "rr/creator"
 require "rr/mock_creator"
 require "rr/stub_creator"
-require "rr/probe_creator"
+require "rr/mock_probe_creator"
+require "rr/stub_probe_creator"
 require "rr/do_not_allow_creator"
 
 require "rr/scenario"
@@ -38,4 +39,4 @@ require "rr/times_called_matchers/proc_matcher"
 require "rr/times_called_matchers/at_least_matcher"
 require "rr/times_called_matchers/at_most_matcher"
 
-require "rr/extensions/double_methods"
+require "rr/extensions/instance_methods"

data/lib/rr/adapters/rspec.rb

@@ -4,7 +4,7 @@ patterns.push(RR::Errors::BACKTRACE_IDENTIFIER)
 module RR
   module Adapters
     module Rspec
-      include RR::Extensions::DoubleMethods
+      include RR::Extensions::InstanceMethods
       def setup_mocks_for_rspec
         RR::Space.instance.reset
       end

data/lib/rr/adapters/test_unit.rb

@@ -3,7 +3,7 @@ RR::Space.trim_backtrace = true
 module RR
   module Adapters
     module TestUnit
-      include RR::Extensions::DoubleMethods
+      include RR::Extensions::InstanceMethods
       def self.included(mod)
         mod.class_eval do
           alias_method :setup_without_rr, :setup

data/lib/rr/double.rb

@@ -4,15 +4,13 @@ module RR
   # has Argument Expectations and Times called Expectations.
   class Double
     MethodArguments = Struct.new(:arguments, :block)
-    attr_reader :space, :object, :method_name, :scenarios
+    attr_reader :space, :object, :method_name, :original_method, :scenarios
 
     def initialize(space, object, method_name)
       @space = space
       @object = object
       @method_name = method_name.to_sym
-      if @object.respond_to?(method_name)
-        meta.send(:alias_method, original_method_name, method_name)
-      end
+      @original_method = object.method(method_name) if @object.methods.include?(method_name.to_s)
       @scenarios = []
     end
 
@@ -49,21 +47,13 @@ module RR
     # if one exists. 
     def reset
       meta.send(:remove_method, placeholder_name)
-      if original_method
-        meta.send(:alias_method, @method_name, original_method_name)
-        meta.send(:remove_method, original_method_name)
+      if @original_method
+        meta.send(:define_method, @method_name, @original_method)
       else
         meta.send(:remove_method, @method_name)
       end
     end
 
-    # The original method of the object. It returns nil if the object
-    # does not have an original method.
-    def original_method
-      return nil unless @object.respond_to?(original_method_name)
-      return @object.method(original_method_name)
-    end
-
     protected
     def define_implementation_placeholder
       me = self
@@ -79,6 +69,7 @@ module RR
       scenario_not_found_error(*args)
     end
 
+    protected
     def find_scenario_to_attempt(args)
       matches = ScenarioMatches.new(@scenarios).find_all_matches!(args)
 
@@ -115,10 +106,6 @@ module RR
     def placeholder_name
       "__rr__#{@method_name}"
     end
-
-    def original_method_name
-      "__rr__original_#{@method_name}"
-    end
     
     def meta
       (class << @object; self; end)

data/lib/rr/extensions/{double_methods.rb → instance_methods.rb}

@@ -1,6 +1,6 @@
 module RR
 module Extensions
-  module DoubleMethods
+  module InstanceMethods
     # Sets up a MockCreator that generates a Double Scenario that
     # acts like a mock.
     #   mock(object).method_name(arg1, arg2) {return_value}
@@ -15,13 +15,45 @@ module Extensions
       RR::Space.instance.create_stub_creator(subject, &definition)
     end
 
-    # Sets up a ProbeCreator that generates a Double Scenario that
-    # acts like a probe.
-    #   probe(controller.template).render(:partial => "my/socks")
-    def probe(subject, &definition)
-      RR::Space.instance.create_probe_creator(subject, &definition)
+    # Sets up a MockProbeCreator that generates a Double Scenario that
+    # acts like mock verifications while calling the actual method.
+    #
+    #   mock_probe(controller.template).render(:partial => "my/socks")
+    #
+    # Passing a block allows you to intercept the return value.
+    # The return value can be modified, validated, and/or overridden by
+    # passing in a block. The return value of the block will replace
+    # the actual return value.
+    #
+    #   mock_probe(controller.template).render(:partial => "my/socks") do |html|
+    #     html.should include("My socks are wet")
+    #     "My new return value"
+    #   end
+    def mock_probe(subject, &definition)
+      RR::Space.instance.create_mock_probe_creator(subject, &definition)
     end
 
+    # Sets up a StubProbeCreator that generates a Double Scenario that
+    # acts like mock verifications while calling the actual method.
+    #
+    #   mock_probe(User).new {|user| my_user}
+    #
+    # Passing a block allows you to intercept the return value.
+    # The return value can be modified, validated, and/or overridden by
+    # passing in a block. The return value of the block will replace
+    # the actual return value.
+    #
+    #   mock_probe(controller.template).render(:partial => "my/socks") do |html|
+    #     html.should include("My socks are wet")
+    #     "My new return value"
+    #   end
+    def stub_probe(subject, &definition)
+      RR::Space.instance.create_stub_probe_creator(subject, &definition)
+    end
+
+    # Same as mock_probe
+    alias_method :probe, :mock_probe
+
     # Sets up a DoNotAllowCreator that generates a Double Scenario that
     # expects never to be called.
     #   do_not_allow(object).method_name

data/lib/rr/mock_probe_creator.rb

@@ -0,0 +1,36 @@
+module RR
+  # RR::MockProbeCreator uses RR::MockProbeCreator#method_missing to create
+  # a Scenario that acts like a mock with probing capabilities.
+  #
+  # Passing a block allows you to intercept the return value.
+  # The return value can be modified, validated, and/or overridden by
+  # passing in a block. The return value of the block will replace
+  # the actual return value.
+  #
+  #   probe(subject).method_name(arg1, arg2) do |return_value|
+  #     return_value.method_name.should == :return_value
+  #     my_return_value
+  #   end
+  #
+  #   probe(User) do |m|
+  #     m.find('4') do |user|
+  #       mock(user).valid? {false}
+  #       user
+  #     end
+  #   end
+  #
+  #   user = User.find('4')
+  #   user.valid? # false
+  class MockProbeCreator < Creator
+    module InstanceMethods
+      protected
+      def method_missing(method_name, *args, &after_call)
+        double = @space.create_double(@subject, method_name)
+        scenario = @space.create_scenario(double)
+        scenario.with(*args).once.implemented_by(double.original_method)
+        scenario.after_call(&after_call) if after_call
+        scenario
+      end      
+    end
+  end
+end

data/lib/rr/scenario.rb

@@ -243,8 +243,8 @@ module RR
     # exceeds the expected TimesCalledExpectation.
     def call(*args, &block)
       return_value = call_implementation(*args, &block)
-      @after_call.call(return_value) if @after_call
-      return_value
+      return return_value unless @after_call
+      @after_call.call(return_value)
     end
 
     def call_implementation(*args, &block)

data/lib/rr/space.rb

@@ -33,9 +33,14 @@ module RR
       StubCreator.new(self, subject, &definition)
     end
 
-    # Creates a ProbeCreator.
-    def create_probe_creator(subject, &definition)
-      ProbeCreator.new(self, subject, &definition)
+    # Creates a MockProbeCreator.
+    def create_mock_probe_creator(subject, &definition)
+      MockProbeCreator.new(self, subject, &definition)
+    end
+
+    # Creates a StubProbeCreator.
+    def create_stub_probe_creator(subject, &definition)
+      StubProbeCreator.new(self, subject, &definition)
     end
 
     # Creates a DoNotAllowCreator.

data/lib/rr/stub_probe_creator.rb

@@ -0,0 +1,42 @@
+module RR
+  # RR::StubProbeCreator uses RR::StubProbeCreator#method_missing to create
+  # a Scenario that acts like a stub with probing capabilities.
+  #
+  # Passing a block allows you to intercept the return value.
+  # The return value can be modified, validated, and/or overridden by
+  # passing in a block. The return value of the block will replace
+  # the actual return value.
+  #
+  #   probe_stub(subject).method_name(arg1, arg2) do |return_value|
+  #     return_value.method_name.should == :return_value
+  #     my_return_value
+  #   end
+  #
+  #   probe_stub(User) do |m|
+  #     m.find do |user|
+  #       mock(user).valid? {false}
+  #       user
+  #     end
+  #   end
+  #
+  #   user = User.find('4')
+  #   user.valid? # false
+  class StubProbeCreator < Creator
+    module InstanceMethods
+      protected
+      def method_missing(method_name, *args, &after_call)
+        double = @space.create_double(@subject, method_name)
+        scenario = @space.create_scenario(double)
+        scenario.implemented_by(double.original_method)
+        scenario.any_number_of_times
+        if args.empty?
+          scenario.with_any_args
+        else
+          scenario.with(*args)
+        end
+        scenario.after_call(&after_call) if after_call
+        scenario
+      end      
+    end
+  end
+end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: rr
 version: !ruby/object:Gem::Version 
-  version: 0.1.15
+  version: 0.2.1
 date: 2007-07-17 00:00:00 -07:00
 summary: RR (Double Ruby) is a double framework that features a rich selection of double techniques and a terse syntax. http://xunitpatterns.com/Test%20Double.html
 require_paths: 
@@ -33,15 +33,16 @@ files:
 - CHANGES
 - README
 - lib/rr.rb
+- lib/rr/mock_probe_creator.rb
 - lib/rr/scenario.rb
 - lib/rr/creator.rb
+- lib/rr/stub_probe_creator.rb
 - lib/rr/scenario_matches.rb
 - lib/rr/stub_creator.rb
 - lib/rr/space.rb
 - lib/rr/double.rb
 - lib/rr/do_not_allow_creator.rb
 - lib/rr/mock_creator.rb
-- lib/rr/probe_creator.rb
 - lib/rr/times_called_matchers/any_times_matcher.rb
 - lib/rr/times_called_matchers/at_most_matcher.rb
 - lib/rr/times_called_matchers/times_called_matcher.rb
@@ -68,18 +69,19 @@ files:
 - lib/rr/wildcard_matchers/numeric.rb
 - lib/rr/wildcard_matchers/is_a.rb
 - lib/rr/wildcard_matchers/anything.rb
-- lib/rr/extensions/double_methods.rb
+- lib/rr/extensions/instance_methods.rb
 - examples/environment_fixture_setup.rb
 - examples/rspec_example_suite.rb
 - examples/example_suite.rb
 - examples/example_helper.rb
 - examples/test_unit_example_suite.rb
 - examples/high_level_example.rb
-- examples/rr/probe_creator_example.rb
+- examples/rr/stub_probe_creator_example.rb
 - examples/rr/mock_creator_example.rb
 - examples/rr/stub_creator_example.rb
 - examples/rr/scenario_example.rb
 - examples/rr/do_not_allow_creator_example.rb
+- examples/rr/mock_probe_creator_example.rb
 - examples/rr/rspec/rspec_backtrace_tweaking_example.rb
 - examples/rr/rspec/rspec_adapter_example.rb
 - examples/rr/rspec/rspec_usage_example.rb
@@ -123,10 +125,10 @@ files:
 - examples/rr/test_unit/test_unit_backtrace_test.rb
 - examples/rr/test_unit/test_helper.rb
 - examples/rr/test_unit/test_unit_integration_test.rb
-- examples/rr/extensions/double_methods_creator_example.rb
-- examples/rr/extensions/double_methods_argument_matcher_example.rb
-- examples/rr/extensions/double_methods_example_helper.rb
-- examples/rr/extensions/double_methods_times_matcher_example.rb
+- examples/rr/extensions/instance_methods_argument_matcher_example.rb
+- examples/rr/extensions/instance_methods_times_matcher_example.rb
+- examples/rr/extensions/instance_methods_creator_example.rb
+- examples/rr/extensions/instance_methods_example_helper.rb
 test_files: []
 
 rdoc_options: 

data/lib/rr/probe_creator.rb

@@ -1,36 +0,0 @@
-module RR
-  # RR::ProbeCreator uses RR::ProbeCreator#method_missing to create
-  # a Scenario that acts like a probe.
-  #
-  # The following example probes method_name with arg1 and arg2
-  # returning the actual value of the method. The block is an after callback
-  # that intercepts the return value. Mocks or other modifications can
-  # be done to the return value.
-  #
-  #   probe(subject).method_name(arg1, arg2) { |return_value| }
-  #
-  # The ProbeCreator also supports a block sytnax. The block accepts
-  # a after_call callback, instead of a return value as with MockCreator
-  # and StubCreator.
-  #
-  #    probe(User) do |m|
-  #      m.find('4') do |user|
-  #        mock(user).valid? {false}
-  #      end
-  #    end
-  #
-  #   user = User.find('4')
-  #   user.valid? # false
-  class ProbeCreator < Creator
-    module InstanceMethods
-      protected
-      def method_missing(method_name, *args, &after_call)
-        double = @space.create_double(@subject, method_name)
-        scenario = @space.create_scenario(double)
-        scenario.with(*args).once.implemented_by(double.original_method)
-        scenario.after_call(&after_call) if after_call
-        scenario
-      end      
-    end
-  end
-end