flexmock 0.8.8 → 0.8.9

data/README.rdoc

@@ -3,7 +3,7 @@
 FlexMock is a simple, but flexible, mock object library for Ruby unit
 testing.
 
-Version :: 0.8.8
+Version :: 0.8.9
 
 = Links
 

data/Rakefile

@@ -19,7 +19,7 @@ require 'rake/contrib/rubyforgepublisher'
 CLEAN.include('*.tmp')
 CLOBBER.include("html", 'pkg')
 
-PKG_VERSION = '0.8.8'
+PKG_VERSION = '0.8.9'
 
 PKG_FILES = FileList[
   '[A-Z]*',

data/lib/flexmock/partial_mock.rb

@@ -12,7 +12,7 @@
 require 'flexmock/noop'
 
 class FlexMock
-  
+
   # #########################################################################
   # PartialMockProxy is used to mate the mock framework to an existing
   # object.  The object is "enhanced" with a reference to a mock
@@ -30,9 +30,9 @@ class FlexMock
 
     # The following methods are added to partial mocks so that they
     # can act like a mock.
-    
+
     MOCK_METHODS = [
-      :should_receive, :new_instances, 
+      :should_receive, :new_instances,
       :flexmock_get,   :flexmock_teardown, :flexmock_verify
     ]
 
@@ -43,10 +43,10 @@ class FlexMock
       @method_definitions = {}
       @methods_proxied = []
       unless safe_mode
-        add_mock_method(@obj, :should_receive)
+        add_mock_method(:should_receive)
         MOCK_METHODS.each do |sym|
           unless @obj.respond_to?(sym)
-            add_mock_method(@obj, sym)
+            add_mock_method(sym)
           end
         end
       end
@@ -88,14 +88,18 @@ class FlexMock
       end
     end
 
-    def add_mock_method(obj, method_name)
+    def add_mock_method(method_name)
       stow_existing_definition(method_name)
-      eval_line = __LINE__ + 1
-      eval %{
-        def obj.#{method_name}(*args, &block)
-          @flexmock_proxy.#{method_name}(*args, &block)
-        end
-      }, binding, __FILE__, eval_line
+      sclass.module_eval do
+        define_method(method_name) { |*args, &block|
+          proxy = instance_variable_get("@flexmock_proxy")
+          if proxy.nil?
+            fail "Missing FlexMock proxy " +
+              "(for method_name=#{method_name.inspect}, self=\#{self})"
+          end
+          proxy.send(method_name, *args, &block)
+        }
+      end
     end
 
     # :call-seq:
@@ -123,7 +127,7 @@ class FlexMock
       allocators.each do |allocate_method|
         # HACK: Without the following lambda, Ruby 1.9 will not bind
         # the allocate_method parameter correctly.
-        lambda { } 
+        lambda { }
         self.should_receive(allocate_method).and_return { |*args|
           new_obj = invoke_original(allocate_method, args)
           mock = flexmock_container.flexmock(new_obj)
@@ -245,14 +249,14 @@ class FlexMock
         eval_line = __LINE__ + 1
         sclass.class_eval %{
           def #{method_name}(*args, &block)
-            @flexmock_proxy.mock.__send__(:#{method_name}, *args, &block) 
+            @flexmock_proxy.mock.__send__(:#{method_name}, *args, &block)
           end
         }, __FILE__, eval_line
       else
         eval_line = __LINE__ + 1
         sclass.class_eval %{
           def #{method_name}(*args, &block)
-            @flexmock_proxy.mock.#{method_name}(*args, &block) 
+            @flexmock_proxy.mock.#{method_name}(*args, &block)
           end
         }, __FILE__, eval_line
         make_rcov_recognize_the_above_eval_is_covered = true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flexmock
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: false
   segments: 
   - 0
   - 8
-  - 8
-  version: 0.8.8
+  - 9
+  version: 0.8.9
 platform: ruby
 authors: 
 - Jim Weirich
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 -04:00
+date: 2010-10-15 00:00:00 -04:00
 default_executable: 
 dependencies: []