rspec_candy 0.2.3 → 0.2.4

data/lib/rspec_candy/helpers/should_receive_and_execute.rb

@@ -3,26 +3,36 @@ module RSpecCandy
     module ShouldReceiveAndExecute
 
       def should_receive_and_execute(method)
-        method_base = method.to_s.gsub(/([\?\!\=\[\]]+)$/, '')
+
+        method = method.to_s
+        method_base = method.gsub(/([\?\!\=\[\]]+)$/, '')
         method_suffix = $1
 
         method_called = "_#{method_base}_called#{method_suffix}"
         method_with_spy = "#{method_base}_with_spy#{method_suffix}"
         method_without_spy = "#{method_base}_without_spy#{method_suffix}"
 
+        method_defined_directly = (private_methods + protected_methods + public_methods).include?(method) # not method_missing
+
         prototype = respond_to?(:singleton_class) ? singleton_class : metaclass
         prototype.class_eval do
 
-          unless method_defined?(method_with_spy)
+          define_method method_called do |*args|
+          end
 
-            define_method method_called do |*args|
+          if method_defined_directly
+            unless method_defined?(method_with_spy)
+              define_method method_with_spy do |*args, &block|
+                send(method_called, *args)
+                send(method_without_spy, *args, &block)
+              end
+              alias_method_chain method, :spy
             end
-
-            define_method method_with_spy do |*args, &block|
+          else
+            define_method method do |*args, &block|
               send(method_called, *args)
-              send(method_without_spy, *args, &block)
+              super
             end
-            alias_method_chain method, :spy
           end
 
         end

data/lib/rspec_candy/version.rb

@@ -1,3 +1,3 @@
 module RSpecCandy
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/spec/shared/rspec_candy/helpers/should_receive_and_execute_spec.rb

@@ -25,6 +25,29 @@ describe RSpecCandy::Helpers::ShouldReceiveAndExecute do
         object.size # make the example pass
       end
 
+      it "should not overwrite the implementation of a class method defined through an object's singleton class" do
+        object = Object.new
+        def object.foo
+          'foo'
+        end
+        object.should_receive_and_execute(:foo)
+        object.foo.should == 'foo'
+      end
+
+      it 'should not fail for a class that responds to messages using #method_missing' do
+        klass = Class.new do
+          def respond_to?(*args)
+            true
+          end
+          def method_missing(symbol, *args, &block)
+            'foo'
+          end
+        end
+        object = klass.new
+        object.should_receive_and_execute(:foo)
+        object.foo.should == 'foo'
+      end
+
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec_candy
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Henning Koch