kagemusha 0.0.2 → 0.0.3

data/History.txt

@@ -1,4 +1,8 @@
 
+== 0.0.3 2007-09-10
+
+...
+
 == 0.0.2 2007-08-27
 
 ...

data/lib/kagemusha/core.rb

@@ -1,6 +1,6 @@
 
 #==============================================================================#
-# $Id: core.rb 35 2007-08-27 12:59:31Z yuyakato $
+# $Id: core.rb 45 2007-09-07 04:49:51Z yuyakato $
 #==============================================================================#
 
 class Kagemusha #:nodoc:
@@ -22,7 +22,7 @@ class Kagemusha #:nodoc:
   alias :defs :define_class_method
 
   def undefine_class_method(name) #:nodoc:
-    @class_methods.delete(name.to_s.intern)
+    @class_methods[name.to_s.intern] = false
     return self
   end
   alias :undefs :undefine_class_method
@@ -34,7 +34,7 @@ class Kagemusha #:nodoc:
   alias :def :define_instance_method
 
   def undefine_instance_method(name) #:nodoc:
-    @instance_methods.delete(name.to_s.intern)
+    @instance_methods[name.to_s.intern] = false
     return self
   end
   alias :undef :undefine_instance_method
@@ -44,24 +44,72 @@ class Kagemusha #:nodoc:
     original_instance_methods = {}
 
     @class_methods.each { |name, proc|
-      method = @meta.instance_method(name)
-      @meta.instance_eval { define_method(name, proc) }
-      original_class_methods[name] = method
+      if proc
+        begin
+          # replace method
+          method = @meta.instance_method(name)
+          @meta.instance_eval { define_method(name, proc) }
+          original_class_methods[name] = method
+        rescue NameError
+          # insert method
+          @meta.instance_eval { define_method(name, proc) }
+          original_class_methods[name] = false
+        end
+      else
+        begin
+          # remove method
+          method = @meta.instance_method(name)
+          @meta.instance_eval { undef_method(name) }
+          original_class_methods[name] = method
+        rescue NameError
+          # nop
+        end
+      end
     }
 
     @instance_methods.each { |name, proc|
-      method = @klass.instance_method(name)
-      @klass.instance_eval { define_method(name, proc) }
-      original_instance_methods[name] = method
+      if proc
+        begin
+          # replace method
+          method = @klass.instance_method(name)
+          @klass.instance_eval { define_method(name, proc) }
+          original_instance_methods[name] = method
+        rescue NameError
+          # insert method
+          @klass.instance_eval { define_method(name, proc) }
+          original_instance_methods[name] = false
+        end
+      else
+        begin
+          # remove method
+          method = @klass.instance_method(name)
+          @klass.instance_eval { undef_method(name) }
+          original_instance_methods[name] = method
+        rescue NameError
+          # nop
+        end
+      end
     }
 
     return yield
   ensure
     original_class_methods.each { |name, method|
-      @meta.instance_eval { define_method(name, method) }
+      if method
+        # replace method
+        @meta.instance_eval { define_method(name, method) }
+      else
+        # remove method
+        @meta.instance_eval { undef_method(name) }
+      end
     }
     original_instance_methods.each { |name, method|
-      @klass.instance_eval { define_method(name, method) }
+      if method
+        # replace method
+        @klass.instance_eval { define_method(name, method) }
+      else
+        # remove method
+        @klass.instance_eval { undef_method(name) }
+      end
     }
   end
 end

data/lib/kagemusha/date.rb

@@ -1,9 +1,9 @@
 
 #==============================================================================#
-# $Id: date.rb 37 2007-08-27 13:02:39Z yuyakato $
+# $Id: date.rb 44 2007-09-07 02:32:58Z yuyakato $
 #==============================================================================#
 
-require "kagemusha"
+require File.join(File.dirname(__FILE__), "core")
 require "date"
 
 #==============================================================================#

data/lib/kagemusha/datetime.rb

@@ -1,10 +1,10 @@
 
 #==============================================================================#
-# $Id: datetime.rb 37 2007-08-27 13:02:39Z yuyakato $
+# $Id: datetime.rb 44 2007-09-07 02:32:58Z yuyakato $
 #==============================================================================#
 
-require "kagemusha/date"
-require "kagemusha/time"
+require File.join(File.dirname(__FILE__), "date")
+require File.join(File.dirname(__FILE__), "time")
 
 #==============================================================================#
 

data/lib/kagemusha/rand.rb

@@ -1,9 +1,9 @@
 
 #==============================================================================#
-# $Id: rand.rb 33 2007-08-27 12:25:50Z yuyakato $
+# $Id: rand.rb 44 2007-09-07 02:32:58Z yuyakato $
 #==============================================================================#
 
-require "kagemusha"
+require File.join(File.dirname(__FILE__), "core")
 
 #==============================================================================#
 

data/lib/kagemusha/time.rb

@@ -1,9 +1,9 @@
 
 #==============================================================================#
-# $Id: time.rb 33 2007-08-27 12:25:50Z yuyakato $
+# $Id: time.rb 44 2007-09-07 02:32:58Z yuyakato $
 #==============================================================================#
 
-require "kagemusha"
+require File.join(File.dirname(__FILE__), "core")
 
 #==============================================================================#
 

data/lib/kagemusha/version.rb

@@ -1,13 +1,13 @@
 
 #==============================================================================#
-# $Id: version.rb 33 2007-08-27 12:25:50Z yuyakato $
+# $Id: version.rb 44 2007-09-07 02:32:58Z yuyakato $
 #==============================================================================#
 
 class Kagemusha #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/kagemusha.rb

@@ -1,10 +1,10 @@
 
 #==============================================================================#
-# $Id: kagemusha.rb 4 2007-08-15 08:10:42Z yuyakato $
+# $Id: kagemusha.rb 44 2007-09-07 02:32:58Z yuyakato $
 #==============================================================================#
 
-require "kagemusha/version"
-require "kagemusha/core"
+require File.join(File.dirname(__FILE__), "kagemusha", "version")
+require File.join(File.dirname(__FILE__), "kagemusha", "core")
 
 #==============================================================================#
 #==============================================================================#

data/test/test_kagemusha.rb

@@ -1,6 +1,6 @@
 
 #==============================================================================#
-# $Id: test_kagemusha.rb 35 2007-08-27 12:59:31Z yuyakato $
+# $Id: test_kagemusha.rb 45 2007-09-07 04:49:51Z yuyakato $
 #==============================================================================#
 
 require File.dirname(__FILE__) + "/test_helper.rb"
@@ -56,14 +56,14 @@ class TestKagemusha < Test::Unit::TestCase
     ret = @musha.undefine_class_method("foo")
 
     assert_same(ret, @musha)
-    assert_equal(nil,    @musha.instance_eval { @class_methods[:foo] })
+    assert_equal(false,  @musha.instance_eval { @class_methods[:foo] })
     assert_equal(block2, @musha.instance_eval { @class_methods[:bar] })
 
     ret = @musha.undefine_class_method(:bar)
 
     assert_same(ret, @musha)
-    assert_equal(nil, @musha.instance_eval { @class_methods[:foo] })
-    assert_equal(nil, @musha.instance_eval { @class_methods[:bar] })
+    assert_equal(false, @musha.instance_eval { @class_methods[:foo] })
+    assert_equal(false, @musha.instance_eval { @class_methods[:bar] })
   end
 
   def test_defs_and_undefs
@@ -79,7 +79,7 @@ class TestKagemusha < Test::Unit::TestCase
     ret = @musha.undefs(:foo)
 
     assert_same(ret, @musha)
-    assert_equal(nil, @musha.instance_eval { @class_methods[:foo] })
+    assert_equal(false, @musha.instance_eval { @class_methods[:foo] })
   end
 
   def test_define_instance_method_and_undefine
@@ -104,14 +104,14 @@ class TestKagemusha < Test::Unit::TestCase
     ret = @musha.undefine_instance_method("foo")
 
     assert_same(ret, @musha)
-    assert_equal(nil,    @musha.instance_eval { @instance_methods[:foo] })
+    assert_equal(false,  @musha.instance_eval { @instance_methods[:foo] })
     assert_equal(block2, @musha.instance_eval { @instance_methods[:bar] })
 
     ret = @musha.undefine_instance_method(:bar)
 
     assert_same(ret, @musha)
-    assert_equal(nil, @musha.instance_eval { @instance_methods[:foo] })
-    assert_equal(nil, @musha.instance_eval { @instance_methods[:bar] })
+    assert_equal(false, @musha.instance_eval { @instance_methods[:foo] })
+    assert_equal(false, @musha.instance_eval { @instance_methods[:bar] })
   end
 
   def test_def_and_undef
@@ -127,7 +127,7 @@ class TestKagemusha < Test::Unit::TestCase
     ret = @musha.undef(:foo)
 
     assert_same(ret, @musha)
-    assert_equal(nil, @musha.instance_eval { @instance_methods[:foo] })
+    assert_equal(false, @musha.instance_eval { @instance_methods[:foo] })
   end
 
   def test_swap_class_method
@@ -159,6 +159,86 @@ class TestKagemusha < Test::Unit::TestCase
     assert_equal(1, ret)
     assert_equal("foo", target.to_s)
   end
+
+  def test_insert_new_class_method
+    assert_raise(NoMethodError) {
+      String.foo
+    }
+
+    @musha.defs(:foo) { :ok }
+
+    assert_raise(NoMethodError) {
+      String.foo
+    }
+    assert_nothing_raised {
+      @musha.swap {
+        assert_equal(:ok, String.foo)
+      }
+    }
+    assert_raise(NoMethodError) {
+      String.foo
+    }
+  end
+
+  def test_remove_exist_class_method
+    assert_nothing_raised {
+      String.clone
+    }
+
+    @musha.undefs(:clone)
+
+    assert_nothing_raised {
+      String.clone
+    }
+    assert_raise(NoMethodError) {
+      @musha.swap {
+        String.clone
+      }
+    }
+    assert_nothing_raised {
+      String.clone
+    }
+  end
+
+  def test_insert_new_instance_method
+    assert_raise(NoMethodError) {
+      "".foo
+    }
+
+    @musha.def(:foo) { :ok }
+
+    assert_raise(NoMethodError) {
+      "".foo
+    }
+    assert_nothing_raised {
+      @musha.swap {
+        assert_equal(:ok, "".foo)
+      }
+    }
+    assert_raise(NoMethodError) {
+      "".foo
+    }
+  end
+
+  def test_remove_exist_instance_method
+    assert_nothing_raised {
+      "".clone
+    }
+
+    @musha.undef(:clone)
+
+    assert_nothing_raised {
+      "".clone
+    }
+    assert_raise(NoMethodError) {
+      @musha.swap {
+        "".clone
+      }
+    }
+    assert_nothing_raised {
+      "".clone
+    }
+  end
 end
 
 #==============================================================================#

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Kagemusha &#8211; 影武者</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/kagemusha"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/kagemusha" class="numbers">0.0.2</a>
+      <a href="http://rubyforge.org/projects/kagemusha" class="numbers">0.0.3</a>
     </div>
     <h2>What</h2>
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: kagemusha
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2007-08-27 00:00:00 +09:00
+  version: 0.0.3
+date: 2007-09-11 00:00:00 +09:00
 summary: Kagemusha is a library of helper functions for testing Ruby scripts.
 require_paths: 
 - lib