Changeset 357 for lang/ruby/module-pluggable

Timestamp:

10/04/07 05:35:46 (4 years ago)

Author:

cho45

Message:

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

インターフェイスを少し変更。第一引数に name をとるように。
method_missing 時に call に委譲するように

lang/ruby/module-pluggable/examples/plugins,
lang/ruby/module-pluggable/examples/plugins/test.rb,
lang/ruby/module-pluggable/examples/plugins/hoge_hoge.rb,
lang/ruby/module-pluggable/examples/simple.rb:

例をついか

Location:

lang/ruby/module-pluggable

Files:

• examples/plugins (added)
• examples/plugins/hoge_hoge.rb (added)
• examples/plugins/test.rb (added)
• examples/simple.rb (added)
• lib/module/pluggable.rb (modified) (3 diffs)
• test/test_module-pluggable.rb (modified) (4 diffs)

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

@@ -6 +6 @@
 module Module::Pluggable
         DEFAULT_OPTS = {
-                :name        => :plugins,
                 :search_path => "plugins",
                 :except      => /_$/,
@@ -12 +11 @@
         }.freeze
 
-        def pluggable(o={})
+        def pluggable(name=:plugins, o={})
                 opts = DEFAULT_OPTS.merge(o)
-                opts[:search_path] = o[:name] ? o[:name].to_s : opts[:name].to_s unless opts[:search_path]
+                opts[:search_path] = name ? name.to_s : opts[:name].to_s unless opts[:search_path]
                 
                 m = Marshal.dump(opts)
                 class_eval <<-EOS
-                        def #{opts[:name]}
-                                @#{opts[:name]} ||= Module::Pluggable::Plugins.new(Marshal.load('#{m}'))
+                        def #{name}
+                                @#{name} ||= Module::Pluggable::Plugins.new(Marshal.load('#{m}'))
                         end
                 EOS
@@ -120 +119 @@
                 end
 
+                def method_missing(name, *args)
+                        call(name, *args)
+                end
+
                 # foo/foo_bar => Foo::FooBar
                 def file2klass(str)

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

@@ -28 +28 @@
                 path = @plugins_dir
                 test = Class.new {
-                        pluggable :name => :plugins, :search_path => path
+                        pluggable :plugins, :search_path => path
                 }.new
                 assert test.plugins["Test"]
@@ -36 +36 @@
                 test.plugins.call(:instance_variable_set, :@test_obj, obj)
                 assert_equal obj, test.plugins["Test"].instance_variable_get(:@test_obj)
+
+                assert_equal "This is test plugin.", test.plugins.description["Test"]
         end
 
@@ -42 +44 @@
                 assert_raise(Module::Pluggable::Plugins::NotInheritAbstractClassError) do
                         test = Class.new {
-                                pluggable :name => :plugins, :search_path => path, :base_class => PluginBase
+                                pluggable :plugins, :search_path => path, :base_class => PluginBase
                         }.new
                         test.plugins
@@ -53 +55 @@
                 assert_nothing_raised do
                         test = Class.new {
-                                pluggable :name => :plugins, :search_path => path, :base_class => PluginBase
+                                pluggable :plugins, :search_path => path, :base_class => PluginBase
                         }.new
                         test.plugins