kagemusha 0.0.7 → 0.0.8

data/History.ja.txt

@@ -1,4 +1,15 @@
 
+== 0.0.8 2009-02-09
+
+* Ruby 1.9.1対応
+  * マジックコメントを追加
+  * ブロック引数のチェックが厳しくなった変更に対応
+  * メソッド一覧を取得するメソッド（methods等）がシンボルの配列を返すようになった変更に対応
+
+== 0.0.7 2008-07-19
+
+* lib/kagemusha/composite.rb、test/test_composite.rbがgemに格納されていなかったのを修正 :-(
+
 == 0.0.6 2008-07-17
 
 * Kagemusha::Compositeクラスを追加

data/History.txt

@@ -1,4 +1,12 @@
 
+== 0.0.8 2009-02-09
+
+...
+
+== 0.0.7 2008-07-19
+
+...
+
 == 0.0.6 2008-07-17
 
 ...

data/examples/date.rb

@@ -1,5 +1,5 @@
-
-# $Id: date.rb 40 2007-08-27 13:21:13Z yuyakato $
+# coding: utf-8
+# $Id: date.rb 120 2009-02-09 08:22:25Z yuyakato $
 
 require "rubygems"
 require "kagemusha/date"

data/examples/datetime.rb

@@ -1,5 +1,5 @@
-
-# $Id: datetime.rb 40 2007-08-27 13:21:13Z yuyakato $
+# coding: utf-8
+# $Id: datetime.rb 120 2009-02-09 08:22:25Z yuyakato $
 
 require "rubygems"
 require "kagemusha/datetime"

data/examples/first.rb

@@ -1,5 +1,5 @@
-
-# $Id: first.rb 40 2007-08-27 13:21:13Z yuyakato $
+# coding: utf-8
+# $Id: first.rb 120 2009-02-09 08:22:25Z yuyakato $
 
 require "rubygems"
 require "kagemusha"

data/examples/rand.rb

@@ -1,5 +1,5 @@
-
-# $Id: rand.rb 40 2007-08-27 13:21:13Z yuyakato $
+# coding: utf-8
+# $Id: rand.rb 120 2009-02-09 08:22:25Z yuyakato $
 
 require "rubygems"
 require "kagemusha/rand"

data/examples/style.rb

@@ -1,5 +1,5 @@
-
-# $Id: style.rb 38 2007-08-27 13:03:39Z yuyakato $
+# coding: utf-8
+# $Id: style.rb 120 2009-02-09 08:22:25Z yuyakato $
 
 require "rubygems"
 require "kagemusha"
@@ -12,7 +12,7 @@ p one_plus_one #=> 2
 
 # Normal Style.
 musha = Kagemusha.new(Fixnum)
-musha.def(:+) { 1 }
+musha.def(:+) { |x| 1 }
 musha.swap {
   p one_plus_one #=> 1
 }
@@ -21,7 +21,7 @@ p one_plus_one #=> 2
 
 # Block Style.
 Kagemusha.new(Fixnum) { |m|
-  m.def(:+) { 1 }
+  m.def(:+) { |x| 1 }
   m.swap {
     p one_plus_one #=> 1
   }
@@ -31,7 +31,7 @@ p one_plus_one #=> 2
 
 # Chain Style.
 Kagemusha.new(Fixnum).
-  def(:+) { 1 }.
+  def(:+) { |x| 1 }.
   swap {
     p one_plus_one #=> 1
   }

data/examples/time.rb

@@ -1,5 +1,5 @@
-
-# $Id: time.rb 40 2007-08-27 13:21:13Z yuyakato $
+# coding: utf-8
+# $Id: time.rb 120 2009-02-09 08:22:25Z yuyakato $
 
 require "rubygems"
 require "kagemusha/time"

data/lib/kagemusha.rb

@@ -1,6 +1,7 @@
+# coding: utf-8
 
 #==============================================================================#
-# $Id: kagemusha.rb 44 2007-09-07 02:32:58Z yuyakato $
+# $Id: kagemusha.rb 120 2009-02-09 08:22:25Z yuyakato $
 #==============================================================================#
 
 require File.join(File.dirname(__FILE__), "kagemusha", "version")

data/lib/kagemusha/composite.rb

@@ -1,6 +1,7 @@
+# coding: utf-8
 
 #==============================================================================#
-# $Id: composite.rb 99 2008-07-17 13:56:26Z yuyakato $
+# $Id: composite.rb 120 2009-02-09 08:22:25Z yuyakato $
 #==============================================================================#
 
 class Kagemusha

data/lib/kagemusha/core.rb

@@ -1,6 +1,7 @@
+# coding: utf-8
 
 #==============================================================================#
-# $Id: core.rb 97 2008-07-17 13:40:55Z yuyakato $
+# $Id: core.rb 120 2009-02-09 08:22:25Z yuyakato $
 #==============================================================================#
 
 require File.join(File.dirname(__FILE__), "composite")
@@ -20,25 +21,25 @@ class Kagemusha #:nodoc:
   end
 
   def define_class_method(name, &block) #:nodoc:
-    @class_methods[name.to_s.intern] = block
+    @class_methods[name.to_s.to_sym] = block
     return self
   end
   alias :defs :define_class_method
 
   def undefine_class_method(name) #:nodoc:
-    @class_methods[name.to_s.intern] = false
+    @class_methods[name.to_s.to_sym] = false
     return self
   end
   alias :undefs :undefine_class_method
 
   def define_instance_method(name, &block) #:nodoc:
-    @instance_methods[name.to_s.intern] = block
+    @instance_methods[name.to_s.to_sym] = block
     return self
   end
   alias :def :define_instance_method
 
   def undefine_instance_method(name) #:nodoc:
-    @instance_methods[name.to_s.intern] = false
+    @instance_methods[name.to_s.to_sym] = false
     return self
   end
   alias :undef :undefine_instance_method
@@ -48,16 +49,16 @@ class Kagemusha #:nodoc:
       if proc
         begin
           # replace method
-          attr = get_accessibility(@meta, name.to_s)
+          attr = get_accessibility(@meta, name)
 
-          methods = @klass.singleton_methods(false)
+          methods = to_symbols(@klass.singleton_methods(false))
 
           method = @meta.instance_method(name)
 
           @meta.instance_eval { define_method(name, proc) }
           @meta.instance_eval { private(name) } if attr == :private
 
-          (methods.include?(name.to_s) ? [name, :define, nil, method] : [name, :remove])
+          (methods.include?(name) ? [name, :define, nil, method] : [name, :remove])
         rescue NameError
           # insert method
           @meta.instance_eval { define_method(name, proc) }
@@ -79,11 +80,11 @@ class Kagemusha #:nodoc:
       if proc
         begin
           # replace method
-          attr = get_accessibility(@klass, name.to_s)
+          attr = get_accessibility(@klass, name)
 
-          methods  = @klass.public_instance_methods(false)
-          methods += @klass.protected_instance_methods(false)
-          methods += @klass.private_instance_methods(false)
+          methods  = to_symbols(@klass.public_instance_methods(false))
+          methods += to_symbols(@klass.protected_instance_methods(false))
+          methods += to_symbols(@klass.private_instance_methods(false))
 
           method = @klass.instance_method(name)
 
@@ -91,7 +92,7 @@ class Kagemusha #:nodoc:
           @klass.instance_eval { protected(name) } if attr == :protected
           @klass.instance_eval { private(name)   } if attr == :private
 
-          (methods.include?(name.to_s) ? [name, :define, attr, method] : [name, :remove])
+          (methods.include?(name) ? [name, :define, attr, method] : [name, :remove])
         rescue NameError
           # insert method
           @klass.instance_eval { define_method(name, proc) }
@@ -144,11 +145,15 @@ class Kagemusha #:nodoc:
   private
 
   def get_accessibility(target, name)
-    return :public    if target.public_instance_methods(true).include?(name)
-    return :protected if target.protected_instance_methods(true).include?(name)
-    return :private   if target.private_instance_methods(true).include?(name)
+    return :public    if to_symbols(target.public_instance_methods(true)).include?(name)
+    return :protected if to_symbols(target.protected_instance_methods(true)).include?(name)
+    return :private   if to_symbols(target.private_instance_methods(true)).include?(name)
     return nil
   end
+
+  def to_symbols(array)
+    return array.map { |item| item.to_sym }
+  end
 end
 
 #==============================================================================#

data/lib/kagemusha/date.rb

@@ -1,6 +1,7 @@
+# coding: utf-8
 
 #==============================================================================#
-# $Id: date.rb 44 2007-09-07 02:32:58Z yuyakato $
+# $Id: date.rb 120 2009-02-09 08:22:25Z yuyakato $
 #==============================================================================#
 
 require File.join(File.dirname(__FILE__), "core")

data/lib/kagemusha/datetime.rb

@@ -1,6 +1,7 @@
+# coding: utf-8
 
 #==============================================================================#
-# $Id: datetime.rb 99 2008-07-17 13:56:26Z yuyakato $
+# $Id: datetime.rb 120 2009-02-09 08:22:25Z yuyakato $
 #==============================================================================#
 
 require File.join(File.dirname(__FILE__), "date")

data/lib/kagemusha/rand.rb

@@ -1,6 +1,7 @@
+# coding: utf-8
 
 #==============================================================================#
-# $Id: rand.rb 44 2007-09-07 02:32:58Z yuyakato $
+# $Id: rand.rb 120 2009-02-09 08:22:25Z yuyakato $
 #==============================================================================#
 
 require File.join(File.dirname(__FILE__), "core")
@@ -15,7 +16,7 @@ class Kagemusha #:nodoc:
       end
 
       musha = Kagemusha.new(Kernel)
-      musha.def(:rand) { num }
+      musha.def(:rand) { |*x| num }
 
       return musha
     end

data/lib/kagemusha/time.rb

@@ -1,6 +1,7 @@
+# coding: utf-8
 
 #==============================================================================#
-# $Id: time.rb 44 2007-09-07 02:32:58Z yuyakato $
+# $Id: time.rb 120 2009-02-09 08:22:25Z yuyakato $
 #==============================================================================#
 
 require File.join(File.dirname(__FILE__), "core")

data/lib/kagemusha/version.rb

@@ -1,13 +1,14 @@
+# coding: utf-8
 
 #==============================================================================#
-# $Id: version.rb 103 2008-07-19 06:13:27Z yuyakato $
+# $Id: version.rb 120 2009-02-09 08:22:25Z yuyakato $
 #==============================================================================#
 
 class Kagemusha #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 7
+    TINY  = 8
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_bugs.rb

@@ -1,6 +1,7 @@
+# coding: utf-8
 
 #==============================================================================#
-# $Id: test_bugs.rb 66 2008-07-16 03:04:32Z yuyakato $
+# $Id: test_bugs.rb 120 2009-02-09 08:22:25Z yuyakato $
 #==============================================================================#
 
 require File.dirname(__FILE__) + "/test_helper.rb"
@@ -56,11 +57,19 @@ class TestBugs < Test::Unit::TestCase
 
     assert_equal(:replaced, child_c.target)
 
-    child_m.instance_eval { define_method(name, old_method) }
-
-    assert_raise(TypeError) {
-      child_c.target
-    }
+    if RUBY_VERSION < "1.9.0"
+      child_m.instance_eval { define_method(name, old_method) }
+
+      # @1.8.6 TypeError: singleton method bound for a different object
+      assert_raise(TypeError) {
+        child_c.target
+      }
+    else
+      # @1.9.1 TypeError: can't bind singleton method to a different class
+      assert_raise(TypeError) {
+        child_m.instance_eval { define_method(name, old_method) }
+      }
+    end
   end
 
   def test_report01_correct_mechanism
@@ -77,20 +86,20 @@ class TestBugs < Test::Unit::TestCase
     new_method = proc { :replaced }
     old_method = child_m.instance_method(name)
 
-    assert_equal(false, child_c.singleton_methods(false).include?(name.to_s))
+    assert_equal(false, child_c.singleton_methods(false).map { |n| n.to_sym }.include?(name))
 
     child_m.instance_eval { define_method(name, new_method) }
 
     assert_equal(:replaced, child_c.target)
 
-    child_m.instance_eval { remove_method(name) }
+    child_m.instance_eval { remove_method(name) } # define_method -> remove_method
 
     assert_equal(:original, child_c.target)
   end
 
   def test_report02
     musha = Kagemusha.new(Kernel)
-    musha.def(:Integer) { :replaced }
+    musha.def(:Integer) { |x| :replaced }
 
     assert(1, Integer("1"))
 

data/test/test_complex_cases.rb

@@ -1,6 +1,7 @@
+# coding: utf-8
 
 #==============================================================================#
-# $Id: test_complex_cases.rb 84 2008-07-17 05:37:11Z yuyakato $
+# $Id: test_complex_cases.rb 120 2009-02-09 08:22:25Z yuyakato $
 #==============================================================================#
 
 require File.dirname(__FILE__) + "/test_helper.rb"
@@ -210,8 +211,16 @@ class TestComplexCases < Test::Unit::TestCase
     }
 
     assert_equal(old_value, C1.c1_class)
-    assert_equal(old_value, C2.c1_class) # FIXME: TypeError: singleton method bound for a different object
-    assert_equal(old_value, C3.c1_class) # FIXME: TypeError: singleton method bound for a different object
+
+    if RUBY_VERSION < "1.9.0"
+      # @1.8.6 TypeError: singleton method bound for a different object
+      assert_raise(TypeError) { C2.c1_class }
+      assert_raise(TypeError) { C3.c1_class }
+    else
+      # @1.9.1 No Error
+      assert_equal(old_value, C2.c1_class)
+      assert_equal(old_value, C3.c1_class)
+    end
   end
 
   def test_replace_private_class_method_defined_on_self_class

data/test/test_composite.rb

@@ -1,6 +1,7 @@
+# coding: utf-8
 
 #==============================================================================#
-# $Id: test_composite.rb 99 2008-07-17 13:56:26Z yuyakato $
+# $Id: test_composite.rb 120 2009-02-09 08:22:25Z yuyakato $
 #==============================================================================#
 
 require File.dirname(__FILE__) + "/test_helper.rb"

data/test/test_date.rb

@@ -1,6 +1,7 @@
+# coding: utf-8
 
 #==============================================================================#
-# $Id: test_date.rb 37 2007-08-27 13:02:39Z yuyakato $
+# $Id: test_date.rb 120 2009-02-09 08:22:25Z yuyakato $
 #==============================================================================#
 
 require File.dirname(__FILE__) + "/test_helper.rb"

data/test/test_datetime.rb

@@ -1,6 +1,7 @@
+# coding: utf-8
 
 #==============================================================================#
-# $Id: test_datetime.rb 37 2007-08-27 13:02:39Z yuyakato $
+# $Id: test_datetime.rb 120 2009-02-09 08:22:25Z yuyakato $
 #==============================================================================#
 
 require File.dirname(__FILE__) + "/test_helper.rb"

data/test/test_helper.rb

@@ -1,13 +1,11 @@
+# coding: utf-8
 
 #==============================================================================#
-# $Id: test_helper.rb 90 2008-07-17 12:31:43Z yuyakato $
+# $Id: test_helper.rb 120 2009-02-09 08:22:25Z yuyakato $
 #==============================================================================#
 
 require "test/unit"
 require File.dirname(__FILE__) + "/../lib/kagemusha"
 
-require "rubygems"
-require "redgreen"
-
 #==============================================================================#
 #==============================================================================#

data/test/test_kagemusha.rb

@@ -1,6 +1,7 @@
+# coding: utf-8
 
 #==============================================================================#
-# $Id: test_kagemusha.rb 97 2008-07-17 13:40:55Z yuyakato $
+# $Id: test_kagemusha.rb 120 2009-02-09 08:22:25Z yuyakato $
 #==============================================================================#
 
 require File.dirname(__FILE__) + "/test_helper.rb"
@@ -132,7 +133,7 @@ class TestKagemusha < Test::Unit::TestCase
 
   def test_swap_class_method
     @musha = Kagemusha.new(Regexp)
-    @musha.defs(:compile) { /bar/ }
+    @musha.defs(:compile) { |string| /bar/ }
 
     assert_equal(/foo/, Regexp.compile("foo"))
 

data/test/test_rand.rb

@@ -1,6 +1,7 @@
+# coding: utf-8
 
 #==============================================================================#
-# $Id: test_rand.rb 68 2008-07-16 04:17:33Z yuyakato $
+# $Id: test_rand.rb 120 2009-02-09 08:22:25Z yuyakato $
 #==============================================================================#
 
 require File.dirname(__FILE__) + "/test_helper.rb"

data/test/test_time.rb

@@ -1,6 +1,7 @@
+# coding: utf-8
 
 #==============================================================================#
-# $Id: test_time.rb 37 2007-08-27 13:02:39Z yuyakato $
+# $Id: test_time.rb 120 2009-02-09 08:22:25Z yuyakato $
 #==============================================================================#
 
 require File.dirname(__FILE__) + "/test_helper.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kagemusha
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Yuya Kato
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-19 00:00:00 +09:00
+date: 2009-02-09 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,12 +115,12 @@ signing_key:
 specification_version: 2
 summary: Kagemusha is a library of helper functions for testing Ruby scripts.
 test_files: 
-- test/test_kagemusha.rb
-- test/test_helper.rb
-- test/test_datetime.rb
-- test/test_time.rb
-- test/test_rand.rb
-- test/test_date.rb
 - test/test_bugs.rb
 - test/test_complex_cases.rb
 - test/test_composite.rb
+- test/test_date.rb
+- test/test_datetime.rb
+- test/test_helper.rb
+- test/test_kagemusha.rb
+- test/test_rand.rb
+- test/test_time.rb