rr 0.8.0 → 0.8.1

data/CHANGES

@@ -1,3 +1,7 @@
+* 0.8.1
+- Fixed exception where the Subject uses method delegation via method_missing (e.g. certain ActiveRecord AssociationProxy methods)
+
+* 0.8.0
 - Fixed compatability issues with Ruby 1.9
 - Aliased any_number_of_times with any_times
 - Better error messages for have_received and assert_received matchers (Patch by Joe Ferris)

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:major: 0
 :minor: 8
-:patch: 0
+:patch: 1
+:major: 0

data/lib/rr/double_injection.rb

@@ -14,8 +14,11 @@ module RR
         begin
           meta.__send__(:alias_method, original_method_name, method_name)
         rescue NameError => e
-          subject.send(method_name)
-          meta.__send__(:alias_method, original_method_name, method_name)
+          begin
+            subject.send(method_name)
+            meta.__send__(:alias_method, original_method_name, method_name)
+          rescue NameError => e
+          end
         end
       end
       @doubles = []

data/spec/environment_fixture_setup.rb

@@ -1,5 +1,6 @@
 require "rubygems"
 require "spec"
+require "spec/autorun"
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift "#{dir}/../lib"
 require "rr"

data/spec/rr/double_injection/double_injection_spec.rb

@@ -34,17 +34,44 @@ module RR
       end
 
       context "when method does not exist on object" do
-        send("sets up object and method_name")
-
         before do
           @subject = Object.new
           @method_name = :foobar
           subject.methods.should_not include(method_name.to_s)
-          @double_injection = DoubleInjection.new(subject, method_name)
         end
 
-        it "object does not have original method" do
-          double_injection.object_has_original_method?.should be_false
+        context "and invoking the method for the first time does not add the method" do
+          before do
+            @double_injection = DoubleInjection.new(subject, method_name)
+          end
+          send("sets up object and method_name")
+
+          example "object does not have original method" do
+            double_injection.object_has_original_method?.should be_false
+          end
+        end
+
+
+        context "and invoking the method for the first time adds the method" do
+          before do
+            class << subject
+              def respond_to?(method_name)
+                true
+              end
+
+              def method_missing(method_name, *args, &block)
+                (class << self; self; end).class_eval do
+                  define_method(method_name) {}
+                end
+              end
+            end
+            @double_injection = DoubleInjection.new(subject, method_name)
+          end
+          send("sets up object and method_name")
+
+          example "object has original method" do
+            double_injection.object_has_original_method?.should be_true
+          end
         end
       end
 

data/spec/spec_helper.rb

@@ -20,88 +20,88 @@ describe "Swapped Space", :shared => true do
   end
 end
 
-module Spec::Example::ExampleMethods
-  def new_double(
-    double_injection=double_injection,
-    double_definition=RR::DoubleDefinitions::DoubleDefinition.new(creator = RR::DoubleDefinitions::DoubleDefinitionCreator.new, subject).with_any_args.any_number_of_times
-  )
-    RR::Double.new(
-      double_injection,
-      double_definition
-    )
-  end
-end
-
-module Spec::Example::ExampleGroupMethods
-  def macro(name, &implementation)
-    (class << self; self; end).class_eval do
-      define_method(name, &implementation)
+class Spec::ExampleGroup
+  class << self
+    def macro(name, &implementation)
+      (class << self; self; end).class_eval do
+        define_method(name, &implementation)
+      end
     end
-  end
 
-  define_method("normal strategy definition") do
-    describe "strategy definition" do
-      attr_reader :strategy_method_name
+    define_method("normal strategy definition") do
+      describe "strategy definition" do
+        attr_reader :strategy_method_name
 
-      context "when passed a subject" do
-        it "returns a DoubleDefinitionCreatorProxy" do
-          double = call_strategy(subject).foobar
-          double.should be_instance_of(RR::DoubleDefinitions::DoubleDefinition)
+        context "when passed a subject" do
+          it "returns a DoubleDefinitionCreatorProxy" do
+            double = call_strategy(subject).foobar
+            double.should be_instance_of(RR::DoubleDefinitions::DoubleDefinition)
+          end
         end
-      end
 
-      context "when passed a method name and a definition_eval_block" do
-        it "raises an ArgumentError" do
-          lambda do
-            call_strategy(subject, :foobar) {}
-          end.should raise_error(ArgumentError, "Cannot pass in a method name and a block")
+        context "when passed a method name and a definition_eval_block" do
+          it "raises an ArgumentError" do
+            lambda do
+              call_strategy(subject, :foobar) {}
+            end.should raise_error(ArgumentError, "Cannot pass in a method name and a block")
+          end
         end
       end
     end
-  end
 
-  define_method("! strategy definition") do
-    describe "strategy definition" do
-      attr_reader :strategy_method_name
+    define_method("! strategy definition") do
+      describe "strategy definition" do
+        attr_reader :strategy_method_name
 
-      context "when not passed a method_name argument" do
-        it "returns a DoubleDefinitionCreatorProxy" do
-          call_strategy.should respond_to(:__subject__)
-        end
+        context "when not passed a method_name argument" do
+          it "returns a DoubleDefinitionCreatorProxy" do
+            call_strategy.should respond_to(:__subject__)
+          end
 
-        context "when passed a definition_eval_block argument" do
-          it "calls the definition_eval_block and passes in the DoubleDefinitionCreatorProxy" do
-            passed_in_proxy = nil
-            proxy = call_strategy do |proxy|
-              passed_in_proxy = proxy
-            end
+          context "when passed a definition_eval_block argument" do
+            it "calls the definition_eval_block and passes in the DoubleDefinitionCreatorProxy" do
+              passed_in_proxy = nil
+              proxy = call_strategy do |proxy|
+                passed_in_proxy = proxy
+              end
 
-            passed_in_proxy.should == proxy
+              passed_in_proxy.should == proxy
+            end
           end
         end
-      end
 
-      context "when passed a method_name argument" do
-        it "returns a DoubleDefinition" do
-          double_definition = call_strategy(:foobar)
-          double_definition.class.should == RR::DoubleDefinitions::DoubleDefinition
-        end
-
-        describe "the returned DoubleDefinition" do
-          it "has #subject set to an anonymous Object" do
+        context "when passed a method_name argument" do
+          it "returns a DoubleDefinition" do
             double_definition = call_strategy(:foobar)
-            double_definition.subject.class.should == Object
+            double_definition.class.should == RR::DoubleDefinitions::DoubleDefinition
+          end
+
+          describe "the returned DoubleDefinition" do
+            it "has #subject set to an anonymous Object" do
+              double_definition = call_strategy(:foobar)
+              double_definition.subject.class.should == Object
+            end
           end
         end
-      end
 
-      context "when passed a method name and a definition_eval_block" do
-        it "raises an ArgumentError" do
-          lambda do
-            call_strategy(:foobar) {}
-          end.should raise_error(ArgumentError, "Cannot pass in a method name and a block")
+        context "when passed a method name and a definition_eval_block" do
+          it "raises an ArgumentError" do
+            lambda do
+              call_strategy(:foobar) {}
+            end.should raise_error(ArgumentError, "Cannot pass in a method name and a block")
+          end
         end
       end
     end
   end
-end
+
+  def new_double(
+    double_injection=double_injection,
+    double_definition=RR::DoubleDefinitions::DoubleDefinition.new(creator = RR::DoubleDefinitions::DoubleDefinitionCreator.new, subject).with_any_args.any_number_of_times
+  )
+    RR::Double.new(
+      double_injection,
+      double_definition
+    )
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rr
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - Brian Takita