rr 0.1.14 → 0.1.15

data/CHANGES

@@ -1,9 +1,12 @@
+* 0.1.15
+- Fixed [#12333] Rebinding original_methods causes blocks not to work
+
 * 0.1.14
 - Introduced concept of Terminal and NonTerminal TimesCalledMatchers
 - Doubles that can be called many times can be replaced
 - Terminal Scenarios are called before NonTerminal Scenarios
 - Error message tweaking
-- Raise error when making a Scenarios with NonDeterministic TimesMatcher Ordered
+- Raise error when making a Scenarios with NonTerminal TimesMatcher Ordered
 
 * 0.1.13
 - Fixed [#12290] Scenario#returns with false causes a return value of nil

data/Rakefile

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

data/examples/rr/double/double_bind_example.rb

@@ -7,6 +7,7 @@ describe Double, "#bind with an existing method" do
     @object = Object.new
     @method_name = :foobar
     def @object.foobar; :original_foobar; end
+    @original_method = @object.method(:foobar)
     @object.methods.should include(@method_name.to_s)
     @double = Double.new(@space, @object, @method_name)
   end
@@ -27,5 +28,43 @@ 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
+  before do
+    @space = Space.new
+    @object = Object.new
+    @method_name = :foobar
+    @object.methods.should_not include(@method_name.to_s)
+    @double = Double.new(@space, @object, @method_name)
+  end
+
+  it "overrides the original method with the double's dispatching methods" do
+    @object.respond_to?(:__rr__foobar).should == false
+    @double.bind
+    @object.respond_to?(:__rr__foobar).should == true
+
+    rr_foobar_called = false
+    (class << @object; self; end).class_eval do
+      define_method :__rr__foobar do
+        rr_foobar_called = true
+      end
+    end
+
+    rr_foobar_called.should == false
+    @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

@@ -2,7 +2,7 @@ require "examples/example_helper"
 
 module RR
 describe Double, "#reset", :shared => true do
-  it "cleans up by removing the __rr__ method" do
+  it "cleans up by removing the __rr__method" do
     @double.bind
     @object.methods.should include("__rr__foobar")
 
@@ -45,15 +45,53 @@ describe Double, "#reset when method exists" do
     @object.methods.should include(@method_name.to_s)
     @original_method = @object.method(@method_name)
     @double = Double.new(@space, @object, @method_name)
-  end
 
-  it "removes the method" do
     @double.bind
     @object.methods.should include(@method_name.to_s)
+  end
 
+  it "rebind original method" do
     @double.reset
     @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
+  it_should_behave_like "RR::Double#reset"
+
+  before do
+    @space = Space.new
+    @object = Object.new
+    @method_name = :foobar
+    def @object.foobar
+      yield(:original_argument)
+    end
+    @object.methods.should include(@method_name.to_s)
+    @original_method = @object.method(@method_name)
+    @double = Double.new(@space, @object, @method_name)
+
+    @double.bind
+    @object.methods.should include(@method_name.to_s)
+  end
+
+  it "rebinds original method with block" do
+    @double.reset
+    @object.methods.should include(@method_name.to_s)
+    
+    original_argument = nil
+    @object.foobar do |arg|
+      original_argument = arg
+    end
+    original_argument.should == :original_argument
+  end
 end
 end

data/lib/rr/double.rb

@@ -4,13 +4,15 @@ module RR
   # has Argument Expectations and Times called Expectations.
   class Double
     MethodArguments = Struct.new(:arguments, :block)
-    attr_reader :space, :object, :method_name, :original_method, :scenarios
+    attr_reader :space, :object, :method_name, :scenarios
 
     def initialize(space, object, method_name)
       @space = space
       @object = object
       @method_name = method_name.to_sym
-      @original_method = object.method(method_name) if @object.methods.include?(method_name.to_s)
+      if @object.respond_to?(method_name)
+        meta.send(:alias_method, original_method_name, method_name)
+      end
       @scenarios = []
     end
 
@@ -47,13 +49,21 @@ module RR
     # if one exists. 
     def reset
       meta.send(:remove_method, placeholder_name)
-      if @original_method
-        meta.send(:define_method, @method_name, &@original_method)
+      if original_method
+        meta.send(:alias_method, @method_name, original_method_name)
+        meta.send(:remove_method, original_method_name)
       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
@@ -69,7 +79,6 @@ module RR
       scenario_not_found_error(*args)
     end
 
-    protected
     def find_scenario_to_attempt(args)
       matches = ScenarioMatches.new(@scenarios).find_all_matches!(args)
 
@@ -106,6 +115,10 @@ module RR
     def placeholder_name
       "__rr__#{@method_name}"
     end
+
+    def original_method_name
+      "__rr__original_#{@method_name}"
+    end
     
     def meta
       (class << @object; self; end)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: rr
 version: !ruby/object:Gem::Version 
-  version: 0.1.14
-date: 2007-07-16 00:00:00 -07:00
+  version: 0.1.15
+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: 
 - lib