Changeset 368 for lang/ruby/module-pluggable

Timestamp:

10/05/07 02:45:20 (4 years ago)

Author:

cho45

Message:

lang/ruby/module-pluggable/test/module-pluggable_test.rb,
lang/ruby/module-pluggable/lib/module/pluggable.rb:

pluggable なクラスを継承してもバグらないようにクラス変数をつかう

Location:

lang/ruby/module-pluggable

Files:

• lib/module/pluggable.rb (modified) (1 diff)
• test/module-pluggable_test.rb (modified) (1 diff)

lang/ruby/module-pluggable/lib/module/pluggable.rb

@@ -14 +14 @@
                 opts = DEFAULT_OPTS.merge(o)
                 opts[:search_path] = name ? name.to_s : opts[:name].to_s unless opts[:search_path]
-                
-                self.instance_eval do
-                        (@opts ||= {})[name] = opts
-                end
+
                 class_eval <<-EOS
                         def #{name}
-                                @#{name} ||= Module::Pluggable::Plugins.new(self.class.instance_variable_get(:@opts)[:#{name}])
+                                @#{name} ||= Module::Pluggable::Plugins.new(@@pluggable_opts[:#{name}])
+                        end
+
+                        def self.set_pluggable_opts(name, opts)
+                                (@@pluggable_opts ||= {})[name] = opts
                         end
                 EOS
+                self.set_pluggable_opts(name, opts)
+                (class << self; self; end).instance_eval do
+                        remove_method(:set_pluggable_opts)
+                end
         end
 

lang/ruby/module-pluggable/test/module-pluggable_test.rb

@@ -39 +39 @@
 
                 assert_equal "This is test plugin.", test.plugins.description["Test"]
+
+                # inherit test
+                test = Class.new(test.class).new
+                assert test.plugins["Test"]
+                assert_equal "This is test plugin.", test.plugins.call(:description)["Test"]
 
                 test = Class.new {