chaser 0.0.2 → 0.0.3

data/chaser.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chaser}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Grimm", "Ryan Davis", "Eric Hodel", "Kevin Clark"]
-  s.date = %q{2009-11-14}
+  s.date = %q{2009-11-15}
   s.default_executable = %q{chaser}
   s.description = %q{Lightweight mutation testing in any flavor of ruby}
   s.email = %q{andrew.j.grimm@gmail.com}

data/lib/chaser.rb

@@ -17,7 +17,7 @@ class Chaser
   ##
   # The version of Chaser you are using.
 
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
   ##
   # Is this platform MS Windows-like?
@@ -142,25 +142,43 @@ class Chaser
   def unmodify_instance_method
     chaser = self
     @mutated = false
-    @klass.send(:define_method, @method_name) do |*args|
-      chaser.old_method.bind(self).call(*args)
+    chaser_proxy_method_name = "__chaser_proxy__#{@method_name}"
+    @klass.send(:define_method, chaser_proxy_method_name) do |block, *args|
+      chaser.old_method.bind(self).call(*args) {|*yielded_values| block.call(*yielded_values)}
     end
   end
 
   def unmodify_class_method
     chaser = self
     @mutated = false
-    aliasing_class(@method_name).send(:define_method, clean_method_name) do |*args|
-      chaser.old_method.bind(self).call(*args)
+    chaser_proxy_method_name = "__chaser_proxy__#{clean_method_name}"
+    aliasing_class(@method_name).send(:define_method, chaser_proxy_method_name) do |block, *args|
+      chaser.old_method.bind(self).call(*args) {|*yielded_values| block.call(*yielded_values)}
     end
   end
 
+  # Ruby 1.8 doesn't allow define_method to handle blocks.
+  # The blog post http://coderrr.wordpress.com/2008/10/29/using-define_method-with-blocks-in-ruby-18/
+  # show that define_method has problems, and showed how to do workaround_method_code_string
   def modify_instance_method
     chaser = self
     @mutated = true
     @old_method = @klass.instance_method(@method_name)
-    @klass.send(:define_method, @method_name) do |*args|
-      chaser.mutate_value(chaser.old_method.bind(self).call(*args))
+    chaser_proxy_method_name = "__chaser_proxy__#{@method_name}"
+    workaround_method_code_string = <<-EOM
+      def #{@method_name}(*args, &block)
+        #{chaser_proxy_method_name}(block, *args)
+      end
+    EOM
+    @klass.class_eval do
+      eval(workaround_method_code_string)
+    end
+    @klass.send(:define_method, chaser_proxy_method_name) do |block, *args|
+      original_value = chaser.old_method.bind(self).call(*args) do |*yielded_values|
+        mutated_yielded_values = yielded_values.map{|value| chaser.mutate_value(value)}
+        block.call(*mutated_yielded_values)
+      end
+      chaser.mutate_value(original_value)
     end
   end
 
@@ -168,8 +186,21 @@ class Chaser
     chaser = self
     @mutated = true
     @old_method = aliasing_class(@method_name).instance_method(clean_method_name)
-    aliasing_class(@method_name).send(:define_method, clean_method_name) do |*args|
-      chaser.mutate_value(chaser.old_method.bind(self).call(*args))
+    chaser_proxy_method_name = "__chaser_proxy__#{clean_method_name}"
+    workaround_method_code_string = <<-EOM
+      def #{@method_name}(*args, &block)
+        #{chaser_proxy_method_name}(block, *args)
+      end
+    EOM
+    @klass.class_eval do
+      eval(workaround_method_code_string)
+    end
+    aliasing_class(@method_name).send(:define_method, chaser_proxy_method_name) do |block, *args|
+      original_value = chaser.old_method.bind(self).call(*args) do |*yielded_values|
+        mutated_yielded_values = yielded_values.map{|value| chaser.mutate_value(value)}
+        block.call(*mutated_yielded_values)
+      end
+      chaser.mutate_value(original_value)
     end
   end
 

data/test/fixtures/chased.rb

@@ -10,4 +10,31 @@ class Chased
   def self.static_method
     "Zap!"
   end
+
+  def block_using_instance_method
+    result = []
+    block_yielding_instance_method do |i|
+      result << i * 2
+    end
+    result
+  end
+
+  def block_yielding_instance_method
+    yield 1
+    yield 2
+    yield 3
+  end
+
+  def self.block_using_class_method
+    result = []
+    block_yielding_class_method do |i|
+      result << i * 2
+    end
+    result
+  end
+
+  def self.block_yielding_class_method
+    yield 1
+    yield 2
+  end
 end

data/test/test_chaser.rb

@@ -71,6 +71,26 @@ class ChaserTestCase < Test::Unit::TestCase
     assert_equal "Zap!", Chased.static_method, "class method should be back to normal, but it isn't"
   end
 
+  def test_pass_blocks_on_in_instance_methods
+    @chaser = TestChaser.new("Chased", "block_yielding_instance_method")
+    chased = Chased.new
+    assert_equal [2,4,6], chased.block_using_instance_method, "block yielding instance method has been modified before it should have been"
+    @chaser.modify_method
+    assert_equal [12, 14, 16], chased.block_using_instance_method, "yielded values haven't been modified"
+    @chaser.unmodify_method
+    assert_equal [2,4,6], chased.block_using_instance_method, "block yielding instance method has been modified before it should have been"
+  end
+
+  def test_pass_blocks_on_in_class_methods
+    @chaser = TestChaser.new("Chased", "self.block_yielding_class_method")
+    assert_equal [2,4], Chased.block_using_class_method, "block yielding class method has been modified before it should have been"
+    @chaser.modify_method
+    assert_equal [12, 14], Chased.block_using_class_method, "yielded values haven't been modified"
+    @chaser.unmodify_method
+    assert_equal [2,4], Chased.block_using_class_method, "block yielding class method has been modified before it should have been"
+  end
+
+
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chaser
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Andrew Grimm
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-14 00:00:00 +11:00
+date: 2009-11-15 00:00:00 +11:00
 default_executable: chaser
 dependencies: []