Going back to each server+protocol object being responsible for only one indirection, as the REST vs. XMLRPC models are different enough that the object must register itself on initialization and handle the request when it comes in.

4 files changed, 10 insertions, 14 deletions

diff --git a/lib/puppet/network/http/mongrel.rb b/lib/puppet/network/http/mongrel.rb
index bec94ac13..3efc465ad 100644
--- a/lib/puppet/network/http/mongrel.rb
+++ b/lib/puppet/network/http/mongrel.rb
@@ -38,7 +38,9 @@ class Puppet::Network::HTTP::Mongrel
   
     def setup_handlers
         @protocols.each do |protocol|
-            class_for_protocol(protocol).new(:server => @server, :handlers => @handlers)
+            @handlers.each do |handler|
+                class_for_protocol(protocol).new(:server => @server, :handler => handler)
+            end
         end
     end
   
diff --git a/lib/puppet/network/http/mongrel/rest.rb b/lib/puppet/network/http/mongrel/rest.rb
index 34f1d8f90..0b2c43dfe 100644
--- a/lib/puppet/network/http/mongrel/rest.rb
+++ b/lib/puppet/network/http/mongrel/rest.rb
@@ -1,12 +1,8 @@
 class Puppet::Network::HTTP::MongrelREST
     def initialize(args = {})
         raise ArgumentError unless args[:server]
-        raise ArgumentError if !args[:handlers] or args[:handlers].empty?
-        
-        @models = {}
-        args[:handlers].each do |handler|
-            @models[handler] = find_model_for_handler(handler)
-        end
+        raise ArgumentError unless @handler = args[:handler]
+        @model = find_model_for_handler(@handler)
     end
     
   private
diff --git a/lib/puppet/network/http/webrick.rb b/lib/puppet/network/http/webrick.rb
index 21d191d06..53aa2e99b 100644
--- a/lib/puppet/network/http/webrick.rb
+++ b/lib/puppet/network/http/webrick.rb
@@ -42,7 +42,9 @@ class Puppet::Network::HTTP::WEBrick
     
     def setup_handlers
         @protocols.each do |protocol|
-            class_for_protocol(protocol).new(:server => @server, :handlers => @handlers)
+            @handlers.each do |handler|
+                class_for_protocol(protocol).new(:server => @server, :handler => handler)
+            end
         end
     end
     
diff --git a/lib/puppet/network/http/webrick/rest.rb b/lib/puppet/network/http/webrick/rest.rb
index f70f2030f..497fa26cc 100644
--- a/lib/puppet/network/http/webrick/rest.rb
+++ b/lib/puppet/network/http/webrick/rest.rb
@@ -1,12 +1,8 @@
 class Puppet::Network::HTTP::WEBrickREST
     def initialize(args = {})
         raise ArgumentError unless args[:server]
-        raise ArgumentError if !args[:handlers] or args[:handlers].empty?
-        
-        @models = {}
-        args[:handlers].each do |handler|
-            @models[handler] = find_model_for_handler(handler)
-        end
+        raise ArgumentError unless @handler = args[:handler]
+        @model = find_model_for_handler(@handler)
     end
 
   private