synthesis 0.0.4 → 0.0.5

data/Rakefile

@@ -71,7 +71,7 @@ end
 
 gem_spec = Gem::Specification.new do |s|
   s.name = 'synthesis'
-  s.version = '0.0.4'
+  s.version = '0.0.5'
   s.platform = Gem::Platform::RUBY
   s.rubyforge_project = "synthesis"
   s.summary, s.description = 'A tool for Synthesized Testing'

data/lib/synthesis/adapter/mocha/expectation_record.rb

@@ -5,8 +5,7 @@ module Synthesis
 
       def add_expectation(obj, meth, track, args = [])
         # Ignone things like "foo = mock"
-        return nil if obj.is_a?(Class::AnyInstance)
-        add_mocha_expectation(obj, meth, track, args)
+        add_mocha_expectation(obj, meth, track, args) unless obj.is_a?(Class::AnyInstance)
       end
     end
   end

data/lib/synthesis/adapter/mocha/method_invocation_watcher.rb

@@ -4,8 +4,7 @@ module Synthesis
       alias mocha_invoked invoked
 
       def invoked(receiver, method, args = [])
-        return nil if receiver.mocked?
-        mocha_invoked(receiver, method, args)
+        mocha_invoked(receiver, method, args) unless receiver.mocked?
       end
     end
   end

data/lib/synthesis/expectation.rb

@@ -16,8 +16,6 @@ module Synthesis
       def record_invocations
         meta_receiver.extend Recordable
         meta_receiver.recordable_method @method
-      rescue NameError => e
-        log "Failed to record #{@method} on #{@receiver} : #{e.message}"
       end
       
       def ==(other)

data/lib/synthesis/recordable.rb

@@ -1,17 +1,40 @@
 module Synthesis
   module Recordable
-    def recordable_method(method)
-      unless method_defined? "__recordable__#{method}".intern
-        alias_method "__recordable__#{method}".intern, method
-        class_eval @@recordable_method_def[method]
+    def recordable_method(meth)
+      if method_defined? meth
+        defined_recordable_method meth
+      else
+        magic_recordable_method meth
+      end
+    end
+    
+    protected
+    
+    def defined_recordable_method(meth)
+      unless method_defined? "__recordable__#{meth}".intern
+        alias_method "__recordable__#{meth}".intern, meth
+        class_eval @@recordable_method_def[meth]
       end
     end
       
-    @@recordable_method_def = proc { |method| %(
-      def #{method}(*args, &block)
-        MethodInvocationWatcher.invoked(self, "#{method}".intern, args)
-        send "__recordable__#{method}", *args, &block
+    @@recordable_method_def = proc { |meth| %(
+      def #{meth}(*args, &block)
+        MethodInvocationWatcher.invoked(self, "#{meth}".intern, args)
+        send "__recordable__#{meth}", *args, &block
       end
     )}
+    
+    def magic_recordable_method(meth)
+      class_eval @@recordable_magic_method_def[meth]
+    end
+      
+    @@recordable_magic_method_def = proc { |meth| %(
+      def #{meth}(*args)
+        MethodInvocationWatcher.invoked(self, "#{meth}".intern, args)
+        method_missing(:#{meth}, *args)
+      end
+      
+      def __recordable__#{meth}() raise "Don't ever call me" end
+    )}
   end
 end

data/test/synthesis/recordable_test.rb

@@ -26,5 +26,42 @@ module Synthesis
       foo.expects(:alias_method).never
       foo.recordable_method(:b)
     end
+    
+    def test_defines_non_existent_method
+      foo = Class.new
+      foo.extend Recordable
+      foo.recordable_method(:bar)
+      assert_respond_to(foo.new, :bar)
+    end
+    
+    def test_defines_non_existent_method_recordable_placeholder_method
+      foo = Class.new
+      foo.extend Recordable
+      foo.recordable_method(:bar)
+      assert_respond_to(foo.new, :__recordable__bar)
+    end
+    
+    def test_non_existed_method_placeholder_raises
+      foo = Class.new
+      foo.extend Recordable
+      foo.recordable_method(:bar)
+      assert_raise(RuntimeError) { foo.new.__recordable__bar }
+    end
+    
+    def test_does_not_redefine_already_defined_magic_method
+      foo = Class.new
+      foo.extend Recordable
+      foo.recordable_method(:b)
+      foo.expects(:alias_method).never
+    end
+    
+    def test_records_magic_method_invocation
+      foo = Class.new {def method_missing(meth, *args) :magic! end}
+      foo.extend Recordable
+      foo.recordable_method(:b)
+      bar = foo.new
+      MethodInvocationWatcher.expects(:invoked).with(bar, :b, [])
+      bar.b
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: synthesis
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Stuart Caborn, George Malamidis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-04 00:00:00 +00:00
+date: 2008-02-05 00:00:00 +00:00
 default_executable: 
 dependencies: []