facon 0.2 → 0.3

data/History.txt

@@ -1,7 +1,12 @@
-=== 0.1 / 2008-02-09
+=== 0.3 / 2008-02-18
 
-* First release!
+* Fixed a bug with proxied methods not being cleared.
+* Fixed a bug where the same mocks were repeatedly being added to $facon_mocks.
 
 === 0.2 / 2008-02-13
 
 * Use #after block to verify mocks so that the stack trace is more helpful (it now actually shows the line in the spec where the mock error occurred).
+
+=== 0.1 / 2008-02-09
+
+* First release!

data/lib/facon.rb

@@ -12,5 +12,5 @@ require 'facon/core_ext/object'
 # Facon is a mocking library in the spirit of the Bacon spec library. Small,
 # compact, and works with Bacon.
 module Facon
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

data/lib/facon/baconize.rb

@@ -45,13 +45,16 @@ module Facon
         $facon_mocks.each { |mock| mock.spec_verify }
       end
 
+      def teardown_facon_mocks
+        $facon_mocks.each { |mock| mock.spec_reset }
+        $facon_mocks.clear
+      end
+
       def it_with_mock_verification(description, &block)
-        before do
-          setup_facon_mocks
-        end
-        setup_facon_mocks
+        @before.unshift(lambda { setup_facon_mocks })
         after do
           verify_facon_mocks
+          teardown_facon_mocks
         end
         it_without_mock_verification(description, &block)
       end

data/lib/facon/proxy.rb

@@ -10,12 +10,12 @@ module Facon
       @target, @name = target, name
       @expectations = []
       @stubs = []
+      @proxied_methods = []
       @error_generator = ErrorGenerator.new(target, name)
     end
 
     def add_stub(expected_from, method)
-      $facon_mocks << (@target) unless $facon_mocks.nil?
-      define_expected_method(method)
+      add_method(method)
 
       # A stub is really an expectation that can be called any number of times.
       @stubs.unshift(Expectation.new(@error_generator, @expectation_ordering, expected_from, method, nil, :any))
@@ -23,16 +23,14 @@ module Facon
     end
 
     def add_expectation(expected_from, method, &block)
-      $facon_mocks << (@target) unless $facon_mocks.nil?
-      define_expected_method(method)
+      add_method(method)
 
       @expectations << Expectation.new(@error_generator, @expectation_ordering, expected_from, method, (block_given? ? block : nil), 1)
       @expectations.last
     end
 
     def add_negative_expectation(expected_from, method, &block)
-      $facon_mocks << (@target) unless $facon_mocks.nil?
-      define_expected_method(method)
+      add_method(method)
 
       @expectations << NegativeExpectation.new(@error_generator, @expectation_ordering, expected_from, method, (block_given? ? block : nil))
       @expectations.last
@@ -59,12 +57,27 @@ module Facon
     def reset
       @expectations.clear
       @stubs.clear
+      reset_proxied_methods
+      @proxied_methods.clear
     end
 
     private
+      def add_method(method)
+        $facon_mocks << @target unless $facon_mocks.nil? || $facon_mocks.detect { |m| m.equal?(@target) }
+        define_expected_method(method)
+      end
+
       # Defines an expected method that simply calls the
       # <code>message_received</code> method.
       def define_expected_method(method)
+        if @target.respond_to?(method) && !metaclass.method_defined?(munge(method))
+          munged_method = munge(method)
+          metaclass.instance_eval do
+            alias_method munged_method, method if method_defined?(method.to_s)
+          end
+          @proxied_methods << method
+        end
+
         metaclass_eval(<<-EOF, __FILE__, __LINE__)
           def #{method}(*args, &block)
             mock_proxy.message_received(:#{method}, *args, &block)
@@ -72,6 +85,24 @@ module Facon
         EOF
       end
 
+      def munge(method)
+        "proxied_by_facon__#{method.to_s}".to_sym
+      end
+
+      def reset_proxied_methods
+        @proxied_methods.each do |method|
+          munged_method = munge(method)
+          metaclass.instance_eval do
+            if method_defined?(munged_method.to_s)
+              alias_method method, munged_method
+              undef_method munged_method
+            else
+              undef_method method
+            end
+          end
+        end
+      end
+
       def metaclass
         (class << @target; self; end)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: facon
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Cheah Chu Yeow
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-13 00:00:00 +08:00
+date: 2008-02-18 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency