New plugin system that is much simpler than pluginfactory and has a lot more leg room for future expansion. Brought timeouts back since couldn't find another way.

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@65 19e92222-5c0b-0410-8929-a290d50e31e9

2 files changed, 10 insertions, 9 deletions

diff --git a/test/plugins/commands/test1.rb b/test/plugins/commands/test1.rb
index b999d38..b8c0d89 100644
--- a/test/plugins/commands/test1.rb
+++ b/test/plugins/commands/test1.rb
@@ -1,19 +1,17 @@
 
-include Mongrel
-
-class First < Plugin "/commands"
+class First < Mongrel::Plugin "/commands"
   def initialize(options = {})
     puts "First with options: #{options.inspect}"
   end
 end
 
-class Second < Plugin "/commands"
+class Second < Mongrel::Plugin "/commands"
   def initialize(options = {})
     puts "Second with options: #{options.inspect}"
   end
 end
 
-class Last < Plugin "/commands"
+class Last < Mongrel::Plugin "/commands"
   def initialize(options = {})
     puts "Last with options: #{options.inspect}"
   end
diff --git a/test/test_plugins.rb b/test/test_plugins.rb
index 680dac5..0700e50 100644
--- a/test/test_plugins.rb
+++ b/test/test_plugins.rb
@@ -9,7 +9,7 @@ class PluginTest < Test::Unit::TestCase
   def setup
     @pmgr = PluginManager.instance
     @categories = ["/commands"]
-    @names = ["FirstCommand", "SecondCommand", "LastCommands"]
+    @names = ["/first","/second","/last"]
   end
 
   def test_load_plugins
@@ -17,13 +17,16 @@ class PluginTest < Test::Unit::TestCase
     puts "#{@pmgr.available.inspect}"
     @pmgr.available.each {|cat,plugins|
       plugins.each do |p|
-        puts "TEST: #{cat}/#{p}"
+        puts "TEST: #{cat}#{p}"
         assert @names.include?(p)
       end
     }
 
-    @pmgr.available.each do |name|
-      plugin = @pmgr.create(name, options={"name" => name})
+    @pmgr.available.each do |cat,plugins|
+      plugins.each do |p|
+        STDERR.puts "#{cat}#{p}"
+        plugin = @pmgr.create("#{cat}#{p}", options={"name" => p})
+      end
     end
   end