puma 1.3.0-java → 1.3.1-java

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.3.1 / 2012-05-15
+
+* 2 bug fixes:
+  * use #bytesize instead of #length for Content-Length header
+  * Use StringIO properly. Fixes #98
+
 === 1.3.0 / 2012-05-08
 
 * 2 minor features:

data/lib/puma/app/status.rb

@@ -49,7 +49,7 @@ module Puma
 
       private
       def rack_response(status, body, content_type='application/json')
-        [status, { 'Content-Type' => content_type, 'Content-Length' => body.length.to_s }, [body]]
+        [status, { 'Content-Type' => content_type, 'Content-Length' => body.bytesize.to_s }, [body]]
       end
     end
   end

data/lib/puma/const.rb

@@ -25,7 +25,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "1.3.0".freeze
+    PUMA_VERSION = VERSION = "1.3.1".freeze
 
     # The default number of seconds for another request within a persistent
     # session.

data/lib/puma/server.rb

@@ -573,11 +573,14 @@ module Puma
       if remain > MAX_BODY
         stream = Tempfile.new(Const::PUMA_TMP_BASE)
         stream.binmode
-        stream.write body
       else
-        stream = StringIO.new body
+        # The body[0,0] trick is to get an empty string in the same
+        # encoding as body.
+        stream = StringIO.new body[0,0]
       end
 
+      stream.write body
+
       # Read an odd sized chunk so we can read even sized ones
       # after this
       chunk = client.readpartial(remain % CHUNK_SIZE)

data/puma.gemspec

@@ -2,23 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2012-05-08"
+  s.date = "2012-05-16"
   s.description = "Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications. It can be used with any application that supports Rack, and is considered the replacement for Webrick and Mongrel. It was designed to be the go-to server for [Rubinius](http://rubini.us), but also works well with JRuby and MRI. Puma is intended for use in both development and production environments.\n\nUnder the hood, Puma processes requests using a C-optimized Ragel extension (inherited from Mongrel) that provides fast, accurate HTTP 1.1 protocol parsing in a portable way. Puma then serves the request in a thread from an internal thread pool (which you can control). This allows Puma to provide real concurrency for your web application!\n\nWith Rubinius 2.0, Puma will utilize all cores on your CPU with real threads, meaning you won't have to spawn multiple processes to increase throughput. You can expect to see a similar benefit from JRuby.\n\nOn MRI, there is a Global Interpreter Lock (GIL) that ensures only one thread can be run at a time. But if you're doing a lot of blocking IO (such as HTTP calls to external APIs like Twitter), Puma still improves MRI's throughput by allowing blocking IO to be run concurrently (EventMachine-based servers such as Thin turn off this ability, requiring you to use special libraries). Your mileage may vary. In order to get the best throughput, it is highly recommended that you use a Ruby implementation with real threads like [Rubinius](http://rubini.us) or [JRuby](http://jruby.org)."
   s.email = ["evan@phx.io"]
   s.executables = ["puma", "pumactl"]
   s.extensions = ["ext/puma_http11/extconf.rb"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
-  s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "examples/CA/cacert.pem", "examples/CA/newcerts/cert_1.pem", "examples/CA/newcerts/cert_2.pem", "examples/CA/private/cakeypair.pem", "examples/CA/serial", "examples/config.rb", "examples/puma/cert_puma.pem", "examples/puma/csr_puma.pem", "examples/puma/puma_keypair.pem", "examples/qc_config.rb", "ext/puma_http11/PumaHttp11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/app/status.rb", "lib/puma/cli.rb", "lib/puma/compat.rb", "lib/puma/configuration.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/events.rb", "lib/puma/jruby_restart.rb", "lib/puma/null_io.rb", "lib/puma/rack_patch.rb", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "test/ab_rs.rb", "test/config/app.rb", "test/hello.ru", "test/lobster.ru", "test/mime.yaml", "test/slow.ru", "test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb", "test/testhelp.rb", "tools/trickletest.rb", "test/test_null_io.rb"]
+  s.files = [".travis.yml", "COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "examples/CA/cacert.pem", "examples/CA/newcerts/cert_1.pem", "examples/CA/newcerts/cert_2.pem", "examples/CA/private/cakeypair.pem", "examples/CA/serial", "examples/config.rb", "examples/puma/cert_puma.pem", "examples/puma/csr_puma.pem", "examples/puma/puma_keypair.pem", "examples/qc_config.rb", "ext/puma_http11/PumaHttp11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/app/status.rb", "lib/puma/cli.rb", "lib/puma/compat.rb", "lib/puma/configuration.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/events.rb", "lib/puma/jruby_restart.rb", "lib/puma/null_io.rb", "lib/puma/rack_patch.rb", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "test/ab_rs.rb", "test/config/app.rb", "test/hello.ru", "test/lobster.ru", "test/mime.yaml", "test/slow.ru", "test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_null_io.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb", "test/testhelp.rb", "tools/trickletest.rb"]
   s.homepage = "http://puma.io"
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
   s.rubyforge_project = "puma"
-  s.rubygems_version = "1.8.22"
+  s.rubygems_version = "1.8.18"
   s.summary = "Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications"
   s.test_files = ["test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_null_io.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
 
@@ -27,19 +27,19 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, ["~> 1.2"])
-      s.add_development_dependency(%q<rake-compiler>, ["~> 0.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
-      s.add_development_dependency(%q<hoe>, ["~> 2.16"])
+      s.add_development_dependency(%q<rake-compiler>, ["~> 0.8.0"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.0"])
     else
       s.add_dependency(%q<rack>, ["~> 1.2"])
-      s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.10"])
-      s.add_dependency(%q<hoe>, ["~> 2.16"])
+      s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
+      s.add_dependency(%q<hoe>, ["~> 3.0"])
     end
   else
     s.add_dependency(%q<rack>, ["~> 1.2"])
-    s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.10"])
-    s.add_dependency(%q<hoe>, ["~> 2.16"])
+    s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
+    s.add_dependency(%q<hoe>, ["~> 3.0"])
   end
 end

data/test/test_puma_server.rb

@@ -23,7 +23,7 @@ class TestPumaServer < Test::Unit::TestCase
   end
 
   def teardown
-    @server.stop
+    @server.stop(true)
   end
 
   def test_url_scheme_for_https
@@ -53,4 +53,27 @@ class TestPumaServer < Test::Unit::TestCase
 
     assert_equal "https", body
   end
+
+  def test_proper_stringio_body
+    data = nil
+
+    @server.app = proc do |env|
+      data = env['rack.input'].read
+      [200, {}, ["ok"]]
+    end
+
+    @server.add_tcp_listener @host, @port
+    @server.run
+
+    fifteen = "1" * 15
+
+    sock = TCPSocket.new @host, @port
+    sock << "PUT / HTTP/1.0\r\nContent-Length: 30\r\n\r\n#{fifteen}"
+    sleep 0.1 # important so that the previous data is sent as a packet
+    sock << fifteen
+
+    sock.read
+
+    assert_equal "#{fifteen}#{fifteen}", data
+  end
 end

metadata

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