Make mongrel happy like WEBrick.

Refactored specs to put some of the lower-level find/save/search/destroy unit tests under their own contexts.

2 files changed, 4 insertions, 7 deletions

diff --git a/lib/puppet/network/http/mongrel.rb b/lib/puppet/network/http/mongrel.rb
index 941ef0e43..9a4531c7a 100644
--- a/lib/puppet/network/http/mongrel.rb
+++ b/lib/puppet/network/http/mongrel.rb
@@ -38,8 +38,10 @@ class Puppet::Network::HTTP::Mongrel
   
     def setup_handlers
         @protocols.each do |protocol|
+            klass = class_for_protocol(protocol)
             @handlers.each do |handler|
-                class_for_protocol(protocol).new(:server => @server, :handler => handler)
+                @server.register('/' + handler.to_s, klass.new(:server => @server, :handler => handler))
+                @server.register('/' + handler.to_s + 's', klass.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 d7a1a1bdc..2a3d4f143 100644
--- a/lib/puppet/network/http/mongrel/rest.rb
+++ b/lib/puppet/network/http/mongrel/rest.rb
@@ -5,17 +5,12 @@ class Puppet::Network::HTTP::MongrelREST < Mongrel::HttpHandler
   include Puppet::Network::HTTP::Handler
   
   def initialize(args={})
+    super()
     initialize_for_puppet(args)
   end
 
   private
  
-    # have this mongrel @server listen for /foo and /foos REST endpoints
-    def register_handler
-        @server.register('/' + @handler.to_s, self)
-        @server.register('/' + @handler.to_s + 's', self)
-    end
-    
     # which HTTP verb was used in this request
     def http_method(request)
         request.params[Mongrel::Const::REQUEST_METHOD]