0
@@ -1,4 +1,15 @@
0
 == 0.5.5 Pony release
0
+ * Server can now yield a Rack::Builder to allow building an app in one call:
0
+ 
0
+     Server.start '0.0.0.0', 3000 do
0
+       use Rack::CommonLogger
0
+       use Rack::ShowExceptions
0
+       map "/lobster" do
0
+         use Rack::Lint
0
+         run Rack::Lobster.new
0
+       end
0
+     end
0
+     
0
  * Add a very basic stats page through Stats adapter, load w/ --stats and browse to /stats.
0
  * Add --trace (-V) option to trace request/response and get backtrace w/out all Ruby debug stuff.
0
  * Add --config (-C) option to load options from a config file in thin script [Matt Todd].

0
@@ -36,7 +36,7 @@
0
     
0
     def headers=(key_value_pairs)
0
       key_value_pairs.each do |k, vs|
0
-        vs.each { |v| @headers[k] = v.chomp }
0
+        vs.each_line { |v| @headers[k] = v.chomp }
0
       end
0
     end
0
     

0
@@ -23,11 +23,29 @@
0
     
0
     # Creates a new server binded to <tt>host:port</tt>
0
     # that will pass request to +app+.
0
-    def initialize(host, port, app=nil)
0
+    # If a block is passed, a <tt>Rack::Builder</tt> instance
0
+    # will be passed to build the +app+.
0
+    # 
0
+    #   Server.new '0.0.0.0', 3000 do
0
+    #     use Rack::CommonLogger
0
+    #     use Rack::ShowExceptions
0
+    #     map "/lobster" do
0
+    #       use Rack::Lint
0
+    #       run Rack::Lobster.new
0
+    #     end
0
+    #   end.start!
0
+    #
0
+    def initialize(host, port, app=nil, &block)
0
       @host       = host
0
       @port       = port.to_i
0
       @app        = app
0
       @timeout    = 60 # sec
0
+      
0
+      @app = Rack::Builder.new(&block).to_app if block
0
+    end
0
+    
0
+    def self.start(host, port, &block)
0
+      new(host, port, &block).start!
0
     end
0
     
0
     # Starts the handlers.

0
@@ -78,4 +78,41 @@
0
       Net::HTTP.post_form(URI.parse('http://0.0.0.0:3333' + url), params).body
0
     end
0
 end
0
+
0
+describe Server, 'app configuration' do
0
+  it "should build app from constructor" do
0
+    server = Server.new('0.0.0.0', 3000, :works)
0
+    
0
+    server.app.should == :works
0
+  end
0
+  
0
+  it "should build app from builder block" do
0
+    server = Server.new '0.0.0.0', 3000 do
0
+      run(proc { |env| :works })
0
+    end
0
+    
0
+    server.app.call({}).should == :works
0
+  end
0
+  
0
+  it "should use middlewares in builder block" do
0
+    server = Server.new '0.0.0.0', 3000 do
0
+      use Rack::ShowExceptions
0
+      run(proc { |env| :works })
0
+    end
0
+    
0
+    server.app.class.should == Rack::ShowExceptions
0
+    server.app.call({}).should == :works
0
+  end
0
+  
0
+  it "should work with Rack url mapper" do
0
+    server = Server.new '0.0.0.0', 3000 do
0
+      map '/test' do
0
+        run(proc { |env| :works })
0
+      end
0
+    end
0
+    
0
+    server.app.call({})[0].should == 404
0
+    server.app.call({'PATH_INFO' => '/test'}).should == :works
0
+  end
0
+end