jubilee 1.1.3-java → 2.0.0.alpha1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71daf5448046b7a808de9b5c8dbb61989e713d52
-  data.tar.gz: 501ac68ce907fe002466c95d3a39ef68f90e9335
+  metadata.gz: a77c3b1eb92007a671a033614f6e9d6d180a7a39
+  data.tar.gz: 35b271e8177901264b12c8de526237dcb5921e11
 SHA512:
-  metadata.gz: 13e23da533cade9811bf8633c4f9852dc242ec7f497ef63612e44ef54cd09cef75dfe4ace8bb5519f9acf0f54d225c7303cedfec08c0bd8ca5ec9a61aa7879c8
-  data.tar.gz: 142003d9a46ee61c5aabb8d1b3ee15171e428d43263991002e0d50632110b49335232978727d7dd07281d9424f3f73d00adac544aaeb67aa0534ed8fbc7b928b
+  metadata.gz: d2d2f76613e7482d3244ffa51adc727459fd171ae3a710421733de3e6f2e5bb41a7f1da20b4113242a64453cf12b66b22ac2ab89269d92493b18a04ebc8565b9
+  data.tar.gz: 5822d5d9c68560a83b73194f2d9e23e6819c423eabd780cd770c52ffa1c5a0abda8c59abef3a7bec1972c809c7350e9607bfefcc4c4879518bdc932e4be84fd4

data/Rakefile

@@ -86,7 +86,7 @@ desc "Compile the extension, need jdk7 because vertx relies on it"
 task :compile => [DEST_PATH, "#{DEST_PATH}/META-INF"] do |t|
   ant.javac :srcdir => "java", :destdir => t.prerequisites.first,
     :source => "1.7", :target => "1.7", :debug => true, :includeantruntime => false,
-    :classpath => "${java.class.path}:${sun.boot.class.path}:jars/vertx-core-2.1M3.jar:jars/netty-all-4.0.14.Final.jar:jars/jackson-core-2.2.2.jar:jars/jackson-databind-2.2.2.jar:jars/jackson-annotations-2.2.2.jar:jars/hazelcast-2.6.3.jar"
+    :classpath => "${java.class.path}:${sun.boot.class.path}:jars/vertx-core-2.1M3.jar:jars/netty-all-4.0.14.Final.jar:jars/jackson-core-2.2.2.jar:jars/jackson-databind-2.2.2.jar:jars/jackson-annotations-2.2.2.jar:jars/hazelcast-2.6.3.jar:jars/vertx-platform-2.1M3.jar"
 end
 
 desc "Copy META-INF"

data/examples/chatapp/Gemfile.lock

@@ -4,7 +4,7 @@ GEM
     ffi (1.9.3-java)
     haml (4.0.4)
       tilt
-    jubilee (1.1.1-java)
+    jubilee (1.1.3-java)
       rack (>= 1.4.1)
       spoon (~> 0.0.4)
     rack (1.5.2)

data/examples/chatapp/config.ru

@@ -1,3 +1,4 @@
+require 'jubilee'
 require 'vertx'
 require './app'
 run Sinatra::Application.new

data/java/src/jubilee/JubileeService.java

@@ -2,6 +2,7 @@ package jubilee;
 
 import org.jruby.Ruby;
 import org.jruby.jubilee.RubyHttpServerResponse;
+import org.jruby.jubilee.RubyPlatformManager;
 import org.jruby.jubilee.RubyServer;
 import org.jruby.jubilee.impl.RubyIORackInput;
 import org.jruby.jubilee.impl.RubyNullIO;
@@ -15,6 +16,7 @@ public class JubileeService implements BasicLibraryService {
         RubyHttpServerResponse.createHttpServerResponseClass(ruby);
         RubyIORackInput.createIORackInputClass(ruby);
         RubyNullIO.createNullIOClass(ruby);
+      RubyPlatformManager.createPlatformManagerClass(ruby);
         return true;
     }
 }

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

@@ -0,0 +1,67 @@
+package org.jruby.jubilee;
+
+import org.jruby.Ruby;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.vertx.java.core.Handler;
+import org.vertx.java.core.http.HttpServer;
+import org.vertx.java.core.http.HttpServerRequest;
+import org.vertx.java.core.json.JsonArray;
+import org.vertx.java.core.json.JsonObject;
+import org.vertx.java.platform.Verticle;
+import org.vertx.java.platform.impl.WrappedVertx;
+
+import java.io.IOException;
+
+/**
+ * Created by isaiah on 23/01/2014.
+ */
+public class JubileeVerticle extends Verticle {
+  private Ruby ruby;
+
+  @Override
+  public void start() {
+    JsonObject config = container.config();
+    HttpServer httpServer = vertx.createHttpServer();
+    ruby = config.getValue("ruby");
+    IRubyObject rackApplication;
+    final RackApplication app;
+    boolean ssl =config.getBoolean("ssl");
+    if (config.containsField("rackapp")) rackApplication = config.getValue("rackapp");
+    else {
+      String rackup = config.getString("rackup");
+      String rackScript = "require 'rack'\n" +
+              "require 'jubilee'\n" +
+              "app, _ = Rack::Builder.parse_file('" + rackup + "')\n";
+      if (!config.getBoolean("quiet") && config.getString("environment").equals("development")) {
+        rackScript += "logger = STDOUT\n" +
+                "app = Rack::CommonLogger.new(app, logger)\n";
+      }
+      rackScript += "Jubilee::Application.new(app)\n";
+      rackApplication = ruby.evalScriptlet(rackScript);
+    }
+    try {
+      app = new RackApplication((WrappedVertx) vertx, ruby.getCurrentContext(), rackApplication, ssl);
+      httpServer.setAcceptBacklog(10000);
+      httpServer.requestHandler(new Handler<HttpServerRequest>() {
+        public void handle(final HttpServerRequest req) {
+          app.call(req);
+        }
+      });
+      if (config.containsField("event_bus")) {
+        JsonArray allowAll = new JsonArray();
+        allowAll.add(new JsonObject());
+        vertx.createSockJSServer(httpServer).bridge(config.getObject("event_bus"), allowAll, allowAll);
+      }
+      if (ssl) httpServer.setSSL(true).setKeyStorePath(config.getString("keystore_path"))
+              .setKeyStorePassword(config.getString("keystore_password"));
+      httpServer.listen(config.getInteger("port"), config.getString("host"));
+    } catch (IOException e) {
+      container.logger().fatal("Failed to create RackApplication");
+    }
+  }
+
+  @Override
+  public void stop() {
+    this.ruby.tearDown(false);
+  }
+}

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

@@ -18,6 +18,7 @@ import org.vertx.java.core.VoidHandler;
 import org.vertx.java.core.buffer.Buffer;
 import org.vertx.java.core.http.HttpServerRequest;
 import org.vertx.java.core.impl.DefaultVertx;
+import org.vertx.java.platform.impl.WrappedVertx;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -34,17 +35,17 @@ public class RackApplication {
     private IRubyObject app;
     private boolean ssl;
     private Ruby runtime;
-    private DefaultVertx vertx;
+    private WrappedVertx vertx;
     private RubyClass rackIOInputClass;
     private RubyClass httpServerResponseClass;
     private RubyArray rackVersion;
     private RubyNullIO nullio;
     private RackEnvironment rackEnv;
 
-    public RackApplication(Vertx vertx, ThreadContext context, IRubyObject app, boolean ssl) throws IOException {
+    public RackApplication(WrappedVertx vertx, ThreadContext context, IRubyObject app, boolean ssl) throws IOException {
         this.app = app;
         this.ssl = ssl;
-        this.vertx = (DefaultVertx) vertx;
+        this.vertx = vertx;
         this.runtime = context.runtime;
         this.rackVersion = RubyArray.newArrayLight(runtime, RubyFixnum.one(runtime), RubyFixnum.four(runtime));
         // Memorize the ruby classes
@@ -86,10 +87,9 @@ public class RackApplication {
         Runnable task = new Runnable() {
             @Override
             public void run() {
-                // This is a different context, do NOT replace runtime.getCurrentContext()
-//                IRubyObject result = app.callMethod(runtime.getCurrentContext(), "call", env.getEnv());
                 try {
-                    IRubyObject result = app.callMethod(runtime.getCurrentContext(), "call", rackEnv.getEnv(request, input, ssl));
+                  // This is a different context, do NOT replace runtime.getCurrentContext()
+                  IRubyObject result = app.callMethod(runtime.getCurrentContext(), "call", rackEnv.getEnv(request, input, ssl));
                     RackResponse response = (RackResponse) JavaEmbedUtils.rubyToJava(runtime, result, RackResponse.class);
                     RubyHttpServerResponse resp = new RubyHttpServerResponse(runtime,
                             httpServerResponseClass,

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

@@ -0,0 +1,102 @@
+package org.jruby.jubilee;
+
+import org.jruby.*;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.vertx.java.core.AsyncResult;
+import org.vertx.java.core.AsyncResultHandler;
+import org.vertx.java.core.json.JsonObject;
+import org.vertx.java.platform.PlatformLocator;
+import org.vertx.java.platform.PlatformManager;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by isaiah on 23/01/2014.
+ */
+public class RubyPlatformManager extends RubyObject {
+  private PlatformManager pm;
+
+  public static void createPlatformManagerClass(Ruby runtime) {
+    RubyModule mJubilee = runtime.defineModule("Jubilee");
+    RubyClass serverClass = mJubilee.defineClassUnder("PlatformManager", runtime.getObject(), ALLOCATOR);
+    serverClass.defineAnnotatedMethods(RubyPlatformManager.class);
+  }
+
+  private static ObjectAllocator ALLOCATOR = new ObjectAllocator() {
+    public IRubyObject allocate(Ruby ruby, RubyClass rubyClass) {
+      return new RubyPlatformManager(ruby, rubyClass);
+    }
+  };
+
+  public RubyPlatformManager(Ruby ruby, RubyClass rubyClass) {
+    super(ruby, rubyClass);
+  }
+
+  @JRubyMethod
+  public IRubyObject initialize(ThreadContext context, IRubyObject config) {
+    RubyHash options = config.convertToHash();
+    pm = PlatformLocator.factory.createPlatformManager();
+    int ins = RubyNumeric.num2int(options.op_aref(context, RubySymbol.newSymbol(context.runtime, "instances")));
+    pm.deployVerticle("org.jruby.jubilee.JubileeVerticle", new JsonObject(parseOptions(options)),
+            context.runtime.getJRubyClassLoader().getURLs(), ins, null, new AsyncResultHandler<String>() {
+      @Override
+      public void handle(AsyncResult<String> result) {
+        if (result.succeeded()) {
+//          System.out.println("Deployment ID is " + result.result());
+        } else{
+          result.cause().printStackTrace();
+        }
+      }
+    });
+    return this;
+  }
+
+  @JRubyMethod
+  public IRubyObject stop(ThreadContext context) {
+    pm.stop();
+    return context.runtime.getNil();
+  }
+
+  private Map<String, Object> parseOptions(RubyHash options) {
+    Ruby runtime = options.getRuntime();
+    ThreadContext context = runtime.getCurrentContext();
+    RubySymbol port_k = runtime.newSymbol("Port");
+    RubySymbol host_k = runtime.newSymbol("Host");
+    RubySymbol ssl_k = runtime.newSymbol("ssl");
+    RubySymbol rack_app_k = runtime.newSymbol("rackapp");
+    RubySymbol rack_up_k = runtime.newSymbol("rackup");
+    RubySymbol ssl_keystore_k = runtime.newSymbol("ssl_keystore");
+    RubySymbol ssl_password_k = runtime.newSymbol("ssl_password");
+    RubySymbol eventbus_prefix_k = runtime.newSymbol("eventbus_prefix");
+    RubySymbol quiet_k = runtime.newSymbol("quiet");
+    RubySymbol environment_k = runtime.newSymbol("environment");
+    Map<String, Object> map = new HashMap<>();
+    map.put("host", options.op_aref(context, host_k).asJavaString());
+    map.put("port", RubyNumeric.num2int(options.op_aref(context, port_k)));
+
+    if (options.has_key_p(rack_up_k).isTrue())
+    map.put("rackup", options.op_aref(context, rack_up_k).asJavaString());
+    if (options.has_key_p(rack_app_k).isTrue())
+      map.put("rackapp", options.op_aref(context, rack_app_k));
+    map.put("quiet", options.containsKey(quiet_k) && options.op_aref(context, quiet_k).isTrue());
+
+    map.put("environment", options.op_aref(context, environment_k).asJavaString());
+
+    boolean ssl = options.op_aref(context, ssl_k).isTrue();
+    if (ssl) {
+      map.put("keystore_path", options.op_aref(context, ssl_keystore_k).asJavaString());
+      if (options.has_key_p(ssl_password_k).isTrue())
+         map.put("keystore_password", options.op_aref(context, ssl_password_k).asJavaString());
+    }
+    map.put("ssl", ssl);
+    if (options.has_key_p(eventbus_prefix_k).isTrue())
+      map.put("event_bus", options.op_aref(context, eventbus_prefix_k).asJavaString());
+    // This is a trick to put an Object into the config object
+    map.put("ruby", runtime);
+    return map;
+  }
+}

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

@@ -13,6 +13,7 @@ import org.vertx.java.core.http.HttpServer;
 import org.vertx.java.core.http.HttpServerRequest;
 import org.vertx.java.core.json.JsonArray;
 import org.vertx.java.core.json.JsonObject;
+import org.vertx.java.platform.impl.WrappedVertx;
 
 import java.io.IOException;
 
@@ -82,7 +83,7 @@ public class RubyServer extends RubyObject {
 
         httpServer = vertx.createHttpServer();
         try {
-            this.app = new RackApplication(vertx, context, app, this.ssl);
+            this.app = new RackApplication((WrappedVertx) vertx, context, app, this.ssl);
             if (block.isGiven()) block.yieldSpecific(context, this);
         } catch (IOException e) {
             // noop

data/lib/jubilee/cli.rb

@@ -39,11 +39,16 @@ module Jubilee
         `jubilee_d #{(@argv - ["-d", "--daemon"]).join(" ")}`
       else
         @config = Jubilee::Configuration.new(@options)
-        server = Jubilee::Server.new(@config.app, @config.options)
-        server.start
+        server = Jubilee::Server.new(nil, @config.options)
+        #server.start
+        thread = Thread.current
+        Signal.trap("INT") do
+          server.stop
+          puts "Jubilee is shutting down gracefully..."
+          thread.wakeup
+        end
         puts "Jubilee is listening on port #{@config.options[:Port]}, press Ctrl+C to quit"
-        starter = org.jruby.jubilee.deploy.Starter.new
-        starter.block
+        sleep
       end
     end
 
@@ -53,6 +58,8 @@ module Jubilee
         daemon: false,
         ssl: false,
         Port: 8080,
+        instances: 4,
+        quiet: false,
         environment: ENV["RACK_ENV"] || "development"
       }
       @parser = OptionParser.new do |o|
@@ -68,18 +75,21 @@ module Jubilee
         o.on "--dir DIR", "Change to DIR before starting" do |arg|
           @options[:chdir] = arg
         end
-        o.on "-p", "--port PORT", "Defind which PORT the server should bind" do |arg|
+        o.on "-p", "--port PORT", "Define which PORT the server should bind" do |arg|
           @options[:Port] = arg.to_i
         end
-        o.on "-b", "--host HOST", "Defind which HOST the server should bind, default 0.0.0.0" do |arg|
+        o.on "-b", "--host HOST", "Define which HOST the server should bind, default 0.0.0.0" do |arg|
           @options[:Host] = arg
         end
         o.on "-e", "--environment ENV", "Rack environment" do |arg|
           @options[:environment] = arg
         end
+        o.on "-n", "--instances NUM", "Define how many instances of web servers to run" do |arg|
+          @options[:instances] = arg.to_i
+        end
         o.separator ""
         o.separator "SSL options:"
-        o.on "--ssl", "Enable SSL connection" do 
+        o.on "--ssl", "Enable SSL connection" do
           @options[:ssl] = true
         end
         o.on "--ssl-keystore PATH", "SSL keystore path" do |arg|

data/lib/jubilee/configuration.rb

@@ -17,6 +17,7 @@ module Jubilee
 
       reload
       # initialize vertx as early as possible
+      # XXX vertx is managed by PlatformManager now
       if chost = @options[:cluster_host]
         if cport = @options[:cluster_port]
           org.jruby.jubilee.vertx.JubileeVertx.init(cport.to_java(:int), chost.to_java)
@@ -30,16 +31,7 @@ module Jubilee
 
     def reload
       instance_eval(File.read(config_file), config_file) if config_file
-    end
-
-    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
+      load_rack_adapter(&@block)
     end
 
     # sets the host and port jubilee listens to +address+ may be an Integer port 
@@ -124,18 +116,12 @@ module Jubilee
     end
 
     private
-    def load_rack_adapter(options, &block)
+    def load_rack_adapter(&block)
       if block
-        inner_app = Rack::Builder.new(&block).to_app
-      else
-        Dir.chdir options[:chdir] if options[:chdir]
-        if !File.exist?(rackup)
-          raise "Missing rackup file #{File.absolute_path(rackup)}"
-        end
-        inner_app, opts = Rack::Builder.parse_file(rackup)
-        @options.merge!(opts)
+        @options[:rackapp] = Rack::Builder.new(&block).to_app
       end
-      inner_app
+      Dir.chdir(@options[:chdir]) if @options[:chdir]
+      @options[:rackup] = rackup
     end
 
     def rackup

data/lib/jubilee/server.rb

@@ -1,12 +1,20 @@
-require 'rack/methodoverride'
 module Jubilee
-  class Server < VertxServer
+  class Server < PlatformManager
     def initialize(app, opts = {})
-      options = {Host: "0.0.0.0", Port: 8080, ssl: false}.merge(opts)
+      options = {Host: "0.0.0.0", Port: 8080, ssl: false, instances: 1, environment: "development", quiet: true}.merge(opts)
       if (options[:ssl]) && options[:ssl_keystore].nil?
           raise ArgumentError, "Please provide a keystore for ssl"
       end
-      super(Application.new(app), options)
+      # Rackup passes a string value
+      options[:Port] = options[:Port].to_i
+      # back compatible
+      if app
+        options[:rackapp] = Application.new(app)
+      end
+      super(options)
+    end
+
+    def start
     end
   end
 end

data/lib/jubilee/version.rb

@@ -1,9 +1,9 @@
 module Jubilee
   module Version
-    MAJOR = 1
-    MINOR = 1
-    PATCH = 3
-    BUILD = nil
+    MAJOR = 2
+    MINOR = 0
+    PATCH = 0
+    BUILD = "alpha1"
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

data/lib/jubilee.rb

@@ -4,6 +4,7 @@ require File.join(File.dirname(__FILE__), "../jars/jackson-annotations-2.2.2.jar
 require File.join(File.dirname(__FILE__), "../jars/hazelcast-2.6.3.jar")
 require File.join(File.dirname(__FILE__), "../jars/vertx-core-2.1M3.jar")
 require File.join(File.dirname(__FILE__), "../jars/vertx-hazelcast-2.1M3.jar")
+require File.join(File.dirname(__FILE__), "../jars/vertx-platform-2.1M3.jar")
 require File.join(File.dirname(__FILE__), "../jars/netty-all-4.0.14.Final.jar")
 
 require 'jubilee/jubilee.jar'

data/lib/rack/handler/jubilee.rb

@@ -30,12 +30,10 @@ module Rack
         yield @server if block_given?
 
         @server.start
-        @starter = org.jruby.jubilee.deploy.Starter.new
-        @starter.block
       end
 
       def self.shutdown
-        @server.stop{ @starter.unblock }
+        @server.stop
         exit
       end
     end

data/spec/integration/basic_rack_spec.rb

@@ -4,12 +4,14 @@ feature "basic rack at non-root context" do
 
   before(:all) do
     configurator = Jubilee::Configuration.new(chdir: "#{apps_dir}/rack/basic")
-    @server = Jubilee::Server.new(configurator.app, configurator.options)
+    @server = Jubilee::Server.new(nil, configurator.options)
     @server.start
+    sleep 0.1
   end
 
   after(:all) do
     @server.stop
+    sleep 0.1
   end
 
   it "should work for basic requests" do
@@ -85,5 +87,4 @@ feature "basic rack at non-root context" do
       response.body.should include("<div id='posted'>field=nothing</div>")
     end
   end
-
 end

data/spec/integration/basic_rails4_spec.rb

@@ -4,13 +4,14 @@ feature 'basic rails4 test' do
 
   before(:all) do
     configurator = Jubilee::Configuration.new(chdir: "#{apps_dir}/rails4/basic")
-    @server = Jubilee::Server.new(configurator.app, configurator.options)
+    @server = Jubilee::Server.new(nil, configurator.options)
     @server.start
-    sleep 0.1
+    sleep 11
   end
 
   after(:all) do
     @server.stop
+    sleep 0.1
   end
 
   it 'should do a basic get' do

data/spec/integration/basic_sinatra_spec.rb

@@ -4,12 +4,14 @@ feature "basic sinatra test" do
 
   before(:all) do
     configurator = Jubilee::Configuration.new(chdir: "#{apps_dir}/sinatra/basic")
-    @server = Jubilee::Server.new(configurator.app, configurator.options)
+    @server = Jubilee::Server.new(nil, configurator.options)
     @server.start
+    sleep 1
   end
 
   after(:all) do
     @server.stop
+    sleep 0.1
   end
 
   it "should work" do

data/test/jubilee/test_configuration.rb

@@ -15,22 +15,6 @@ class TestConfig < MiniTest::Unit::TestCase
     Dir.chdir(@dir)
   end
 
-  def test_load
-    @config = Jubilee::Configuration.new({rackup: "test/config/config.ru"})
-    assert_equal @resp, @config.app.call({})
-  end
-
-  def test_change_dir
-    @config = Jubilee::Configuration.new({chdir: "test/config"})
-    assert_equal @resp, @config.app.call({})
-  end
-
-  def test_customize_config_file
-    @config = Jubilee::Configuration.new({chdir: "test/config", rackup: "app.ru"})
-    resp = [200, {"Content-Type" => "text/plain"}, ["customized body"]]
-    assert_equal resp, @config.app.call({})
-  end
-
   def test_config_invalid
     @tmp.syswrite(%q(abcd "helloword"))
     assert_raises(NoMethodError) do
@@ -82,7 +66,7 @@ class TestConfig < MiniTest::Unit::TestCase
   #end
 
   def test_config_file_working_directory
-    @tmp.syswrite(%q(working_directory "chatapp"))
+    @tmp.syswrite(%q(working_directory "examples/chatapp"))
     options = Jubilee::Configuration.new(config_file: @tmp.path).options
     assert_match(/chatapp/, options[:chdir])
   end

data/test/jubilee/test_rack_server.rb

@@ -75,6 +75,7 @@ class TestRackServer < MiniTest::Unit::TestCase
     @server = Jubilee::Server.new @checker
 
     @server.start
+    sleep 0.5
 
     big = "x" * (1024 * 16)
 
@@ -114,6 +115,7 @@ class TestRackServer < MiniTest::Unit::TestCase
     input = nil
     @server = Jubilee::Server.new(lambda { |env| input = env; @simple.call(env) })
     @server.start
+    sleep 0.1
 
     hit(['http://127.0.0.1:8080/test/a/b/c?foo=bar'])
 
@@ -125,6 +127,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")
     Net::HTTP.start('localhost', 8080) do |http|
@@ -143,4 +146,11 @@ class TestRackServer < MiniTest::Unit::TestCase
     res = hit(['http://127.0.0.1:8080/test'])
     assert_kind_of Net::HTTPServerError, res[0]
   end
+
+  # GH_9
+  def test_string_port_value
+    @server = Jubilee::Server.new(@simple, {Port: "3000"})
+    # assert_wont_raise_anything
+    @server.start
+  end
 end

data/test/jubilee/test_response.rb

@@ -188,7 +188,6 @@ class TestResponse < MiniTest::Unit::TestCase
 
 
   def test_two_requests_in_one_chunk
-    @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"
@@ -205,7 +204,6 @@ class TestResponse < MiniTest::Unit::TestCase
   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"

data/test/jubilee/test_server.rb

@@ -9,13 +9,14 @@ class TestJubileeServer < MiniTest::Unit::TestCase
 
   def teardown
     @server.stop if @server
+    sleep 0.1
   end
 
   def test_server_lambda
     app = lambda {|env| [200, {"Content-Type" => "text/plain"}, ["http"]] }
     @server = Jubilee::Server.new(app)
     @server.start
-    sleep 0.1
+    sleep 0.5
 
     http, body = Net::HTTP.new(@host, @port), nil
     http.start do
@@ -28,10 +29,10 @@ class TestJubileeServer < MiniTest::Unit::TestCase
   end
 
   def test_server_embedded
-    config = Jubilee::Configuration.new(rackup: File.join(File.dirname(__FILE__), "../config/config.ru"))
-    @server = Jubilee::Server.new(config.app)
+    config = Jubilee::Configuration.new(rackup: File.expand_path("../../config/config.ru", __FILE__))
+    @server = Jubilee::Server.new(nil, config.options)
     @server.start
-    sleep 0.1
+    sleep 0.5
     http, body = Net::HTTP.new(@host, @port), nil
     http.start do
       req = Net::HTTP::Get.new "/", {}
@@ -42,17 +43,13 @@ class TestJubileeServer < MiniTest::Unit::TestCase
     assert_equal "embedded app", body
   end
 
-  def test_large_post_body
-    skip
-  end
-
   def test_url_scheme_for_https
     app = lambda { |env| [200, {}, [env['rack.url_scheme']]] }
     @server = Jubilee::Server.new(app, {port:@port, ssl:true, 
                                  ssl_keystore: File.join(File.dirname(__FILE__), "../../examples/keystore.jks"),
     ssl_password: "hellojubilee"})
     @server.start
-    sleep 0.1
+    sleep 0.5
     http = Net::HTTP.new @host, @port
     http.use_ssl = true
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jubilee
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 2.0.0.alpha1
 platform: java
 authors:
 - Isaiah Peng
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -96,18 +96,20 @@ files:
 - jars/netty-all-4.0.14.Final.jar
 - jars/vertx-core-2.1M3.jar
 - jars/vertx-hazelcast-2.1M3.jar
+- jars/vertx-platform-2.1M3.jar
 - java/resources/META-INF/services/org.vertx.java.core.spi.cluster.ClusterManagerFactory
 - java/resources/default-cluster.xml
 - java/src/jubilee/JubileeService.java
 - java/src/org/jruby/jubilee/Const.java
+- java/src/org/jruby/jubilee/JubileeVerticle.java
 - java/src/org/jruby/jubilee/RackApplication.java
 - java/src/org/jruby/jubilee/RackEnvironment.java
 - java/src/org/jruby/jubilee/RackEnvironmentHash.java
 - java/src/org/jruby/jubilee/RackInput.java
 - java/src/org/jruby/jubilee/RackResponse.java
 - java/src/org/jruby/jubilee/RubyHttpServerResponse.java
+- java/src/org/jruby/jubilee/RubyPlatformManager.java
 - java/src/org/jruby/jubilee/RubyServer.java
-- java/src/org/jruby/jubilee/deploy/Starter.java
 - java/src/org/jruby/jubilee/impl/RubyIORackInput.java
 - java/src/org/jruby/jubilee/impl/RubyNullIO.java
 - java/src/org/jruby/jubilee/utils/RubyHelper.java
@@ -229,9 +231,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project:
 rubygems_version: 2.1.9

data/java/src/org/jruby/jubilee/deploy/Starter.java

@@ -1,26 +0,0 @@
-package org.jruby.jubilee.deploy;
-
-import java.util.concurrent.CountDownLatch;
-
-/**
- * Created with IntelliJ IDEA.
- * User: isaiah
- * Date: 12/3/12
- * Time: 7:37 PM
- */
-public class Starter {
-  private CountDownLatch stopLatch = new CountDownLatch(1);
-
-  public void block() {
-    while(true) {
-      try {
-        stopLatch.await();
-        break;
-      } catch (InterruptedException ignore) {}
-    }
-  }
-
-  public void unblock() {
-    stopLatch.countDown();
-  }
-}