puma 2.11.1-java → 2.11.2-java

data/test/test_config.rb

@@ -14,6 +14,17 @@ class TestConfigFile < Test::Unit::TestCase
     assert_equal [200, {}, ["embedded app"]], app.call({})
   end
 
+  def test_double_bind_port
+    port = rand(30_000..40_000).to_s
+    with_env("PORT" => port) do
+      opts = { :binds => ["tcp://#{Configuration::DefaultTCPHost}:#{port}"], :config_file => "test/config/app.rb"}
+      conf = Puma::Configuration.new opts
+      conf.load
+
+      assert_equal ["tcp://0.0.0.0:#{port}"], conf.options[:binds]
+    end
+  end
+
   def test_lowleve_error_handler_DSL
     opts = { :config_file => "test/config/app.rb" }
     conf = Puma::Configuration.new opts
@@ -23,4 +34,19 @@ class TestConfigFile < Test::Unit::TestCase
 
     assert_equal [200, {}, ["error page"]], app.call({})
   end
+
+  private
+
+    def with_env(env = {})
+      original_env = {}
+      env.each do |k, v|
+        original_env[k] = ENV[k]
+        ENV[k] = v
+      end
+      yield
+    ensure
+      original_env.each do |k, v|
+        ENV[k] = v
+      end
+    end
 end

data/test/test_persistent.rb

@@ -106,7 +106,7 @@ class TestPersistent < Test::Unit::TestCase
 
     @client << @http10_request
 
-    assert_equal "HTTP/1.0 200 OK\r\nX-Header: Works\r\nConnection: close\r\n\r\n", lines(4)
+    assert_equal "HTTP/1.0 200 OK\r\nX-Header: Works\r\n\r\n", lines(3)
     assert_equal "HelloChunked", @client.read
   end
 
@@ -132,7 +132,7 @@ class TestPersistent < Test::Unit::TestCase
     @client << @http10_request
     sz = @body[0].size.to_s
 
-    assert_equal "HTTP/1.0 200 OK\r\nX-Header: Works\r\nConnection: close\r\nContent-Length: #{sz}\r\n\r\n", lines(5)
+    assert_equal "HTTP/1.0 200 OK\r\nX-Header: Works\r\nContent-Length: #{sz}\r\n\r\n", lines(4)
     assert_equal "Hello", @client.read(5)
   end
 

data/test/test_puma_server.rb

@@ -216,7 +216,7 @@ class TestPumaServer < Test::Unit::TestCase
 
     data = sock.read
 
-    assert_equal "HTTP/1.0 449 CUSTOM\r\nConnection: close\r\nContent-Length: 0\r\n\r\n", data
+    assert_equal "HTTP/1.0 449 CUSTOM\r\nContent-Length: 0\r\n\r\n", data
   end
 
   def test_custom_http_codes_11
@@ -285,4 +285,116 @@ class TestPumaServer < Test::Unit::TestCase
 
     assert_equal "HTTP/1.1 408 Request Timeout\r\n", data
   end
+
+  def test_http_11_keep_alive_with_body
+    @server.app = proc { |env| [200, {"Content-Type" => "plain/text"}, ["hello"]] }
+
+    @server.add_tcp_listener @host, @port
+    @server.run
+
+    sock = TCPSocket.new @host, @port
+    sock << "GET / HTTP/1.1\r\nConnection: Keep-Alive\r\n\r\n"
+
+    data = sock.read
+
+    assert_equal "HTTP/1.1 200 OK\r\nContent-Type: plain/text\r\nContent-Length: 5\r\n\r\nhello", data
+  end
+
+  def test_http_11_close_with_body
+    @server.app = proc { |env| [200, {"Content-Type" => "plain/text"}, ["hello"]] }
+
+    @server.add_tcp_listener @host, @port
+    @server.run
+
+    sock = TCPSocket.new @host, @port
+    sock << "GET / HTTP/1.1\r\nConnection: close\r\n\r\n"
+
+    data = sock.read
+
+    assert_equal "HTTP/1.1 200 OK\r\nContent-Type: plain/text\r\nConnection: close\r\nContent-Length: 5\r\n\r\nhello", data
+  end
+
+  def test_http_11_keep_alive_without_body
+    @server.app = proc { |env| [204, {}, []] }
+
+    @server.add_tcp_listener @host, @port
+    @server.run
+
+    sock = TCPSocket.new @host, @port
+    sock << "GET / HTTP/1.1\r\nConnection: Keep-Alive\r\n\r\n"
+
+    data = sock.read
+
+    assert_equal "HTTP/1.1 204 No Content\r\n\r\n", data
+  end
+
+  def test_http_11_close_without_body
+    @server.app = proc { |env| [204, {}, []] }
+
+    @server.add_tcp_listener @host, @port
+    @server.run
+
+    sock = TCPSocket.new @host, @port
+    sock << "GET / HTTP/1.1\r\nConnection: close\r\n\r\n"
+
+    data = sock.read
+
+    assert_equal "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n", data
+  end
+
+  def test_http_10_keep_alive_with_body
+    @server.app = proc { |env| [200, {"Content-Type" => "plain/text"}, ["hello"]] }
+
+    @server.add_tcp_listener @host, @port
+    @server.run
+
+    sock = TCPSocket.new @host, @port
+    sock << "GET / HTTP/1.0\r\nConnection: Keep-Alive\r\n\r\n"
+
+    data = sock.read
+
+    assert_equal "HTTP/1.0 200 OK\r\nContent-Type: plain/text\r\nConnection: Keep-Alive\r\nContent-Length: 5\r\n\r\nhello", data
+  end
+
+  def test_http_10_close_with_body
+    @server.app = proc { |env| [200, {"Content-Type" => "plain/text"}, ["hello"]] }
+
+    @server.add_tcp_listener @host, @port
+    @server.run
+
+    sock = TCPSocket.new @host, @port
+    sock << "GET / HTTP/1.0\r\nConnection: close\r\n\r\n"
+
+    data = sock.read
+
+    assert_equal "HTTP/1.0 200 OK\r\nContent-Type: plain/text\r\nContent-Length: 5\r\n\r\nhello", data
+  end
+
+  def test_http_10_keep_alive_without_body
+    @server.app = proc { |env| [204, {}, []] }
+
+    @server.add_tcp_listener @host, @port
+    @server.run
+
+    sock = TCPSocket.new @host, @port
+    sock << "GET / HTTP/1.0\r\nConnection: Keep-Alive\r\n\r\n"
+
+    data = sock.read
+
+    assert_equal "HTTP/1.0 204 No Content\r\nConnection: Keep-Alive\r\n\r\n", data
+  end
+
+  def test_http_10_close_without_body
+    @server.app = proc { |env| [204, {}, []] }
+
+    @server.add_tcp_listener @host, @port
+    @server.run
+
+    sock = TCPSocket.new @host, @port
+    sock << "GET / HTTP/1.0\r\nConnection: close\r\n\r\n"
+
+    data = sock.read
+
+    assert_equal "HTTP/1.0 204 No Content\r\n\r\n", data
+  end
 end

data/test/test_unix_socket.rb

@@ -8,31 +8,31 @@ require 'socket'
 # (or Windows)
 unless defined?(JRUBY_VERSION) || RbConfig::CONFIG["host_os"] =~ /mingw|mswin/
   class TestPumaUnixSocket < Test::Unit::TestCase
-  
+
     App = lambda { |env| [200, {}, ["Works"]] }
-  
+
     Path = "test/puma.sock"
-  
+
     def setup
       @server = Puma::Server.new App
       @server.add_unix_listener Path
       @server.run
     end
-  
+
     def teardown
       @server.stop(true)
       File.unlink Path if File.exist? Path
     end
-  
+
     def test_server
       sock = UNIXSocket.new Path
-  
+
       sock << "GET / HTTP/1.0\r\nHost: blah.com\r\n\r\n"
-  
-      expected = "HTTP/1.0 200 OK\r\nConnection: close\r\nContent-Length: 5\r\n\r\nWorks"
-  
+
+      expected = "HTTP/1.0 200 OK\r\nContent-Length: 5\r\n\r\nWorks"
+
       assert_equal expected, sock.read(expected.size)
-  
+
       sock.close
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 2.11.2
 platform: java
 authors:
 - Evan Phoenix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,7 @@ files:
 - lib/puma/daemon_ext.rb
 - lib/puma/delegation.rb
 - lib/puma/detect.rb
+- lib/puma/dsl.rb
 - lib/puma/events.rb
 - lib/puma/io_buffer.rb
 - lib/puma/java_io_buffer.rb