puma 2.2.2-java → 2.3.0-java

data/lib/puma/configuration.rb

@@ -203,8 +203,8 @@ module Puma
       #
       # This can be called multiple times to add code each time.
       #
-      def on_restart(&blk)
-        @options[:on_restart] << blk
+      def on_restart(&block)
+        @options[:on_restart] << block
       end
 
       # Command to use to restart puma. This should be just how to

data/lib/puma/const.rb

@@ -28,7 +28,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.2.2".freeze
+    PUMA_VERSION = VERSION = "2.3.0".freeze
+    CODE_NAME = "Delicious Thin Mints"
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 

data/lib/puma/control_cli.rb

@@ -7,7 +7,7 @@ require 'socket'
 module Puma
   class ControlCLI
 
-    COMMANDS = %w{halt restart start stats status stop}
+    COMMANDS = %w{halt restart phased-restart start stats status stop}
 
     def is_windows?
       RUBY_PLATFORM =~ /(win|w)32$/ ? true : false
@@ -88,7 +88,7 @@ module Puma
 
         status = YAML.load File.read(@options[:status_path])
 
-        if status.has_key? "config"
+        if status.kind_of?(Hash) && status.has_key?("config")
 
           conf = status["config"]
 
@@ -148,10 +148,12 @@ module Puma
           raise "Server sent empty response"
         end
 
-        (@http,@code,@message) = response.first.split(" ")
+        (@http,@code,@message) = response.first.split(" ",3)
 
         if @code == "403"
           raise "Unauthorized access to server (wrong auth token)"
+        elsif @code == "404"
+          raise "Command error: #{response.last}"
         elsif @code != "200"
           raise "Bad response from server: #{@code}"
         end
@@ -188,6 +190,9 @@ module Puma
         puts "Stats not available via pid only"
         return
 
+      when "phased-restart"
+        Process.kill "SIGUSR1", pid
+
       else
         message "Puma is started"
         return
@@ -200,7 +205,14 @@ module Puma
       if @options[:command] == "start"
         require 'puma/cli'
 
-        cli = Puma::CLI.new @argv, @stdout, @stderr
+        run_args = @argv
+        if path = @options[:status_path]
+          run_args = ["-S", path] + run_args
+        end
+
+        events = Puma::Events.new @stdout, @stderr
+
+        cli = Puma::CLI.new run_args, events
         cli.run
         return
       end

data/lib/puma/delegation.rb

@@ -2,8 +2,8 @@ module Puma
   module Delegation
     def forward(what, who)
       module_eval <<-CODE
-        def #{what}(*args, &blk)
-          #{who}.#{what}(*args, &blk)
+        def #{what}(*args, &block)
+          #{who}.#{what}(*args, &block)
         end
       CODE
     end

data/lib/puma/events.rb

@@ -19,6 +19,8 @@ module Puma
 
       @stdout.sync = true
       @stderr.sync = true
+
+      @on_booted = []
     end
 
     attr_reader :stdout, :stderr
@@ -62,6 +64,14 @@ module Puma
       end
     end
 
+    def on_booted(&b)
+      @on_booted << b
+    end
+
+    def fire_on_booted!
+      @on_booted.each { |b| b.call }
+    end
+
     DEFAULT = new(STDOUT, STDERR)
 
     # Returns an Events object which writes it's status to 2 StringIO
@@ -70,6 +80,10 @@ module Puma
     def self.strings
       Events.new StringIO.new, StringIO.new
     end
+
+    def self.stdio
+      Events.new $stdout, $stderr
+    end
   end
 
   class PidEvents < Events

data/lib/puma/server.rb

@@ -46,7 +46,7 @@ module Puma
     # Server#run returns a thread that you can join on to wait for the server
     # to do it's work.
     #
-    def initialize(app, events=Events::DEFAULT)
+    def initialize(app, events=Events.stdio)
       @app = app
       @events = events
 
@@ -412,7 +412,7 @@ module Puma
             lines << HTTP_11_200
           else
             lines.append "HTTP/1.1 ", status.to_s, " ",
-                         HTTP_STATUS_CODES[status], line_ending
+                         fetch_status_code(status), line_ending
 
             no_body ||= status < 200 || STATUS_WITH_NO_ENTITY_BODY[status]
           end
@@ -427,7 +427,7 @@ module Puma
             lines << HTTP_10_200
           else
             lines.append "HTTP/1.0 ", status.to_s, " ",
-                         HTTP_STATUS_CODES[status], line_ending
+                         fetch_status_code(status), line_ending
 
             no_body ||= status < 200 || STATUS_WITH_NO_ENTITY_BODY[status]
           end
@@ -443,8 +443,6 @@ module Puma
           when TRANSFER_ENCODING
             allow_chunked = false
             content_length = nil
-          when CONTENT_TYPE
-            next if no_body
           when HIJACK
             response_hijack = vs
             next
@@ -456,6 +454,10 @@ module Puma
         end
 
         if no_body
+          if content_length and status != 204
+            lines.append CONTENT_LENGTH_S, content_length.to_s, line_ending
+          end
+
           lines << line_ending
           fast_write client, lines.to_s
           return keep_alive
@@ -486,22 +488,26 @@ module Puma
           return :async
         end
 
-        res_body.each do |part|
-          if chunked
-            client.syswrite part.bytesize.to_s(16)
-            client.syswrite line_ending
-            fast_write client, part
-            client.syswrite line_ending
-          else
-            fast_write client, part
-          end
+        begin
+          res_body.each do |part|
+            if chunked
+              client.syswrite part.bytesize.to_s(16)
+              client.syswrite line_ending
+              fast_write client, part
+              client.syswrite line_ending
+            else
+              fast_write client, part
+            end
 
-          client.flush
-        end
+            client.flush
+          end
 
-        if chunked
-          client.syswrite CLOSE_CHUNKED
-          client.flush
+          if chunked
+            client.syswrite CLOSE_CHUNKED
+            client.flush
+          end
+        rescue SystemCallError, IOError
+          raise ConnectionError, "Connection error detected during write"
         end
 
       ensure
@@ -516,6 +522,11 @@ module Puma
       return keep_alive
     end
 
+    def fetch_status_code(status)
+      HTTP_STATUS_CODES.fetch(status) { 'CUSTOM' }
+    end
+    private :fetch_status_code
+
     # Given the requset +env+ from +client+ and the partial body +body+
     # plus a potential Content-Length value +cl+, finish reading
     # the body and return it.

data/lib/puma/thread_pool.rb

@@ -11,7 +11,7 @@ module Puma
     # The block passed is the work that will be performed in each
     # thread.
     #
-    def initialize(min, max, *extra, &blk)
+    def initialize(min, max, *extra, &block)
       @cond = ConditionVariable.new
       @mutex = Mutex.new
 
@@ -22,7 +22,7 @@ module Puma
 
       @min = min
       @max = max
-      @block = blk
+      @block = block
       @extra = extra
 
       @shutdown = false

data/puma.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "2.2.2"
+  s.version = "2.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2013-07-02"
+  s.date = "2013-07-06"
   s.description = "Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications. Puma is intended for use in both development and production environments. In order to get the best throughput, it is highly recommended that you use a  Ruby implementation with real threads like Rubinius or JRuby."
   s.email = ["evan@phx.io"]
   s.executables = ["puma", "pumactl"]

data/test/test_app_status.rb

@@ -20,11 +20,15 @@ class TestAppStatus < Test::Unit::TestCase
     def halt
       @status = :halt
     end
+
+    def stats
+      "{}"
+    end
   end
 
   def setup
     @server = FakeServer.new
-    @app = Puma::App::Status.new(@server, @server)
+    @app = Puma::App::Status.new(@server)
     @app.auth_token = nil
   end
 
@@ -78,7 +82,7 @@ class TestAppStatus < Test::Unit::TestCase
     status, _ , app = lint('/stats')
 
     assert_equal 200, status
-    assert_equal ['{ "backlog": 1, "running": 9 }'], app.enum_for.to_a
+    assert_equal ['{}'], app.enum_for.to_a
   end
 
   def test_alternate_location

data/test/test_cli.rb

@@ -14,11 +14,23 @@ class TestCLI < Test::Unit::TestCase
 
     File.unlink @tmp_path if File.exist? @tmp_path
     File.unlink @tmp_path2 if File.exist? @tmp_path2
+
+    @wait, @ready = IO.pipe
+
+    @events = Events.strings
+    @events.on_booted { @ready << "!" }
+  end
+
+  def wait_booted
+    @wait.sysread 1
   end
 
   def teardown
     File.unlink @tmp_path if File.exist? @tmp_path
     File.unlink @tmp_path2 if File.exist? @tmp_path2
+
+    @wait.close
+    @ready.close
   end
 
   def test_pid_file
@@ -27,19 +39,15 @@ class TestCLI < Test::Unit::TestCase
     cli.write_pid
 
     assert_equal File.read(@tmp_path).strip.to_i, Process.pid
-
-    cli.stop
-    assert !File.exist?(@tmp_path), "Pid file shouldn't exist anymore"
   end
 
   def test_control_for_tcp
     url = "tcp://127.0.0.1:9877/"
-    sin = StringIO.new
-    sout = StringIO.new
     cli = Puma::CLI.new ["-b", "tcp://127.0.0.1:9876",
                          "--control", url,
                          "--control-token", "",
-                         "test/lobster.ru"], sin, sout
+                         "test/lobster.ru"], @events
+
     cli.parse_options
 
     thread_exception = nil
@@ -51,7 +59,7 @@ class TestCLI < Test::Unit::TestCase
       end
     end 
 
-    sleep 1
+    wait_booted
 
     s = TCPSocket.new "127.0.0.1", 9877
     s << "GET /stats HTTP/1.0\r\n\r\n"
@@ -67,18 +75,15 @@ class TestCLI < Test::Unit::TestCase
   def test_control
     url = "unix://#{@tmp_path}"
 
-    sin = StringIO.new
-    sout = StringIO.new
-
     cli = Puma::CLI.new ["-b", "unix://#{@tmp_path2}",
                          "--control", url,
                          "--control-token", "",
-                         "test/lobster.ru"], sin, sout
+                         "test/lobster.ru"], @events
     cli.parse_options
 
     t = Thread.new { cli.run }
 
-    sleep 1
+    wait_booted
 
     s = UNIXSocket.new @tmp_path
     s << "GET /stats HTTP/1.0\r\n\r\n"
@@ -93,18 +98,15 @@ class TestCLI < Test::Unit::TestCase
   def test_control_stop
     url = "unix://#{@tmp_path}"
 
-    sin = StringIO.new
-    sout = StringIO.new
-
     cli = Puma::CLI.new ["-b", "unix://#{@tmp_path2}",
                          "--control", url,
                          "--control-token", "",
-                         "test/lobster.ru"], sin, sout
+                         "test/lobster.ru"], @events
     cli.parse_options
 
     t = Thread.new { cli.run }
 
-    sleep 1
+    wait_booted
 
     s = UNIXSocket.new @tmp_path
     s << "GET /stop HTTP/1.0\r\n\r\n"

data/test/test_integration.rb

@@ -19,6 +19,11 @@ class TestIntegration < Test::Unit::TestCase
 
     @server = nil
     @script = nil
+
+    @wait, @ready = IO.pipe
+
+    @events = Puma::Events.strings
+    @events.on_booted { @ready << "!" }
   end
 
   def teardown
@@ -26,6 +31,9 @@ class TestIntegration < Test::Unit::TestCase
     File.unlink @bind_path  rescue nil
     File.unlink @control_path rescue nil
 
+    @wait.close
+    @ready.close
+
     if @server
       Process.kill "INT", @server.pid
       begin
@@ -63,27 +71,30 @@ class TestIntegration < Test::Unit::TestCase
     Process.kill which, @server.pid
   end
 
+  def wait_booted
+    @wait.sysread 1
+  end
+
   def test_stop_via_pumactl
     if defined?(JRUBY_VERSION) || RbConfig::CONFIG["host_os"] =~ /mingw|mswin/
       assert true
       return
     end
 
-    sin = StringIO.new
-    sout = StringIO.new
-
-    cli = Puma::CLI.new %W!-q -S #{@state_path} -b unix://#{@bind_path} --control unix://#{@control_path} test/hello.ru!, sin, sout
+    cli = Puma::CLI.new %W!-q -S #{@state_path} -b unix://#{@bind_path} --control unix://#{@control_path} test/hello.ru!, @events
 
     t = Thread.new do
       cli.run
     end
 
-    sleep 1
+    wait_booted
 
     s = UNIXSocket.new @bind_path
     s << "GET / HTTP/1.0\r\n\r\n"
     assert_equal "Hello World", s.read.split("\r\n").last
 
+    sout = StringIO.new
+
     ccli = Puma::ControlCLI.new %W!-S #{@state_path} stop!, sout
 
     ccli.run

data/test/test_puma_server.rb

@@ -174,7 +174,7 @@ class TestPumaServer < Test::Unit::TestCase
 
     data = sock.read
 
-    assert_equal "HTTP/1.0 200 OK\r\nFoo: Bar\r\n\r\n", data
+    assert_equal "HTTP/1.0 200 OK\r\nFoo: Bar\r\nContent-Length: 5\r\n\r\n", data
   end
 
   def test_GET_with_empty_body_has_sane_chunking
@@ -188,11 +188,11 @@ class TestPumaServer < Test::Unit::TestCase
 
     data = sock.read
 
-    assert_equal "HTTP/1.0 200 OK\r\n\r\n", data
+    assert_equal "HTTP/1.0 200 OK\r\nContent-Length: 0\r\n\r\n", data
   end
 
   def test_GET_with_no_body_has_sane_chunking
-    @server.app = proc { |env| [200, {}, [""]] }
+    @server.app = proc { |env| [200, {}, []] }
 
     @server.add_tcp_listener @host, @port
     @server.run
@@ -221,4 +221,49 @@ class TestPumaServer < Test::Unit::TestCase
 
     assert_not_match(/don't leak me bro/, data)
   end
+
+  def test_custom_http_codes_10
+    @server.app = proc { |env| [449, {}, [""]] }
+
+    @server.add_tcp_listener @host, @port
+    @server.run
+
+    sock = TCPSocket.new @host, @port
+
+    sock << "GET / HTTP/1.0\r\n\r\n"
+
+    data = sock.read
+
+    assert_equal "HTTP/1.0 449 CUSTOM\r\nConnection: close\r\nContent-Length: 0\r\n\r\n", data
+  end
+
+  def test_custom_http_codes_11
+    @server.app = proc { |env| [449, {}, [""]] }
+
+    @server.add_tcp_listener @host, @port
+    @server.run
+
+    sock = TCPSocket.new @host, @port
+    sock << "GET / HTTP/1.1\r\n\r\n"
+
+    data = sock.read
+
+    assert_equal "HTTP/1.1 449 CUSTOM\r\nContent-Length: 0\r\n\r\n", data
+  end
+
+  def test_HEAD_returns_content_headers
+    @server.app = proc { |env| [200, {"Content-Type" => "application/pdf",
+                                      "Content-Length" => "4242"}, []] }
+
+    @server.add_tcp_listener @host, @port
+    @server.run
+
+    sock = TCPSocket.new @host, @port
+
+    sock << "HEAD / HTTP/1.0\r\n\r\n"
+
+    data = sock.read
+
+    assert_equal "HTTP/1.0 200 OK\r\nContent-Type: application/pdf\r\nContent-Length: 4242\r\n\r\n", data
+  end
 end