puma 1.3.1-java → 1.4.0-java

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.4.0 / 2012-06-04
+
+* 1 bug fix:
+  * SCRIPT_NAME should be passed from env to allow mounting apps
+
+* 1 experimental feature:
+  * Add puma.socket key for direct socket access
+
 === 1.3.1 / 2012-05-15
 
 * 2 bug fixes:

data/README.md

@@ -93,7 +93,7 @@ Puma comes with a builtin status/control app that can be used query and control
 
     $ puma --control tcp://127.0.0.1:9293 --control-token foo
 
-This directly puma to start the control server on localhost port 9293. Additionally, all requests to the control server will need to include `token=foo` as a query parameter. This allows for simple authentication. Check out https://github.com/puma/puma/blob/master/lib/puma/app/status.rb to see what the app has available.
+This directs puma to start the control server on localhost port 9293. Additionally, all requests to the control server will need to include `token=foo` as a query parameter. This allows for simple authentication. Check out https://github.com/puma/puma/blob/master/lib/puma/app/status.rb to see what the app has available.
 
 ## Restart
 
@@ -120,7 +120,7 @@ If you start puma with `-S some/path` then you can pass that same path to the `p
 
     $ pumactl -S some/path restart
 
-will cause the server to perform a restart. `pumactl` is a simple CLI frontend to the contro/status app described above.
+will cause the server to perform a restart. `pumactl` is a simple CLI frontend to the control/status app described above.
 
 ## License
 

data/lib/puma/const.rb

@@ -25,7 +25,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "1.3.1".freeze
+    PUMA_VERSION = VERSION = "1.4.0".freeze
 
     # The default number of seconds for another request within a persistent
     # session.
@@ -103,6 +103,7 @@ module Puma
     RACK_INPUT = "rack.input".freeze
     RACK_URL_SCHEME = "rack.url_scheme".freeze
     RACK_AFTER_REPLY = "rack.after_reply".freeze
+    PUMA_SOCKET = "puma.socket".freeze
 
     HTTP = "http".freeze
     HTTPS = "https".freeze

data/lib/puma/server.rb

@@ -62,7 +62,7 @@ module Puma
         "rack.multithread".freeze => true,
         "rack.multiprocess".freeze => false,
         "rack.run_once".freeze => true,
-        "SCRIPT_NAME".freeze => "",
+        "SCRIPT_NAME".freeze => ENV['SCRIPT_NAME'] || "",
 
         # Rack blows up if this is an empty string, and Rack::Lint
         # blows up if it's nil. So 'text/plain' seems like the most
@@ -398,6 +398,8 @@ module Puma
     def handle_request(env, client, body, cl)
       normalize_env env, client
 
+      env[PUMA_SOCKET] = client
+
       if cl
         body = read_body env, client, body, cl
         return false unless body

data/test/test_puma_server.rb

@@ -76,4 +76,25 @@ class TestPumaServer < Test::Unit::TestCase
 
     assert_equal "#{fifteen}#{fifteen}", data
   end
+
+  def test_puma_socket
+    body = "HTTP/1.1 750 Upgraded to Awesome\r\nDone: Yep!\r\n"
+    @server.app = proc do |env|
+      io = env['puma.socket']
+
+      io.write body
+
+      io.close
+
+      [-1, {}, []]
+    end
+
+    @server.add_tcp_listener @host, @port
+    @server.run
+
+    sock = TCPSocket.new @host, @port
+    sock << "PUT / HTTP/1.0\r\n\r\nHello"
+
+    assert_equal body, sock.read
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: puma
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.1
+  version: 1.4.0
 platform: java
 authors: 
   - Evan Phoenix
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-16 00:00:00 Z
+date: 2012-06-04 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rack