puma 0.8.1 → 0.8.2

data/Gemfile

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+gem "hoe"
+gem "rdoc"
+gem "rake-compiler"
+gem "rack"

data/Manifest.txt

@@ -1,4 +1,5 @@
 COPYING
+Gemfile
 History.txt
 LICENSE
 Manifest.txt
@@ -17,23 +18,24 @@ examples/monitrc
 examples/random_thrash.rb
 examples/simpletest.rb
 examples/webrick_compare.rb
-ext/puma_http11/Http11Service.java
+ext/puma_http11/PumaHttp11Service.java
 ext/puma_http11/ext_help.h
 ext/puma_http11/extconf.rb
-ext/puma_http11/puma_http11.c
 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/mongrel/Http11.java
-ext/puma_http11/org/jruby/mongrel/Http11Parser.java
+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/cli.rb
 lib/puma/const.rb
 lib/puma/events.rb
 lib/puma/gems.rb
 lib/puma/mime_types.yml
+lib/puma/rack_patch.rb
 lib/puma/server.rb
 lib/puma/thread_pool.rb
 lib/puma/utils.rb
@@ -45,6 +47,7 @@ tasks/native.rake
 tasks/ragel.rake
 test/lobster.ru
 test/mime.yaml
+test/test_cli.rb
 test/test_http10.rb
 test/test_http11.rb
 test/test_persistent.rb

data/Rakefile

@@ -6,5 +6,7 @@
 
 require 'rubygems'
 
+IS_JRUBY = defined?(RUBY_ENGINE) ? RUBY_ENGINE == "jruby" : false
+
 # load rakefile extensions (tasks)
 Dir['tasks/*.rake'].sort.each { |f| load f }

data/ext/puma_http11/{Http11Service.java → PumaHttp11Service.java}

@@ -3,9 +3,9 @@ import java.io.IOException;
 import org.jruby.Ruby;
 import org.jruby.runtime.load.BasicLibraryService;
 
-import org.jruby.mongrel.Http11;
+import org.jruby.puma.Http11;
 
-public class Http11Service implements BasicLibraryService { 
+public class PumaHttp11Service implements BasicLibraryService { 
     public boolean basicLoad(final Ruby runtime) throws IOException {
         Http11.createHttp11(runtime);
         return true;

data/ext/puma_http11/http11_parser.java.rl

@@ -1,4 +1,4 @@
-package org.jruby.mongrel;
+package org.jruby.puma;
 
 import org.jruby.util.ByteList;
 
@@ -121,7 +121,9 @@ public class Http11Parser {
 
      p = off;
      pe = len;
-     byte[] data = buffer.unsafeBytes();
+     // get a copy of the bytes, since it may not start at 0
+     // FIXME: figure out how to just use the bytes in-place
+     byte[] data = buffer.bytes();
      parser.buffer = buffer;
 
      %% write exec;

data/ext/puma_http11/org/jruby/{mongrel → puma}/Http11.java

@@ -1,4 +1,4 @@
-package org.jruby.mongrel;
+package org.jruby.puma;
 
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
@@ -45,21 +45,22 @@ public class Http11 extends RubyObject {
     };
 
     public static void createHttp11(Ruby runtime) {
-        RubyModule mMongrel = runtime.defineModule("Mongrel");
-        mMongrel.defineClassUnder("HttpParserError",runtime.getClass("IOError"),runtime.getClass("IOError").getAllocator());
+        RubyModule mPuma = runtime.defineModule("Puma");
+        mPuma.defineClassUnder("HttpParserError",runtime.getClass("IOError"),runtime.getClass("IOError").getAllocator());
 
-        RubyClass cHttpParser = mMongrel.defineClassUnder("HttpParser",runtime.getObject(),ALLOCATOR);
+        RubyClass cHttpParser = mPuma.defineClassUnder("HttpParser",runtime.getObject(),ALLOCATOR);
         cHttpParser.defineAnnotatedMethods(Http11.class);
     }
 
     private Ruby runtime;
     private RubyClass eHttpParserError;
     private Http11Parser hp;
+    private RubyString body;
 
     public Http11(Ruby runtime, RubyClass clazz) {
         super(runtime,clazz);
         this.runtime = runtime;
-        this.eHttpParserError = (RubyClass)runtime.getModule("Mongrel").getConstant("HttpParserError");
+        this.eHttpParserError = (RubyClass)runtime.getModule("Puma").getConstant("HttpParserError");
         this.hp = new Http11Parser();
         this.hp.parser.http_field = http_field;
         this.hp.parser.request_method = request_method;
@@ -86,7 +87,6 @@ public class Http11 extends RubyObject {
                 validateMaxLength(vlen, MAX_FIELD_VALUE_LENGTH, MAX_FIELD_VALUE_LENGTH_ERR);
 
                 v = RubyString.newString(runtime, new ByteList(Http11.this.hp.parser.buffer,value,vlen));
-                f = RubyString.newString(runtime, "HTTP_");
                 ByteList b = new ByteList(Http11.this.hp.parser.buffer,field,flen);
                 for(int i = 0,j = b.length();i<j;i++) {
                     if((b.get(i) & 0xFF) == '-') {
@@ -95,7 +95,15 @@ public class Http11 extends RubyObject {
                         b.set(i, (byte)Character.toUpperCase((char)b.get(i)));
                     }
                 }
-                f.cat(b);
+
+                String as = b.toString();
+
+                if(as.equals("CONTENT_LENGTH") || as.equals("CONTENT_TYPE")) {
+                  f = RubyString.newString(runtime, b);
+                } else {
+                  f = RubyString.newString(runtime, "HTTP_");
+                  f.cat(b);
+                }
                 req.op_aset(req.getRuntime().getCurrentContext(), f,v);
             }
         };
@@ -154,36 +162,7 @@ public class Http11 extends RubyObject {
 
     private Http11Parser.ElementCB header_done = new Http11Parser.ElementCB() {
             public void call(Object data, int at, int length) {
-                RubyHash req = (RubyHash)data;
-                ThreadContext context = req.getRuntime().getCurrentContext();
-                IRubyObject temp,ctype,clen;
-
-                clen = req.op_aref(context, runtime.newString("HTTP_CONTENT_LENGTH"));
-                if(!clen.isNil()) {
-                    req.op_aset(context, runtime.newString("CONTENT_LENGTH"),clen);
-                }
-
-                ctype = req.op_aref(context, runtime.newString("HTTP_CONTENT_TYPE"));
-                if(!ctype.isNil()) {
-                    req.op_aset(context, runtime.newString("CONTENT_TYPE"),ctype);
-                }
-
-                req.op_aset(context, runtime.newString("GATEWAY_INTERFACE"),runtime.newString("CGI/1.2"));
-                if(!(temp = req.op_aref(context, runtime.newString("HTTP_HOST"))).isNil()) {
-                    String s = temp.toString();
-                    int colon = s.indexOf(':');
-                    if(colon != -1) {
-                        req.op_aset(context, runtime.newString("SERVER_NAME"),runtime.newString(s.substring(0,colon)));
-                        req.op_aset(context, runtime.newString("SERVER_PORT"),runtime.newString(s.substring(colon+1)));
-                    } else {
-                        req.op_aset(context, runtime.newString("SERVER_NAME"),temp);
-                        req.op_aset(context, runtime.newString("SERVER_PORT"),runtime.newString("80"));
-                    }
-                }
-
-                req.setInstanceVariable("@http_body", RubyString.newString(runtime, new ByteList(hp.parser.buffer, at, length)));
-                req.op_aset(context, runtime.newString("SERVER_PROTOCOL"),runtime.newString("HTTP/1.1"));
-                req.op_aset(context, runtime.newString("SERVER_SOFTWARE"),runtime.newString("Mongrel 1.2.0.beta.1"));
+                body = RubyString.newString(runtime, new ByteList(hp.parser.buffer, at, length));
             }
         };
 
@@ -238,4 +217,9 @@ public class Http11 extends RubyObject {
     public IRubyObject nread() {
         return runtime.newFixnum(this.hp.parser.nread);
     }
+    
+    @JRubyMethod
+    public IRubyObject body() {
+        return body;
+    }
 }// Http11

data/ext/puma_http11/org/jruby/{mongrel → puma}/Http11Parser.java

@@ -1,6 +1,6 @@
 
-// line 1 "ext/http11/http11_parser.java.rl"
-package org.jruby.mongrel;
+// line 1 "ext/puma_http11/http11_parser.java.rl"
+package org.jruby.puma;
 
 import org.jruby.util.ByteList;
 
@@ -9,12 +9,12 @@ public class Http11Parser {
 /** Machine **/
 
 
-// line 65 "ext/http11/http11_parser.java.rl"
+// line 65 "ext/puma_http11/http11_parser.java.rl"
 
 
 /** Data **/
 
-// line 18 "ext/http11/org/jruby/mongrel/Http11Parser.java"
+// line 18 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
 private static byte[] init__http_parser_actions_0()
 {
 	return new byte [] {
@@ -200,7 +200,7 @@ static final int http_parser_error = 0;
 static final int http_parser_en_main = 1;
 
 
-// line 69 "ext/http11/http11_parser.java.rl"
+// line 69 "ext/puma_http11/http11_parser.java.rl"
 
    public static interface ElementCB {
      public void call(Object data, int at, int length);
@@ -236,12 +236,12 @@ static final int http_parser_en_main = 1;
           cs = 0;
 
           
-// line 240 "ext/http11/org/jruby/mongrel/Http11Parser.java"
+// line 240 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
 	{
 	cs = http_parser_start;
 	}
 
-// line 104 "ext/http11/http11_parser.java.rl"
+// line 104 "ext/puma_http11/http11_parser.java.rl"
 
           body_start = 0;
           content_len = 0;
@@ -262,11 +262,13 @@ static final int http_parser_en_main = 1;
 
      p = off;
      pe = len;
-     byte[] data = buffer.unsafeBytes();
+     // get a copy of the bytes, since it may not start at 0
+     // FIXME: figure out how to just use the bytes in-place
+     byte[] data = buffer.bytes();
      parser.buffer = buffer;
 
      
-// line 270 "ext/http11/org/jruby/mongrel/Http11Parser.java"
+// line 272 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -347,29 +349,29 @@ case 1:
 			switch ( _http_parser_actions[_acts++] )
 			{
 	case 0:
-// line 13 "ext/http11/http11_parser.java.rl"
+// line 13 "ext/puma_http11/http11_parser.java.rl"
 	{parser.mark = p; }
 	break;
 	case 1:
-// line 15 "ext/http11/http11_parser.java.rl"
+// line 15 "ext/puma_http11/http11_parser.java.rl"
 	{ parser.field_start = p; }
 	break;
 	case 2:
-// line 16 "ext/http11/http11_parser.java.rl"
+// line 16 "ext/puma_http11/http11_parser.java.rl"
 	{ /* FIXME stub */ }
 	break;
 	case 3:
-// line 17 "ext/http11/http11_parser.java.rl"
+// line 17 "ext/puma_http11/http11_parser.java.rl"
 	{ 
     parser.field_len = p-parser.field_start;
   }
 	break;
 	case 4:
-// line 21 "ext/http11/http11_parser.java.rl"
+// line 21 "ext/puma_http11/http11_parser.java.rl"
 	{ parser.mark = p; }
 	break;
 	case 5:
-// line 22 "ext/http11/http11_parser.java.rl"
+// line 22 "ext/puma_http11/http11_parser.java.rl"
 	{ 
     if(parser.http_field != null) {
       parser.http_field.call(parser.data, parser.field_start, parser.field_len, parser.mark, p-parser.mark);
@@ -377,53 +379,53 @@ case 1:
   }
 	break;
 	case 6:
-// line 27 "ext/http11/http11_parser.java.rl"
+// line 27 "ext/puma_http11/http11_parser.java.rl"
 	{ 
     if(parser.request_method != null) 
       parser.request_method.call(parser.data, parser.mark, p-parser.mark);
   }
 	break;
 	case 7:
-// line 31 "ext/http11/http11_parser.java.rl"
+// line 31 "ext/puma_http11/http11_parser.java.rl"
 	{ 
     if(parser.request_uri != null)
       parser.request_uri.call(parser.data, parser.mark, p-parser.mark);
   }
 	break;
 	case 8:
-// line 35 "ext/http11/http11_parser.java.rl"
+// line 35 "ext/puma_http11/http11_parser.java.rl"
 	{ 
     if(parser.fragment != null)
       parser.fragment.call(parser.data, parser.mark, p-parser.mark);
   }
 	break;
 	case 9:
-// line 40 "ext/http11/http11_parser.java.rl"
+// line 40 "ext/puma_http11/http11_parser.java.rl"
 	{parser.query_start = p; }
 	break;
 	case 10:
-// line 41 "ext/http11/http11_parser.java.rl"
+// line 41 "ext/puma_http11/http11_parser.java.rl"
 	{ 
     if(parser.query_string != null)
       parser.query_string.call(parser.data, parser.query_start, p-parser.query_start);
   }
 	break;
 	case 11:
-// line 46 "ext/http11/http11_parser.java.rl"
+// line 46 "ext/puma_http11/http11_parser.java.rl"
 	{	
     if(parser.http_version != null)
       parser.http_version.call(parser.data, parser.mark, p-parser.mark);
   }
 	break;
 	case 12:
-// line 51 "ext/http11/http11_parser.java.rl"
+// line 51 "ext/puma_http11/http11_parser.java.rl"
 	{
     if(parser.request_path != null)
       parser.request_path.call(parser.data, parser.mark, p-parser.mark);
   }
 	break;
 	case 13:
-// line 56 "ext/http11/http11_parser.java.rl"
+// line 56 "ext/puma_http11/http11_parser.java.rl"
 	{ 
     parser.body_start = p + 1; 
     if(parser.header_done != null)
@@ -431,7 +433,7 @@ case 1:
     { p += 1; _goto_targ = 5; if (true)  continue _goto;}
   }
 	break;
-// line 435 "ext/http11/org/jruby/mongrel/Http11Parser.java"
+// line 437 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
 			}
 		}
 	}
@@ -451,7 +453,7 @@ case 5:
 	break; }
 	}
 
-// line 128 "ext/http11/http11_parser.java.rl"
+// line 130 "ext/puma_http11/http11_parser.java.rl"
 
      parser.cs = cs;
      parser.nread += (p - off);

data/lib/puma/cli.rb

@@ -4,6 +4,8 @@ require 'uri'
 require 'puma/server'
 require 'puma/const'
 
+require 'rack/commonlogger'
+
 module Puma
   class CLI
     DefaultTCPHost = "0.0.0.0"
@@ -31,12 +33,25 @@ module Puma
     def setup_options
       @options = {
         :min_threads => 0,
-        :max_threads => 16
+        :max_threads => 16,
+        :quiet => false
       }
 
       @binds = []
 
       @parser = OptionParser.new do |o|
+        o.on "-b", "--bind URI", "URI to bind to (tcp:// and unix:// only)" do |arg|
+          @binds << arg
+        end
+
+        o.on "--pidfile PATH", "Use PATH as a pidfile" do |arg|
+          @options[:pidfile] = arg
+        end
+
+        o.on "-q", "--quiet", "Quiet down the output" do
+          @options[:quiet] = true
+        end
+
         o.on '-t', '--threads INT', "min:max threads to use (default 0:16)" do |arg|
           min, max = arg.split(":")
           if max
@@ -48,9 +63,6 @@ module Puma
           end
         end
 
-        o.on "-b", "--bind URI", "URI to bind to (tcp:// and unix:// only)" do |arg|
-          @binds << arg
-        end
       end
 
       @parser.banner = "puma <options> <rackup file>"
@@ -72,8 +84,20 @@ module Puma
       end
     end
 
-    def run
+    def write_pid
+      if path = @options[:pidfile]
+        File.open(path, "w") do |f|
+          f.puts Process.pid
+        end
+      end
+    end
+
+    def parse_options
       @parser.parse! @argv
+    end
+
+    def run
+      parse_options
 
       @rackup = ARGV.shift || "config.ru"
 
@@ -82,6 +106,11 @@ module Puma
       end
 
       load_rackup
+      write_pid
+
+      unless @quiet
+        @app = Rack::CommonLogger.new(@app, STDOUT)
+      end
 
       if @binds.empty?
         @options[:Host] ||= DefaultTCPHost
@@ -125,7 +154,11 @@ module Puma
 
       log "Use Ctrl-C to stop"
 
-      server.run.join
+      begin
+        server.run.join
+      rescue Interrupt
+        log " - Shutting down..."
+      end
     end
   end
 end

data/lib/puma/const.rb

@@ -71,7 +71,7 @@ module Puma
 
     PATH_INFO = 'PATH_INFO'.freeze
 
-    PUMA_VERSION = VERSION = "0.8.1".freeze
+    PUMA_VERSION = VERSION = "0.8.2".freeze
 
     PUMA_TMP_BASE = "puma".freeze
 

data/lib/puma/rack_patch.rb

@@ -0,0 +1,22 @@
+require 'rack/commonlogger'
+
+module Rack
+  # Patch CommonLogger to use after_reply
+  class CommonLogger
+    remove_method :call
+
+    def call(env)
+      began_at = Time.now
+      status, header, body = @app.call(env)
+      header = Utils::HeaderHash.new(header)
+
+      if ary = env['rack.after_reply']
+        ary << lambda { log(env, status, header, began_at) }
+      else
+        body = BodyProxy.new(body) { log(env, status, header, began_at) }
+      end
+
+      [status, header, body]
+    end
+  end
+end

data/lib/puma/server.rb

@@ -142,7 +142,11 @@ module Puma
             nparsed = parser.execute(env, data, nparsed)
 
             if parser.finished?
-              return unless handle_request env, client, parser.body
+              cl = env[CONTENT_LENGTH]
+
+              return unless handle_request(env, client, parser.body, cl)
+
+              nparsed += parser.body.size if cl
 
               if data.size > nparsed
                 data.slice!(0, nparsed)
@@ -219,12 +223,15 @@ module Puma
       env[REMOTE_ADDR] = client.peeraddr.last
     end
 
-    def handle_request(env, client, body)
+    def handle_request(env, client, body, cl)
       normalize_env env, client
 
-      body = read_body env, client, body
-
-      return false unless body
+      if cl
+        body = read_body env, client, body, cl
+        return false unless body
+      else
+        body = StringIO.new("")
+      end
 
       env["rack.input"] = body
       env["rack.url_scheme"] =  env["HTTPS"] ? "https" : "http"
@@ -325,8 +332,8 @@ module Puma
       return keep_alive
     end
 
-    def read_body(env, client, body)
-      content_length = env[CONTENT_LENGTH].to_i
+    def read_body(env, client, body, cl)
+      content_length = cl.to_i
 
       remain = content_length - body.size
 

data/lib/rack/handler/puma.rb

@@ -4,13 +4,27 @@ require 'puma'
 module Rack
   module Handler
     module Puma
-      DEFAULT_OPTIONS = {:Host => '0.0.0.0', :Port => 8080, :Threads => '0:16'}
+      DEFAULT_OPTIONS = {
+        :Host => '0.0.0.0',
+        :Port => 8080,
+        :Threads => '0:16',
+        :Quiet => false
+      }
 
       def self.run(app, options = {})
         options  = DEFAULT_OPTIONS.merge(options)
+
+        unless options[:Quiet]
+          app = Rack::CommonLogger.new(app, STDOUT)
+        end
+
         server   = ::Puma::Server.new(app)
         min, max = options[:Threads].split(':', 2)
 
+        puts "Puma #{::Puma::Const::PUMA_VERSION} starting..."
+        puts "* Min threads: #{min}, max threads: #{max}"
+        puts "* Listening on tcp://#{options[:Host]}:#{options[:Port]}"
+
         server.add_tcp_listener options[:Host], options[:Port]
         server.min_threads = Integer(min)
         server.max_threads = Integer(max)
@@ -23,7 +37,8 @@ module Rack
         {
           "Host=HOST"       => "Hostname to listen on (default: localhost)",
           "Port=PORT"       => "Port to listen on (default: 8080)",
-          "Threads=MIN:MAX" => "min:max threads to use (default 0:16)"
+          "Threads=MIN:MAX" => "min:max threads to use (default 0:16)",
+          "Quiet"           => "Don't report each request"
         }
       end
     end

data/puma.gemspec

@@ -2,38 +2,38 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2011-10-25"
+  s.date = "2011-11-22"
   s.description = "Puma is a small library that provides a very fast and concurrent HTTP 1.1 server for Ruby web applications.  It is designed for running rack apps only.\n\nWhat makes Puma so fast is the careful use of an Ragel extension to provide fast, accurate HTTP 1.1 protocol parsing. This makes the server scream without too many portability issues."
   s.email = ["evan@phx.io"]
   s.executables = ["puma"]
   s.extensions = ["ext/puma_http11/extconf.rb"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
-  s.files = ["COPYING", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "examples/builder.rb", "examples/camping/README", "examples/camping/blog.rb", "examples/camping/tepee.rb", "examples/httpd.conf", "examples/mime.yaml", "examples/mongrel.conf", "examples/monitrc", "examples/random_thrash.rb", "examples/simpletest.rb", "examples/webrick_compare.rb", "ext/puma_http11/Http11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/puma_http11.c", "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/mongrel/Http11.java", "ext/puma_http11/org/jruby/mongrel/Http11Parser.java", "lib/puma.rb", "lib/puma/cli.rb", "lib/puma/const.rb", "lib/puma/events.rb", "lib/puma/gems.rb", "lib/puma/mime_types.yml", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/puma/utils.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "tasks/gem.rake", "tasks/java.rake", "tasks/native.rake", "tasks/ragel.rake", "test/lobster.ru", "test/mime.yaml", "test/test_http10.rb", "test/test_http11.rb", "test/test_persistent.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", ".gemtest"]
+  s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "examples/builder.rb", "examples/camping/README", "examples/camping/blog.rb", "examples/camping/tepee.rb", "examples/httpd.conf", "examples/mime.yaml", "examples/mongrel.conf", "examples/monitrc", "examples/random_thrash.rb", "examples/simpletest.rb", "examples/webrick_compare.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/cli.rb", "lib/puma/const.rb", "lib/puma/events.rb", "lib/puma/gems.rb", "lib/puma/mime_types.yml", "lib/puma/rack_patch.rb", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/puma/utils.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "tasks/gem.rake", "tasks/java.rake", "tasks/native.rake", "tasks/ragel.rake", "test/lobster.ru", "test/mime.yaml", "test/test_cli.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_persistent.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", ".gemtest"]
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "puma"
   s.rubygems_version = "1.8.10"
   s.summary = "Puma is a small library that provides a very fast and concurrent HTTP 1.1 server for Ruby web applications"
-  s.test_files = ["test/test_http10.rb", "test/test_http11.rb", "test/test_persistent.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"]
+  s.test_files = ["test/test_cli.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_persistent.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"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, ["~> 1.3"])
+      s.add_runtime_dependency(%q<rack>, ["~> 1.2"])
       s.add_development_dependency(%q<rake-compiler>, ["~> 0.7.0"])
       s.add_development_dependency(%q<hoe>, ["~> 2.10"])
     else
-      s.add_dependency(%q<rack>, ["~> 1.3"])
+      s.add_dependency(%q<rack>, ["~> 1.2"])
       s.add_dependency(%q<rake-compiler>, ["~> 0.7.0"])
       s.add_dependency(%q<hoe>, ["~> 2.10"])
     end
   else
-    s.add_dependency(%q<rack>, ["~> 1.3"])
+    s.add_dependency(%q<rack>, ["~> 1.2"])
     s.add_dependency(%q<rake-compiler>, ["~> 0.7.0"])
     s.add_dependency(%q<hoe>, ["~> 2.10"])
   end

data/tasks/gem.rake

@@ -8,7 +8,7 @@ HOE = Hoe.spec 'puma' do
   spec_extras[:extensions] = ["ext/puma_http11/extconf.rb"]
   spec_extras[:executables] = ['puma']
 
-  dependency 'rack', '~> 1.3'
+  dependency 'rack', '~> 1.2'
 
   extra_dev_deps << ['rake-compiler', "~> 0.7.0"]
 

data/tasks/java.rake

@@ -1,9 +1,9 @@
-if ENV['JAVA']
+if IS_JRUBY
 
   require 'rake/javaextensiontask'
 
   # build http11 java extension
-  Rake::JavaExtensionTask.new('http11', HOE.spec) do |ext|
+  Rake::JavaExtensionTask.new('puma_http11', HOE.spec) do |ext|
     ext.java_compiling do |gs|
       gs.dependencies.delete gs.dependencies.find { |d| d.name == 'daemons' }
     end

data/tasks/native.rake

@@ -1,25 +1,36 @@
-# use rake-compiler for building the extension
-require 'rake/extensiontask'
-
-# build http11 C extension
-Rake::ExtensionTask.new('puma_http11', HOE.spec) do |ext|
-  # define target for extension (supporting fat binaries)
-  if RUBY_PLATFORM =~ /mingw|mswin/ then
-    RUBY_VERSION =~ /(\d+\.\d+)/
-    ext.lib_dir = "lib/#{$1}"
-  elsif ENV['CROSS']
-    # define cross-compilation tasks when not on Windows.
-    ext.cross_compile = true
-    ext.cross_platform = ['i386-mswin32', 'i386-mingw32']
-
-    ext.cross_compiling do |gs|
-      gs.dependencies.delete gs.dependencies.find { |d| d.name == 'daemons' }
+unless IS_JRUBY
+  
+  # use rake-compiler for building the extension
+  require 'rake/extensiontask'
+  
+  # build http11 C extension
+  Rake::ExtensionTask.new('puma_http11', HOE.spec) do |ext|
+    # define target for extension (supporting fat binaries)
+    if RUBY_PLATFORM =~ /mingw|mswin/ then
+      RUBY_VERSION =~ /(\d+\.\d+)/
+      ext.lib_dir = "lib/#{$1}"
+    elsif ENV['CROSS']
+      # define cross-compilation tasks when not on Windows.
+      ext.cross_compile = true
+      ext.cross_platform = ['i386-mswin32', 'i386-mingw32']
+  
+      ext.cross_compiling do |gs|
+        gs.dependencies.delete gs.dependencies.find { |d| d.name == 'daemons' }
+      end
     end
+  
+    # cleanup versioned library directory
+    CLEAN.include 'lib/{1.8,1.9}'
   end
+end
 
-  # cleanup versioned library directory
-  CLEAN.include 'lib/{1.8,1.9}'
+task :ext_clean do
+  sh "rm -rf lib/puma_http11.bundle"
+  sh "rm -rf lib/puma_http11.jar"
+  sh "rm -rf lib/puma_http11.so"
 end
 
 # ensure things are built prior testing
 task :test => [:compile]
+
+task :clean => :ext_clean

data/tasks/ragel.rake

@@ -1,7 +1,7 @@
 
 # the following tasks ease the build of C file from Ragel one
 
-file 'ext/http11/http11_parser.c' => ['ext/http11/http11_parser.rl'] do |t|
+file 'ext/puma_http11/http11_parser.c' => ['ext/puma_http11/http11_parser.rl'] do |t|
   begin
     sh "ragel #{t.prerequisites.last} -C -G2 -o #{t.name}"
   rescue
@@ -9,7 +9,7 @@ file 'ext/http11/http11_parser.c' => ['ext/http11/http11_parser.rl'] do |t|
   end
 end
 
-file 'ext/http11/org/jruby/puma/Http11Parser.java' => ['ext/http11/http11_parser.java.rl'] do |t|
+file 'ext/puma_http11/org/jruby/puma/Http11Parser.java' => ['ext/puma_http11/http11_parser.java.rl'] do |t|
   begin
     sh "ragel #{t.prerequisites.last} -J -G2 -o #{t.name}"
   rescue
@@ -17,4 +17,8 @@ file 'ext/http11/org/jruby/puma/Http11Parser.java' => ['ext/http11/http11_parser
   end
 end
 
-task :ragel => (defined?(JRUBY_VERSION) ? 'ext/http11/org/jruby/puma/Http11Parser.java' : 'ext/http11/http11_parser.c')
+if IS_JRUBY
+  task :ragel => 'ext/puma_http11/org/jruby/puma/Http11Parser.java'
+else
+  task :ragel => 'ext/puma_http11/http11_parser.c'
+end

data/test/test_cli.rb

@@ -0,0 +1,19 @@
+require 'test/unit'
+require 'puma/cli'
+require 'tempfile'
+
+class TestCLI < Test::Unit::TestCase
+  def setup
+    @pid_file = Tempfile.new("puma-test")
+    @pid_path = @pid_file.path
+    @pid_file.close!
+  end
+
+  def test_pid_file
+    cli = Puma::CLI.new ["--pidfile", @pid_path]
+    cli.parse_options
+    cli.write_pid
+
+    assert_equal File.read(@pid_path).strip.to_i, Process.pid
+  end
+end

data/test/test_persistent.rb

@@ -1,5 +1,6 @@
 require 'puma'
 require 'test/unit'
+require 'timeout'
 
 class TestPersistent < Test::Unit::TestCase
   def setup
@@ -8,9 +9,17 @@ class TestPersistent < Test::Unit::TestCase
     @http10_request = "GET / HTTP/1.0\r\nHost: test.com\r\nContent-Type: text/plain\r\n\r\n"
     @keep_request = "GET / HTTP/1.0\r\nHost: test.com\r\nContent-Type: text/plain\r\nConnection: Keep-Alive\r\n\r\n"
 
+    @valid_post = "POST / HTTP/1.1\r\nHost: test.com\r\nContent-Type: text/plain\r\nContent-Length: 5\r\n\r\nhello"
+
     @headers = { "X-Header" => "Works" }
     @body = ["Hello"]
-    @simple = lambda { |env| [200, @headers, @body] }
+    @inputs = []
+
+    @simple = lambda do |env|
+      @inputs << env['rack.input']
+      [200, @headers, @body]
+    end
+
     @server = Puma::Server.new @simple
     @server.add_tcp_listener "127.0.0.1", 9988
     @server.run
@@ -25,7 +34,9 @@ class TestPersistent < Test::Unit::TestCase
 
   def lines(count, s=@client)
     str = ""
-    count.times { str << s.gets }
+    timeout(5) do
+      count.times { str << s.gets }
+    end
     str
   end
 
@@ -51,6 +62,20 @@ class TestPersistent < Test::Unit::TestCase
     assert_equal "Hello", @client.read(5)
   end
 
+  def test_post_then_get
+    @client << @valid_post
+    sz = @body[0].size.to_s
+
+    assert_equal "HTTP/1.1 200 OK\r\nX-Header: Works\r\nContent-Length: #{sz}\r\n\r\n", lines(4)
+    assert_equal "Hello", @client.read(5)
+
+    @client << @valid_request
+    sz = @body[0].size.to_s
+
+    assert_equal "HTTP/1.1 200 OK\r\nX-Header: Works\r\nContent-Length: #{sz}\r\n\r\n", lines(4)
+    assert_equal "Hello", @client.read(5)
+  end
+
   def test_chunked
     @body << "Chunked"
 
@@ -156,4 +181,25 @@ class TestPersistent < Test::Unit::TestCase
     assert_equal "Hello", @client.read(5)
   end
 
+  def test_second_request_not_in_first_req_body
+    @server.persistent_timeout = 3
+
+    req = @valid_request.to_s
+    req << "GET /second HTTP/1.1\r\nHost: test.com\r\nContent-Type: text/plain\r\n\r\n"
+
+    @client << req
+
+    sz = @body[0].size.to_s
+
+    assert_equal "HTTP/1.1 200 OK\r\nX-Header: Works\r\nContent-Length: #{sz}\r\n\r\n", lines(4)
+    assert_equal "Hello", @client.read(5)
+
+    assert_equal "HTTP/1.1 200 OK\r\nX-Header: Works\r\nContent-Length: #{sz}\r\n\r\n", lines(4)
+    assert_equal "Hello", @client.read(5)
+
+    assert_equal "", @inputs[0].string
+    assert_equal "", @inputs[1].string
+
+  end
+
 end

data/test/test_rack_server.rb

@@ -47,10 +47,17 @@ class TestRackServer < Test::Unit::TestCase
     @simple = lambda { |env| [200, { "X-Header" => "Works" }, ["Hello"]] }
     @server = Puma::Server.new @simple
     @server.add_tcp_listener "127.0.0.1", 9998
+
+    @stopped = false
   end
 
-  def teardown
+  def stop
     @server.stop(true)
+    @stopped = true
+  end
+
+  def teardown
+    @server.stop(true) unless @stopped
   end
 
   def test_lint
@@ -102,6 +109,8 @@ class TestRackServer < Test::Unit::TestCase
 
     hit(['http://localhost:9998/test'])
 
+    stop
+
     assert_match %r!GET /test HTTP/1\.1!, log.string
   end
 end

data/test/test_unix_socket.rb

@@ -3,32 +3,35 @@ require 'puma/server'
 
 require 'socket'
 
-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.exists? 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"
-
-    assert_equal expected, sock.read(expected.size)
-
-    sock.close
+# UNIX sockets are not recommended on JRuby
+unless defined?(JRUBY_VERSION)
+  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.exists? 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"
+  
+      assert_equal expected, sock.read(expected.size)
+  
+      sock.close
+    end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puma
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Evan Phoenix
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-25 00:00:00 Z
+date: 2011-11-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -25,11 +25,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 11
         segments: 
         - 1
-        - 3
-        version: "1.3"
+        - 2
+        version: "1.2"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -78,6 +78,7 @@ extra_rdoc_files:
 - Manifest.txt
 files: 
 - COPYING
+- Gemfile
 - History.txt
 - LICENSE
 - Manifest.txt
@@ -96,23 +97,24 @@ files:
 - examples/random_thrash.rb
 - examples/simpletest.rb
 - examples/webrick_compare.rb
-- ext/puma_http11/Http11Service.java
+- ext/puma_http11/PumaHttp11Service.java
 - ext/puma_http11/ext_help.h
 - ext/puma_http11/extconf.rb
-- ext/puma_http11/puma_http11.c
 - 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/mongrel/Http11.java
-- ext/puma_http11/org/jruby/mongrel/Http11Parser.java
+- 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/cli.rb
 - lib/puma/const.rb
 - lib/puma/events.rb
 - lib/puma/gems.rb
 - lib/puma/mime_types.yml
+- lib/puma/rack_patch.rb
 - lib/puma/server.rb
 - lib/puma/thread_pool.rb
 - lib/puma/utils.rb
@@ -124,6 +126,7 @@ files:
 - tasks/ragel.rake
 - test/lobster.ru
 - test/mime.yaml
+- test/test_cli.rb
 - test/test_http10.rb
 - test/test_http11.rb
 - test/test_persistent.rb
@@ -170,6 +173,7 @@ signing_key:
 specification_version: 3
 summary: Puma is a small library that provides a very fast and concurrent HTTP 1.1 server for Ruby web applications
 test_files: 
+- test/test_cli.rb
 - test/test_http10.rb
 - test/test_http11.rb
 - test/test_persistent.rb