rr 0.2.1 → 0.2.2

data/CHANGES

@@ -1,3 +1,7 @@
+* 0.2.2
+- Fixed "singleton method bound for a different object"
+- Doing Method aliasing again to store original method
+
 * 0.2.1
 - Added mock_probe
 - Added stub_probe

data/Rakefile

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

data/examples/rr/double/double_bind_example.rb

@@ -28,6 +28,12 @@ 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
@@ -55,5 +61,10 @@ 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/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
 
@@ -22,7 +24,7 @@ module RR
 
     # RR::Double#bind injects a method that acts as a dispatcher
     # that dispatches to the matching Scenario when the method
-    # is called.    
+    # is called.
     def bind
       define_implementation_placeholder
       returns_method = <<-METHOD
@@ -44,16 +46,24 @@ module RR
 
     # RR::Double#reset removes the injected dispatcher method.
     # It binds the original method implementation on the object
-    # if one exists. 
+    # 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,9 +115,13 @@ module RR
     def placeholder_name
       "__rr__#{@method_name}"
     end
-    
+
+    def original_method_name
+      "__rr__original_#{@method_name}"
+    end
+
     def meta
       (class << @object; self; end)
     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.2.1
+  version: 0.2.2
 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: