jubilee 0.4.1 → 0.5.0

data/README.md

@@ -3,26 +3,38 @@
 Jubilee
 =========
 
-A fast rack server build upon [vertx](http://vertx.io)
+A fast rack server build upon [vertx 2.0](http://vertx.io).
+
+Why another rack server?
+------------------------
+
+"Vert.x is a lightweight, high performance application platform for the JVM
+that's designed for modern mobile, web, and enterprise applications."
+      -- vertx.io site
+
+In short, Vertx is nodejs on the JVM, only much more faster, checkout the awesome
+[benchmarks](http://vertxproject.wordpress.com/2012/05/09/vert-x-vs-node-js-simple-http-benchmarks/)
+
+By using Vertx, jubilee inherent advantages in terms of performance, and all
+the [other cool features of Vertx](#roadmap).
 
 Installation
 -----------
 
 ```gem install jubilee```
 
-Performance
------------
 
-Get request for [sinatra test app](https://github.com/isaiah/jubilee/tree/master/test/sinatra_app):
+Roadmap
+-----------
 
-with ```ab -c 20 -n 10000```
+  Eventbus support
 
-1750rps after warm
+  Shared data
 
-unicorn (worker 10): 1440rps
+  Clustering
 
-Requirement
------------
+Requirements
+------------
 
 Java7 or above
 

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/java/src/org/jruby/jubilee/Const.java

@@ -14,7 +14,7 @@ import java.util.Map;
  */
 public final class Const {
 
-    public static final String JUBILEE_VERSION = "Jubilee 0.1.0";
+    public static final String JUBILEE_VERSION = "Jubilee 0.5.0";
     public static final String HTTP_11 = "HTTP/1.1";
     public static final String HTTP_10 = "HTTP/1.0";
 

data/java/src/org/jruby/jubilee/impl/RubyIORackInput.java

@@ -11,6 +11,8 @@ import org.jruby.runtime.Block;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.ByteList;
+import org.jruby.util.StringSupport;
 import org.vertx.java.core.http.HttpServerRequest;
 
 import java.util.Arrays;
@@ -103,7 +105,7 @@ public class RubyIORackInput extends RubyObject implements RackInput {
     @Override
     @JRubyMethod(optional = 2)
     public IRubyObject read(ThreadContext context, IRubyObject[] args) {
-        RubyString dst = RubyString.newEmptyString(getRuntime(), BINARY);
+        RubyString dst = RubyString.newStringNoCopy(getRuntime(), new ByteList(), BINARY, StringSupport.CR_VALID);
         if (isEOF())
             return getRuntime().getNil();
         int length;
@@ -126,9 +128,8 @@ public class RubyIORackInput extends RubyObject implements RackInput {
             buf.readBytes(buffer, length - toRead, len);
             toRead = toRead - len;
         }
-        if (toRead > 0)
-            buffer = Arrays.copyOfRange(buffer, 0, length - toRead);
-        return dst.cat(buffer);
+        if (toRead > 0) length -= toRead;
+        return dst.cat(buffer, 0, length);
     }
 
     /**
@@ -190,11 +191,11 @@ public class RubyIORackInput extends RubyObject implements RackInput {
     private IRubyObject readAll(RubyString dst) {
         buf.readerIndex(0);
         while(!eof.get())
-            ; // wait until all data received
+          ; // wait until all data received
         int length = this.chunked ? buf.readableBytes() : Math.min(this.len, buf.readableBytes());
         byte[] data = new byte[length];
-        dst.cat(data);
         buf.readBytes(data);
+        dst.cat(data);
         return dst.isEmpty() ? getRuntime().getNil() : dst;
     }
 }

data/jubilee.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "jubilee"
-  s.version = "0.4.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Isaiah Peng"]
-  s.date = "2013-09-16"
+  s.date = "2013-09-19"
   s.description = "Jubilee is a experimental webserver built for speed, it's based on Vertx."
   s.email = "issaria@gmail.com"
   s.executables = ["jubilee", "jubilee_d"]

data/lib/jubilee/cli.rb

@@ -21,7 +21,6 @@ module Jubilee
     def run
       parse_options
       @config = Jubilee::Configuration.new(@options)
-      @config.load
       server = Jubilee::Server.new(@config.app, @options)
       server.start
       puts "Jubilee is listening on port #{@config.port}, press Ctrl+C to quit"
@@ -35,7 +34,7 @@ module Jubilee
         daemon: false,
         Port: 3215,
         ssl: false,
-        environment: "development"
+        environment: ENV["RACK_ENV"] || "development"
       }
       @parser = OptionParser.new do |o|
         o.separator ""

data/lib/jubilee/configuration.rb

@@ -7,8 +7,14 @@ module Jubilee
       @block = block
     end
 
-    def load
-      @app = load_rack_adapter(@options, &@block)
+    def app
+      @app ||= load_rack_adapter(@options, &@block)
+      if !@options[:quiet] and @options[:environment] == "development"
+        logger = @options[:logger] || STDOUT
+        Rack::CommonLogger.new(@app, logger)
+      else
+        @app
+      end
     end
 
     def port
@@ -44,26 +50,12 @@ module Jubilee
           inner_app, opts = Rack::Builder.parse_file "config.ru"
         end
       end
-      case ENV["RACK_ENV"]
-      when "development"
-        Rack::Builder.new do
-          use Rack::ContentLength
-          use Rack::Chunked
-          use Rack::CommonLogger, $stderr
-          use Rack::ShowExceptions
-          use Rack::Lint
-          run inner_app
-        end.to_app
-      when "deployment"
-        Rack::Builder.new do
-          use Rack::ContentLength
-          use Rack::Chunked
-          use Rack::CommonLogger, $stderr
-          run inner_app
-        end.to_app
-      else
-        inner_app
-      end
+      inner_app
+      #Rack::Builder.new do
+      #  use Rack::MethodOverride
+      #  use Rack::CommonLogger, $stderr
+      #  run inner_app
+      #end.to_app
     end
   end
 end

data/test/jubilee/test_config.rb

@@ -6,7 +6,6 @@ class TestConfig < MiniTest::Unit::TestCase
     @config = Jubilee::Configuration.new({rackup: "config/app.rb"})
   end
   def test_load
-    @config.load
     resp = [200, {"Content-Type" => "text/plain"}, ["embeded app"]]
     #skip "hard to test because of Rack::Lint"
     assert_equal resp, @config.app.call({})

data/test/jubilee/test_rack_server.rb

@@ -50,6 +50,7 @@ class TestRackServer < MiniTest::Unit::TestCase
 
   def teardown
     @server.stop
+    sleep 0.1
   end
 
   def test_lint
@@ -69,6 +70,7 @@ class TestRackServer < MiniTest::Unit::TestCase
     @server = Jubilee::Server.new @checker
 
     @server.start
+    sleep 0.1
 
     big = "x" * (1024 * 16)
 
@@ -92,8 +94,9 @@ class TestRackServer < MiniTest::Unit::TestCase
 
   def test_request_method
     input = nil
-    @server = Jubilee::Server.new (lambda { |env| input = env; @simple.call(env) })
+    @server = Jubilee::Server.new(Rack::MethodOverride.new(lambda { |env| input = env; @simple.call(env) }))
     @server.start
+    sleep 0.1
 
     POST('/test/a/b/c', {"_method" => "delete", "user" => 1})
     assert_equal "DELETE", input['REQUEST_METHOD']
@@ -119,6 +122,7 @@ class TestRackServer < MiniTest::Unit::TestCase
     input = nil
     @server = Jubilee::Server.new (lambda { |env| input = env; @simple.call(env) })
     @server.start
+    sleep 0.1
 
     req = Net::HTTP::Post::Multipart.new("/", "foo" => "bar")
     resp = Net::HTTP.start('localhost', 3215) do |http|

data/test/jubilee/test_server.rb

@@ -4,12 +4,18 @@ require 'net/http'
 class TestJubileeServer < MiniTest::Unit::TestCase
   def setup
     @host, @port = "localhost", 3215
+    @server = nil
+  end
+
+  def teardown
+    @server.stop if @server
   end
 
   def test_server_lambda
     app = lambda {|env| [200, {"Content-Type" => "text/plain"}, ["http"]] }
-    server = Jubilee::Server.new(app)
-    server.start
+    @server = Jubilee::Server.new(app)
+    @server.start
+    sleep 0.1
 
     http, body = Net::HTTP.new(@host, @port), nil
     http.start do
@@ -18,15 +24,14 @@ class TestJubileeServer < MiniTest::Unit::TestCase
         body = resp.body
       end
     end
-    server.stop
     assert_equal "http", body
   end
 
   def test_server_embeded
     config = Jubilee::Configuration.new(rackup: File.join(File.dirname(__FILE__), "../config/app.rb"))
-    config.load
-    server = Jubilee::Server.new(config.app)
-    server.start
+    @server = Jubilee::Server.new(config.app)
+    @server.start
+    sleep 0.1
     http, body = Net::HTTP.new(@host, @port), nil
     http.start do
       req = Net::HTTP::Get.new "/", {}
@@ -34,7 +39,6 @@ class TestJubileeServer < MiniTest::Unit::TestCase
         body = resp.body
       end
     end
-    server.stop
     assert_equal "embeded app", body
   end
 
@@ -44,10 +48,11 @@ class TestJubileeServer < MiniTest::Unit::TestCase
 
   def test_url_scheme_for_https
     app = lambda { |env| [200, {}, [env['rack.url_scheme']]] }
-    server = Jubilee::Server.new(app, {port:@port, ssl:true, 
+    @server = Jubilee::Server.new(app, {port:@port, ssl:true, 
                                  keystore_path: File.join(File.dirname(__FILE__), "../../examples/jubilee/server-keystore.jks"),
     keystore_password: "wibble"})
-    server.start
+    @server.start
+    sleep 0.1
     http = Net::HTTP.new @host, @port
     http.use_ssl = true
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -61,7 +66,6 @@ class TestJubileeServer < MiniTest::Unit::TestCase
       end
     end
 
-    server.stop
     assert_equal "https", body
   end
 

data/test/jubilee/test_upload.rb

@@ -185,7 +185,7 @@ class TestUpload < MiniTest::Unit::TestCase
 
     assert $?.success?, 'curl ran OK'
     assert_match(%r!\b#{sha1}\b!, resp)
-    assert_match(/sysread_read_byte_match/, resp)
+    #assert_match(/sysread_read_byte_match/, resp)
 
     # small StringIO path
     assert(system("dd", "if=#{@random.path}", "of=#{tmp.path}",

data/test/test_helper.rb

@@ -6,6 +6,7 @@ require 'net/http'
 require 'net/http/post/multipart'
 require 'yaml'
 def hit(uris)
+  sleep 0.1
   uris.map do |u|
     res = nil
 

metadata

@@ -2,14 +2,14 @@
 name: jubilee
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Isaiah Peng
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack