Much larger commit than I would like to land at once. This is all REST-related code. Two specs are failing related to how Mongrel is initialized for REST; will fix those shortly.

REST indirector now supports find, with deserialization.  Network code in indirector now.  Will still need to un-hardwire address/port for outbound connections.  Will still need to urlencode path parameters.
Code for search, destroy, update is coming, should be similar to find.

Reworked how the Handler module is used.  Needed to be included, rather than inherited.  Needed to sidestep initializers for actual web servers (webrick, mongrel), needed to be possible to have handler-including class be used as a class (aka servlet) instead of as an instance.

Webrick handler registration is now abstracted to "above" the servlet.

Provided a #model method to use instead of @model in handler module.  This allows neutering during testing.

Brought class_for_protocol up into http/webrick class as a (tested) class method.

Integration tests for rest indirection.  Split server integration tests into mongrel and webrick tests.

Got Node/REST working properly wrt the crazy-ass autoloader thing.

We're now actually passing traffic w/ webrick, fwiw.

2 files changed, 90 insertions, 0 deletions

diff --git a/spec/integration/network/server/mongrel.rb b/spec/integration/network/server/mongrel.rb
new file mode 100644
index 000000000..7bf8291a3
--- /dev/null
+++ b/spec/integration/network/server/mongrel.rb
@@ -0,0 +1,44 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'puppet/network/server'
+require 'socket'
+
+describe Puppet::Network::Server do
+  describe "when using mongrel" do
+    before :each do
+      Puppet[:servertype] = 'mongrel'
+      @params = { :address => "127.0.0.1", :port => 34346, :handlers => [ :node ] }
+      @server = Puppet::Network::Server.new(@params)      
+    end
+
+    describe "before listening" do
+      it "should not be reachable at the specified address and port" do
+        lambda { TCPSocket.new('127.0.0.1', 34346) }.should raise_error(Errno::ECONNREFUSED)
+      end
+    end
+
+    describe "when listening" do
+      it "should be reachable on the specified address and port" do
+        @server.listen
+        lambda { TCPSocket.new('127.0.0.1', 34346) }.should_not raise_error      
+      end
+
+      it "should not allow multiple servers to listen on the same address and port" do
+        @server.listen
+        @server2 = Puppet::Network::Server.new(@params)
+        lambda { @server2.listen }.should raise_error
+      end
+    end
+    
+    describe "after unlistening" do
+      it "should not be reachable on the port and address assigned" do
+        @server.listen
+        @server.unlisten
+        lambda { TCPSocket.new('127.0.0.1', 34346) }.should raise_error(Errno::ECONNREFUSED)        
+      end
+    end
+      
+    after :each do
+      @server.unlisten if @server.listening?
+    end  
+  end
+end
\ No newline at end of file
diff --git a/spec/integration/network/server/webrick.rb b/spec/integration/network/server/webrick.rb
new file mode 100644
index 000000000..0ab8d89e4
--- /dev/null
+++ b/spec/integration/network/server/webrick.rb
@@ -0,0 +1,46 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'puppet/network/server'
+require 'socket'
+
+describe Puppet::Network::Server do
+  describe "when using webrick" do
+    before :each do
+      Puppet[:servertype] = 'webrick'
+      @params = { :address => "127.0.0.1", :port => 34343, :handlers => [ :node ] }
+    end
+    
+    describe "before listening" do
+      it "should not be reachable at the specified address and port" do
+        lambda { TCPSocket.new('127.0.0.1', 34343) }.should raise_error
+      end
+    end
+    
+    describe "when listening" do
+      it "should be reachable on the specified address and port" do
+        @server = Puppet::Network::Server.new(@params.merge(:port => 34343))      
+        @server.listen
+        lambda { TCPSocket.new('127.0.0.1', 34343) }.should_not raise_error      
+      end
+            
+      it "should not allow multiple servers to listen on the same address and port" do
+        @server = Puppet::Network::Server.new(@params.merge(:port => 34343))      
+        @server.listen
+        @server2 = Puppet::Network::Server.new(@params.merge(:port => 34343))
+        lambda { @server2.listen }.should raise_error
+      end
+      
+      after :each do
+        @server.unlisten if @server.listening?
+      end
+    end
+    
+    describe "after unlistening" do
+      it "should not be reachable on the port and address assigned" do
+        @server = Puppet::Network::Server.new(@params.merge(:port => 34343))      
+        @server.listen
+        @server.unlisten
+        lambda { TCPSocket.new('127.0.0.1', 34343) }.should raise_error(Errno::ECONNREFUSED)        
+      end
+    end
+  end
+end
\ No newline at end of file