jubilee 0.1.2 → 0.2.0

data/Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'rack'
+gem 'rack', '~> 1.4.1'
 gem 'spoon'
 
 group :development do

data/Gemfile.lock

@@ -15,16 +15,11 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.5)
     json (1.7.5-java)
     listen (0.5.3)
     lumberjack (1.0.2)
     method_source (0.8.1)
     multipart-post (1.1.5)
-    pry (0.9.10)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.3.1)
     pry (0.9.10-java)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -32,7 +27,6 @@ GEM
       spoon (~> 0.0)
     rack (1.4.1)
     rake (10.0.2)
-    rcov (0.9.11)
     rcov (0.9.11-java)
     rdoc (3.12)
       json (~> 1.4)
@@ -49,6 +43,6 @@ DEPENDENCIES
   jeweler
   multipart-post
   pry
-  rack
+  rack (~> 1.4.1)
   rcov
   spoon

data/README.md

@@ -3,23 +3,16 @@ Jubilee
 
 A fast rack server build upon [vertx](http://vertx.io)
 
-Known Issues
-----------
-
-* Direct use of HttpServerResponse object in Ruby Response class is
-  potentially slow. see [Improving Java Integration
-  Performance](https://github.com/jruby/jruby/wiki/ImprovingJavaIntegrationPerformance)
-
 TODO
 ----------
 
-* Daemon mode
-* Try non-block IO
+* Daemon mode (WIP)
+* [TeeInput](https://github.com/defunkt/unicorn/blob/master/lib/unicorn/tee_input.rb)
 * Site(WIP)
 * benchmark: Get, static file, post
 
 * EventBus
-* WebSocket [need test]
+* WebSocket 
 
 Fixed
 -----------
@@ -39,23 +32,30 @@ Installation
 ```gem install jubilee```
 
 Performance
-===========
-
-Get request for test/sinatra_app
 -----------
 
-Got rival performance as puma.
-(ab -c 20 -n 10000)
+Get request for [sinatra test app](https://github.com/isaiah/jubilee/tree/master/test/sinatra_app):
 
-jubilee: 1750rps after warm
-puma: 1327rps after warm
+with ```ab -c 20 -n 10000```
 
-unicorn (worker 10): 1440rps
+1750rps after warm
 
-Serve static file
------------
+unicorn (worker 10): 1440rps
 
 Requirement
-===========
+-----------
 
 JRuby '~> 1.7.0'
+
+License
+--------
+
+The same as JRuby and vertx
+
+
+Kudos
+--------
+
+Inspired by [this
+post](http://blog.jayfields.com/2012/05/how-i-open-source.html), I
+decide to release it early

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

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

@@ -7,7 +7,6 @@ import org.jruby.jubilee.impl.RubyIORackInput;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.vertx.java.core.Handler;
 import org.vertx.java.core.SimpleHandler;
-import org.vertx.java.core.Vertx;
 import org.vertx.java.core.buffer.Buffer;
 import org.vertx.java.core.http.HttpServerRequest;
 
@@ -23,15 +22,13 @@ public class RackApplication {
   private IRubyObject app;
   private boolean ssl;
   private Buffer bodyBuf;
-  private Vertx vertx;
 
   private ExecutorService exec;
 
-  public RackApplication(Vertx vertx, IRubyObject app, boolean ssl) {
+  public RackApplication(IRubyObject app, boolean ssl) {
     this.app = app;
     this.ssl = ssl;
     bodyBuf = new Buffer(0);
-    this.vertx = vertx;
     exec = Executors.newCachedThreadPool();
   }
 
@@ -51,13 +48,8 @@ public class RackApplication {
         RackInput input = new RubyIORackInput(runtime, bodyBuf, bodyLatch);
         RackEnvironment env = new DefaultRackEnvironment(runtime, request, input, ssl);
         IRubyObject result = app.callMethod(runtime.getCurrentContext(), "call", env.getEnv());
-        final RackResponse response = (RackResponse) JavaEmbedUtils.rubyToJava(runtime, result, RackResponse.class);
-        vertx.runOnLoop(new SimpleHandler() {
-          @Override
-          public void handle() {
-            response.respond(request.response);
-          }
-        });
+        RackResponse response = (RackResponse) JavaEmbedUtils.rubyToJava(runtime, result, RackResponse.class);
+        response.respond(request.response);
       }
     };
     exec.execute(task);

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

@@ -42,7 +42,7 @@ public class Server extends RubyObject {
     if (args.length > 2) {
       this.ssl = args[2].isTrue();
     }
-    this.app = new RackApplication(vertx, args[0], this.ssl);
+    this.app = new RackApplication(args[0], this.ssl);
     if (args.length > 3)
       this.keyStorePath = args[3].toString();
     if (args.length > 4)

data/lib/jubilee/cli.rb

@@ -22,7 +22,7 @@ module Jubilee
       parse_options
       @config = Jubilee::Configuration.new(@options)
       @config.load
-      server = Jubilee::Server.new(@config.app, {port: @config.port, ssl: @config.ssl})
+      server = Jubilee::Server.new(@config.app, {port: @config.port, ssl: @config.ssl, keystore_path: @config.keystore_path, keystore_password: @config.keystore_password})
       server.start
       puts "Jubilee is listening on port #{@config.port}, press Ctrl+C to quit"
       starter = org.jruby.jubilee.deploy.Starter.new
@@ -38,6 +38,9 @@ module Jubilee
         environment: "development"
       }
       @parser = OptionParser.new do |o|
+        o.separator ""
+        o.separator "Server options:"
+
         #o.on "-c", "--config PATH", "Load PATH as a config file" do |arg|
         #  @options[:config_file] = arg
         #end
@@ -50,15 +53,25 @@ module Jubilee
         o.on "-p", "--port PORT", "Defind which PORT the server should bind" do |arg|
           @options[:port] = arg
         end
+        o.on "-e", "--environment ENV", "Rack environment" do |arg|
+          @options[:environment] = arg
+        end
+        o.separator ""
+        o.separator "SSL options:"
         o.on "--ssl", "Enable SSL connection" do 
           @options[:ssl] = true
         end
+        o.on "--ssl-keystore PATH", "SSL keystore path" do |arg|
+          @options[:keystore_path] = arg
+        end
+        o.on "--ssl-password PASS", "SSL keystore password" do |arg|
+          @options[:keystore_password] = arg
+        end
+        o.separator ""
+        o.separator "Common options:"
         o.on "--verbose", "Log low level debug information" do
           @options[:debug] = true
         end
-        o.on "-e", "--environment ENV", "Rack environment" do |arg|
-          @options[:environment] = arg
-        end
         o.on "-q", "--quiet" do
           @options[:quiet] = true
         end

data/lib/jubilee/configuration.rb

@@ -25,11 +25,14 @@ module Jubilee
     def ssl
       @options[:ssl]
     end
+    
+    def keystore_path
+      @options[:keystore_path]
+    end
 
-    #def self.load(config)
-    #  rackup_code = ::File.read(config)
-    #  eval("Rack::Builder.new {( #{rackup_code}\n )}.to_app", TOPLEVEL_BINDING, config)
-    #end
+    def keystore_password
+      @options[:keystore_password]
+    end
 
     private
     def load_rack_adapter(options, &block)
@@ -45,7 +48,6 @@ module Jubilee
         end
       end
       app
-      #Rack::Lint.new(Rack::CommonLogger.new(app, STDOUT))
     end
 
   end

data/lib/jubilee/server.rb

@@ -3,10 +3,10 @@ module Jubilee
     def initialize(app, opts = {})
       options = {port: 3215, ssl: false}.merge(opts)
       if (options[:ssl])
-        if options[:keystore].nil?
+        if options[:keystore_path].nil?
           raise ArgumentError, "Please provide a keystore for ssl"
         else
-          super(Application.new(app), options[:port], options[:ssl], options[:keystore], options[:keystore_password])
+          super(Application.new(app), options[:port], options[:ssl], options[:keystore_path], options[:keystore_password])
         end
       else
         super(Application.new(app), options[:port])

data/test/jubilee/test_server.rb

@@ -46,7 +46,7 @@ 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, 
-                                 keystore: File.join(File.dirname(__FILE__), "../../examples/jubilee/server-keystore.jks"),
+                                 keystore_path: File.join(File.dirname(__FILE__), "../../examples/jubilee/server-keystore.jks"),
     keystore_password: "wibble"})
     server.start
     http = Net::HTTP.new @host, @port

metadata

@@ -2,30 +2,28 @@
 name: jubilee
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Isaiah Peng
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: 1.4.1
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: 1.4.1
     none: false
   prerelease: false
   type: :runtime