jubilee 2.0.0-java → 2.1.0.Alpha1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31e24331a936300e3f3bb67b16e5b05376fcb2aa
-  data.tar.gz: 22ec68885ddfd56a2b0d42fe1be450e40d596e7b
+  metadata.gz: 683724968b6ea7ae25e8fcb25f3684bc65df6a47
+  data.tar.gz: 92f9f51d3833a0b228bc22f49cdcd07a4d2a02f2
 SHA512:
-  metadata.gz: ad993339e4c2e8ff3314c17836fd8902c83db105b86554b88d90bc38d0117d25548919dcad367cd204f013b39639d4a94191b50d158f5d836906fe045b5d9b5f
-  data.tar.gz: 8e3144d4805b226a6e82da0f01ec069402cf21d050eb0df1af16ab89e4dd42c1885c82de3c88ad1773fc46be3d6a5147efbcf470bc1f995a587f8d658067554b
+  metadata.gz: e9a114e152bc837ab4ce9d8ab2759cf7edcc9f2f79e40871c3e8c8b4d0489d08b29eb8bfcafc74318e13025a4d5d6c60a2350cdc4e3670096f90c96842b84a70
+  data.tar.gz: 9de31bb5904dc1ff30d37bb2f081bb451dd024819f1a758594514839e68d0cf1d47f836d35438ade2993126dd655a00d8f5f8effbc077cb0ee935afde57f09e0

data/.ruby-version

@@ -1 +1 @@
-jruby-1.7.8
+jruby-1.7.13

data/.travis.yml

@@ -2,4 +2,4 @@ language: ruby
 rvm:
   - jruby-19mode # JRuby in 1.9 mode
 
-script: "bundle exec rake spec test"
+script: "bundle exec rake spec"

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:jars/vertx-platform-2.1M3.jar"
+    :classpath => "${java.class.path}:${sun.boot.class.path}:jars/vertx-core-2.1.1.jar:jars/netty-all-4.0.20.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-3.2.3.jar:jars/vertx-platform-2.1.1.jar:jars/vertx-hazelcast-2.1.1.jar"
 end
 
 desc "Copy META-INF"

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

@@ -1,6 +1,7 @@
 package org.jruby.jubilee;
 
 import org.jruby.Ruby;
+import org.jruby.RubyInstanceConfig;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.vertx.java.core.Handler;
 import org.vertx.java.core.http.HttpServer;
@@ -11,59 +12,81 @@ import org.vertx.java.platform.Verticle;
 import org.vertx.java.platform.impl.WrappedVertx;
 
 import java.io.IOException;
+import java.util.Arrays;
 
 /**
  * Created by isaiah on 23/01/2014.
  */
 public class JubileeVerticle extends Verticle {
-  private Ruby ruby;
+    private Ruby runtime;
 
-  @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);
+    @Override
+    public void start() {
+        JsonObject config = container.config();
+        HttpServer httpServer = vertx.createHttpServer();
+        String root = config.getString("root", ".");
+        this.runtime = createRuntime(root, config);
+        String expandedRoot = this.runtime.evalScriptlet("File.expand_path(%q(" + root + "))").asJavaString();
+        this.runtime.setCurrentDirectory(expandedRoot);
+        IRubyObject rackApplication = initRackApplication(config);
+        final RackApplication app;
+        boolean ssl = config.getBoolean("ssl");
+        try {
+            app = new RackApplication((WrappedVertx) vertx, runtime.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());
+                JsonObject ebconf = new JsonObject();
+                ebconf.putString("prefix", config.getString("event_bus"));
+                vertx.createSockJSServer(httpServer).bridge(ebconf, 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.runtime.tearDown();
     }
-    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);
+
+    private Ruby createRuntime(String root, JsonObject options) {
+        Ruby runtime;
+//        if (Ruby.isGlobalRuntimeReady()) {
+//            runtime = Ruby.getGlobalRuntime();
+//        } else {
+        RubyInstanceConfig instanceConfig = new RubyInstanceConfig();
+        String jrubyHome = options.getString("jruby-home", "");
+        if (!jrubyHome.isEmpty()) {
+            instanceConfig.setJRubyHome(jrubyHome);
         }
-      });
-      if (config.containsField("event_bus")) {
-        JsonArray allowAll = new JsonArray();
-        allowAll.add(new JsonObject());
-        JsonObject ebconf = new JsonObject();
-        ebconf.putString("prefix", config.getString("event_bus"));
-        vertx.createSockJSServer(httpServer).bridge(ebconf, 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");
+        Object[] argv = options.getArray("argv", new JsonArray(new String[]{})).toArray();
+        instanceConfig.setArgv(Arrays.copyOf(argv, argv.length, String[].class));
+        runtime = Ruby.newInstance(instanceConfig);
+//        }
+        runtime.getLoadService().addPaths(root);
+        return runtime;
     }
-  }
 
-  @Override
-  public void stop() {
-    this.ruby.tearDown(false);
-  }
+    private IRubyObject initRackApplication(JsonObject config) {
+        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";
+        return runtime.evalScriptlet(rackScript);
+    }
 }

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

@@ -81,6 +81,12 @@ public class RackApplication {
                     eof.set(true);
                 }
             });
+        request.exceptionHandler(new Handler<Throwable>() {
+            @Override
+            public void handle(Throwable ignore) {
+                eof.set(true);
+            }
+        });
 //        } else {
 //            input = nullio;
 //        }

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

@@ -43,12 +43,13 @@ public class RubyPlatformManager extends RubyObject {
   }
 
   @JRubyMethod
-  public IRubyObject initialize(ThreadContext context, IRubyObject config) {
-    RubyHash options = config.convertToHash();
+  public IRubyObject initialize(final ThreadContext context, IRubyObject config) {
+    final RubyHash options = config.convertToHash();
     Ruby runtime = context.runtime;
     RubySymbol clustered_k = runtime.newSymbol("clustered");
     RubySymbol cluster_host_k = runtime.newSymbol("cluster_host");
     RubySymbol cluster_port_k = runtime.newSymbol("cluster_port");
+      final RubySymbol port_k = runtime.newSymbol("Port");
     if (options.containsKey(clustered_k) && options.op_aref(context, clustered_k).isTrue()) {
       int clusterPort = 0;
       String clusterHost = null;
@@ -68,6 +69,7 @@ public class RubyPlatformManager extends RubyObject {
       @Override
       public void handle(AsyncResult<String> result) {
         if (result.succeeded()) {
+            context.runtime.getOutputStream().println("Jubilee is listening on port " + options.op_aref(context, port_k) +", press Ctrl+C to quit");
 //          System.out.println("Deployment ID is " + result.result());
         } else{
           result.cause().printStackTrace();
@@ -102,8 +104,6 @@ public class RubyPlatformManager extends RubyObject {
 
     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());
@@ -118,7 +118,7 @@ public class RubyPlatformManager extends RubyObject {
     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);
+    // map.put("ruby", runtime);
     return map;
   }
   /*

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

@@ -73,14 +73,13 @@ public class RubyIORackInput extends RubyObject implements RackInput {
 
         if (isEOF()) return runtime.getNil();
 
-        int lineEnd = -1;
+        int lineEnd = buf.indexOf(buf.readerIndex(), buf.writerIndex(), Const.EOL);
         while (lineEnd == -1 && !eof.get()) {
             lineEnd = buf.indexOf(buf.readerIndex(), buf.writerIndex(), Const.EOL);
         }
 
         // No line break found, read all
-        if (lineEnd == -1)
-            return readAll(runtime, line);
+        if (lineEnd == -1) return readAll(runtime, line);
 
         int readLength = lineEnd - buf.readerIndex();
         byte[] dst = new byte[readLength + 1];

data/lib/jubilee.rb

@@ -1,11 +1,11 @@
 require File.join(File.dirname(__FILE__), "../jars/jackson-core-2.2.2.jar")
 require File.join(File.dirname(__FILE__), "../jars/jackson-databind-2.2.2.jar")
 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 File.join(File.dirname(__FILE__), "../jars/hazelcast-3.2.3.jar")
+require File.join(File.dirname(__FILE__), "../jars/vertx-core-2.1.1.jar")
+require File.join(File.dirname(__FILE__), "../jars/vertx-hazelcast-2.1.1.jar")
+require File.join(File.dirname(__FILE__), "../jars/vertx-platform-2.1.1.jar")
+require File.join(File.dirname(__FILE__), "../jars/netty-all-4.0.20.Final.jar")
 
 require 'jubilee/jubilee.jar'
 require 'rack'

data/lib/jubilee/cli.rb

@@ -39,7 +39,7 @@ module Jubilee
         `jubilee_d #{(@argv - ["-d", "--daemon"]).join(" ")}`
       else
         @config = Jubilee::Configuration.new(@options)
-        server = Jubilee::Server.new(nil, @config.options)
+        server = Jubilee::Server.new(@config.options)
         #server.start
         thread = Thread.current
         Signal.trap("INT") do
@@ -47,7 +47,7 @@ module Jubilee
           puts "Jubilee is shutting down gracefully..."
           thread.wakeup
         end
-        puts "Jubilee is listening on port #{@config.options[:Port]}, press Ctrl+C to quit"
+        puts "Jubilee is initializing..."
         sleep
       end
     end
@@ -96,7 +96,7 @@ module Jubilee
           @options[:ssl_keystore] = arg
         end
         o.on "--ssl-password PASS", "SSL keystore password" do |arg|
-          @options[:ssl_keystore] = arg
+          @options[:ssl_password] = arg
         end
         o.separator ""
         o.separator "Event bus options:"
@@ -127,7 +127,7 @@ module Jubilee
         end
 
         o.on "-v", "--version", "Print the version information" do
-          puts "jubilee version #{Jubilee::Version::STRING} on Vert.x 2.1M3"
+          puts "jubilee version #{Jubilee::Version::STRING} on Vert.x 2.1.1"
           exit 0
         end
       end

data/lib/jubilee/configuration.rb

@@ -10,17 +10,16 @@ module Jubilee
     attr_accessor :config_file
     attr_reader :options
 
-    def initialize(options, &block)
+    def initialize(options)
       @config_file = options.delete(:config_file)
       @options = options.dup
-      @block = block
 
       reload
     end
 
     def reload
       instance_eval(File.read(config_file), config_file) if config_file
-      load_rack_adapter(&@block)
+      load_rack_adapter
     end
 
     # sets the host and port jubilee listens to +address+ may be an Integer port 
@@ -106,9 +105,6 @@ module Jubilee
 
     private
     def load_rack_adapter(&block)
-      if block
-        @options[:rackapp] = Rack::Builder.new(&block).to_app
-      end
       Dir.chdir(@options[:chdir]) if @options[:chdir]
       @options[:rackup] = rackup
     end

data/lib/jubilee/server.rb

@@ -1,16 +1,12 @@
 module Jubilee
   class Server < PlatformManager
-    def initialize(app, opts = {})
+    def initialize(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
       # Rackup passes a string value
       options[:Port] = options[:Port].to_i
-      # back compatible
-      if app
-        options[:rackapp] = Application.new(app)
-      end
       super(options)
     end
 

data/lib/jubilee/version.rb

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

data/spec/apps/rails4/basic/Gemfile.lock

@@ -28,6 +28,7 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     arel (4.0.1)
+    atomic (1.1.14)
     atomic (1.1.14-java)
     builder (3.1.4)
     coffee-rails (4.0.1)
@@ -49,8 +50,9 @@ GEM
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
+    json (1.8.1)
     json (1.8.1-java)
-    jubilee (1.1.0.rc1)
+    jubilee (2.0.0-java)
       rack (>= 1.4.1)
       spoon (~> 0.0.4)
     mail (2.5.4)
@@ -97,6 +99,8 @@ GEM
       therubyrhino_jar (>= 1.7.3)
     therubyrhino_jar (1.7.4)
     thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
     thread_safe (0.1.3-java)
       atomic
     tilt (1.4.1)

data/spec/integration/basic_rack_spec.rb

@@ -4,7 +4,7 @@ feature "basic rack at non-root context" do
 
   before(:all) do
     configurator = Jubilee::Configuration.new(chdir: "#{apps_dir}/rack/basic")
-    @server = Jubilee::Server.new(nil, configurator.options)
+    @server = Jubilee::Server.new(configurator.options)
     @server.start
     sleep 0.1
   end

data/spec/integration/basic_rails4_spec.rb

@@ -4,7 +4,7 @@ feature 'basic rails4 test' do
 
   before(:all) do
     configurator = Jubilee::Configuration.new(chdir: "#{apps_dir}/rails4/basic")
-    @server = Jubilee::Server.new(nil, configurator.options)
+    @server = Jubilee::Server.new(configurator.options)
     @server.start
     sleep 11
   end

data/spec/integration/basic_sinatra_spec.rb

@@ -4,7 +4,7 @@ feature "basic sinatra test" do
 
   before(:all) do
     configurator = Jubilee::Configuration.new(chdir: "#{apps_dir}/sinatra/basic")
-    @server = Jubilee::Server.new(nil, configurator.options)
+    @server = Jubilee::Server.new(configurator.options)
     @server.start
     sleep 1
   end
@@ -79,5 +79,4 @@ feature "basic sinatra test" do
       end
     end
   end
-
 end

data/test/apps/checker.ru

@@ -0,0 +1,38 @@
+require 'rack'
+class ErrorChecker
+  def initialize(app)
+    @app = app
+    @exception = nil
+    @env = nil
+  end
+
+  attr_reader :exception, :env
+
+  def call(env)
+    begin
+      @env = env
+      return @app.call(env)
+    rescue Exception => e
+      @exception = e
+
+      [
+        500,
+        { "X-Exception" => e.message, "X-Exception-Class" => e.class.to_s },
+        ["Error detected"]
+      ]
+    end
+  end
+end
+
+class ServerLint < Rack::Lint
+  def call(env)
+    assert("No env given") { env }
+    check_env env
+
+    @app.call(env)
+  end
+end
+
+use ServerLint
+use ErrorChecker
+run lambda { |env| [200, { "X-Header" => "Works" }, ["Hello"]] }

data/test/apps/method_override.ru

@@ -0,0 +1,2 @@
+use Rack::MethodOverride
+run lambda { |env| [200, { "X-Header" => "Works" }, ["Hello"]] }

data/test/apps/overwrite_check.ru

@@ -0,0 +1,8 @@
+hdr = {'Content-Type' => 'text/plain', 'Content-Length' => '0'}
+run lambda do |env|
+  nr = 0
+  while buf = env['rack.input'].read(65536)
+    nr += buf.size
+  end
+  [ 200, hdr.merge('HTTP-X-Read-Length' => nr.length), [] ]
+end

data/test/apps/rack_crasher.ru

@@ -0,0 +1,8 @@
+class RackCrasher < Rack::Lint
+  def call(env)
+    raise "Oops"
+  end
+end
+
+use RackCrasher
+run lambda { |env| [200, { "X-Header" => "Works" }, ["Hello"]] }

data/test/apps/sha1.ru

@@ -0,0 +1,38 @@
+bs = 4096
+hdr = {'Content-Type' => 'text/plain', 'Content-Length' => '0'}
+sha1_app = lambda do |env|
+  sha1 = Digest::SHA1.new
+  input = env['rack.input']
+  resp = {}
+
+  i = 0
+  while buf = input.read(bs)
+    sha1.update(buf)
+    i += buf.size
+  end
+  resp[:sha1] = sha1.hexdigest
+
+  # rewind and read again
+  input.rewind
+  sha1.reset
+
+  while buf = input.read(bs)
+    sha1.update(buf)
+  end
+
+  if resp[:sha1] == sha1.hexdigest
+    resp[:sysread_read_byte_match] = true
+  end
+
+  if expect_size = env['HTTP_X_EXPECT_SIZE']
+    if expect_size.to_i == i
+      resp[:expect_size_match] = true
+    end
+  end
+  resp[:size] = i
+  resp[:expect_size] = expect_size
+
+  [ 200, hdr.merge({'X-Resp' => resp.inspect}), [] ]
+end
+
+run sha1_app

data/test/apps/simple.ru

@@ -0,0 +1 @@
+run lambda { |env| [200, { "X-Header" => "Works" }, ["Hello"]] }

data/test/apps/url_scheme.ru

@@ -0,0 +1 @@
+run lambda { |env| [200, {}, [env['rack.url_scheme']]] }

data/test/jubilee/test_configuration.rb

@@ -5,7 +5,6 @@ class TestConfig < MiniTest::Unit::TestCase
 
   def setup
     @tmp = Tempfile.new("jubilee_config")
-    @resp = [200, {"Content-Type" => "text/plain"}, ["embedded app"]]
     @dir = Dir.getwd
   end
 

data/test/jubilee/test_rack_server.rb

@@ -5,50 +5,9 @@ require 'rack/commonlogger'
 class TestRackServer < MiniTest::Unit::TestCase
   include Helpers
 
-  class ErrorChecker
-    def initialize(app)
-      @app = app
-      @exception = nil
-      @env = nil
-    end
-
-    attr_reader :exception, :env
-
-    def call(env)
-      begin
-        @env = env
-        return @app.call(env)
-      rescue Exception => e
-        @exception = e
-
-        [
-          500,
-          { "X-Exception" => e.message, "X-Exception-Class" => e.class.to_s },
-          ["Error detected"]
-        ]
-      end
-    end
-  end
-
-  class ServerLint < Rack::Lint
-    def call(env)
-      assert("No env given") { env }
-      check_env env
-
-      @app.call(env)
-    end
-  end
-
-  class RackCrasher < Rack::Lint
-    def call(env)
-      raise "Oops"
-    end
-  end
-
   def setup
     @valid_request = "GET / HTTP/1.1\r\nHost: test.com\r\nContent-Type: text/plain\r\n\r\n"
-    @simple = lambda { |env| [200, { "X-Header" => "Works" }, ["Hello"]] }
-    @checker = ErrorChecker.new ServerLint.new(@simple)
+    @checker = "checker.ru"
     @host = "localhost"
     @port = 8080
   end

data/test/jubilee/test_server.rb

@@ -12,25 +12,9 @@ class TestJubileeServer < MiniTest::Unit::TestCase
     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.5
-
-    http, body = Net::HTTP.new(@host, @port), nil
-    http.start do
-      req = Net::HTTP::Get.new "/", {}
-      http.request(req) do |resp|
-        body = resp.body
-      end
-    end
-    assert_equal "http", body
-  end
-
   def test_server_embedded
     config = Jubilee::Configuration.new(rackup: File.expand_path("../../config/config.ru", __FILE__))
-    @server = Jubilee::Server.new(nil, config.options)
+    @server = Jubilee::Server.new(config.options)
     @server.start
     sleep 0.5
     http, body = Net::HTTP.new(@host, @port), nil
@@ -44,10 +28,10 @@ class TestJubileeServer < MiniTest::Unit::TestCase
   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"})
+    config = Jubilee::Configuration.new(rackup: File.expand_path("../../apps/url_scheme.ru", __FILE__), port: @port, ssl: true,
+                                        ssl_keystore: File.join(File.dirname(__FILE__), "../../examples/keystore.jks"),
+                                        ssl_password: "hellojubilee")
+    @server = Jubilee::Server.new(config.options)
     @server.start
     sleep 0.5
     http = Net::HTTP.new @host, @port

data/test/jubilee/test_upload.rb

@@ -6,50 +6,16 @@ require 'digest/md5'
 class TestUpload < MiniTest::Unit::TestCase
 
   def setup
-    @addr = ENV['UNICORN_TEST_ADDR'] || '127.0.0.1'
-    @port = 8080
-    @hdr = {'Content-Type' => 'text/plain', 'Content-Length' => '0'}
-    @bs = 4096
-    @count = 256
+    @addr   = ENV['UNICORN_TEST_ADDR'] || '127.0.0.1'
+    @port   = 8080
+    @bs     = 4096
+    @count  = 256
     @server = nil
-    @sha1 = Digest::SHA1.new
+    @sha1   = Digest::SHA1.new
 
     # we want random binary data to test 1.9 encoding-aware IO craziness
     @random = File.open('/dev/urandom','rb')
-    @sha1_app = lambda do |env|
-      sha1 = Digest::SHA1.new
-      input = env['rack.input']
-      resp = {}
-
-      i = 0
-      while buf = input.read(@bs)
-        sha1.update(buf)
-        i += buf.size
-      end
-      resp[:sha1] = sha1.hexdigest
-
-      # rewind and read again
-      input.rewind
-      sha1.reset
-
-      while buf = input.read(@bs)
-        sha1.update(buf)
-      end
-
-      if resp[:sha1] == sha1.hexdigest
-        resp[:sysread_read_byte_match] = true
-      end
-
-      if expect_size = env['HTTP_X_EXPECT_SIZE']
-        if expect_size.to_i == i
-          resp[:expect_size_match] = true
-        end
-      end
-      resp[:size] = i
-      resp[:expect_size] = expect_size
-
-      [ 200, @hdr.merge({'X-Resp' => resp.inspect}), [] ]
-    end
+    sleep 1
   end
 
   def teardown
@@ -58,7 +24,7 @@ class TestUpload < MiniTest::Unit::TestCase
   end
 
   def test_put
-    start_server(@sha1_app)
+    start_server
     sock = TCPSocket.new(@addr, @port)
     sock.syswrite("PUT / HTTP/1.0\r\nContent-Length: #{length}\r\n\r\n")
     @count.times do |i|
@@ -74,7 +40,7 @@ class TestUpload < MiniTest::Unit::TestCase
   end
 
   def test_put_content_md5
-    start_server(@sha1_app)
+    start_server
     skip "Vert.x doesn't hendle trailing headers"
     md5 = Digest::MD5.new
     sock = TCPSocket.new(@addr, @port)
@@ -99,7 +65,7 @@ class TestUpload < MiniTest::Unit::TestCase
   end
 
   def test_put_trickle_small
-    start_server(@sha1_app)
+    start_server
     @count, @bs = 2, 128
     assert_equal 256, length
     sock = TCPSocket.new(@addr, @port)
@@ -120,7 +86,7 @@ class TestUpload < MiniTest::Unit::TestCase
   end
 
   def test_put_keepalive_truncates_small_overwrite
-    start_server(@sha1_app)
+    start_server
     sock = TCPSocket.new(@addr, @port)
     to_upload = length + 1
     sock.syswrite("PUT / HTTP/1.0\r\nContent-Length: #{to_upload}\r\n\r\n")
@@ -145,16 +111,9 @@ class TestUpload < MiniTest::Unit::TestCase
   end
 
   def test_put_excessive_overwrite_closed
-    tmp = Tempfile.new('overwrite_check')
-    tmp.sync = true
-    start_server(lambda { |env|
-      nr = 0
-      while buf = env['rack.input'].read(65536)
-        nr += buf.size
-      end
-      tmp.write(nr.to_s)
-      [ 200, @hdr, [] ]
-    })
+    config = Jubilee::Configuration.new(rackup: File.expand_path("../../apps/overwrite_check.ru", __FILE__))
+    @server = Jubilee::Server.new(config.options)
+
     sock = TCPSocket.new(@addr, @port)
     # buf = ' ' * @bs # Something is wrong with the vertx http compression
     buf = 'a' * @bs
@@ -165,8 +124,6 @@ class TestUpload < MiniTest::Unit::TestCase
       16384.times { sock.syswrite(buf) }
     end
     sock.gets
-    tmp.rewind
-    assert_equal length, tmp.read.to_i
     sock.close
   end
 
@@ -176,7 +133,7 @@ class TestUpload < MiniTest::Unit::TestCase
     which('sha1sum') or return
     which('dd') or return
 
-    start_server(@sha1_app)
+    start_server
 
     tmp = Tempfile.new('dd_dest')
     assert(system("dd", "if=#{@random.path}", "of=#{tmp.path}",
@@ -218,7 +175,7 @@ class TestUpload < MiniTest::Unit::TestCase
     which('sha1sum') or return
     which('dd') or return
 
-    start_server(@sha1_app)
+    start_server
 
     tmp = Tempfile.new('dd_dest')
     assert(system("dd", "if=#{@random.path}", "of=#{tmp.path}",
@@ -270,7 +227,7 @@ class TestUpload < MiniTest::Unit::TestCase
     which('sha1sum') or return
     which('dd') or return
 
-    start_server(@sha1_app)
+    start_server
 
     tmp = Tempfile.new('dd_dest')
     # small StringIO path
@@ -297,8 +254,9 @@ class TestUpload < MiniTest::Unit::TestCase
     @bs * @count
   end
 
-  def start_server(app)
-    @server = Jubilee::Server.new app
+  def start_server
+    config = Jubilee::Configuration.new(rackup: File.expand_path("../../apps/sha1.ru", __FILE__))
+    @server = Jubilee::Server.new(config.options)
     @server.start
     sleep 0.1
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jubilee
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0.Alpha1
 platform: java
 authors:
 - Isaiah Peng
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -89,14 +89,14 @@ files:
 - examples/client/vertxbus.js
 - examples/jubilee.conf.rb
 - examples/keystore.jks
-- jars/hazelcast-2.6.3.jar
+- jars/hazelcast-3.2.3.jar
 - jars/jackson-annotations-2.2.2.jar
 - jars/jackson-core-2.2.2.jar
 - jars/jackson-databind-2.2.2.jar
-- 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
+- jars/netty-all-4.0.20.Final.jar
+- jars/vertx-core-2.1.1.jar
+- jars/vertx-hazelcast-2.1.1.jar
+- jars/vertx-platform-2.1.1.jar
 - java/resources/META-INF/services/org.vertx.java.core.spi.cluster.ClusterManagerFactory
 - java/resources/default-cluster.xml
 - java/src/jubilee/JubileeService.java
@@ -211,6 +211,13 @@ files:
 - spec/integration/basic_sinatra_spec.rb
 - spec/spec_helper.rb
 - test/.ruby-version
+- test/apps/checker.ru
+- test/apps/method_override.ru
+- test/apps/overwrite_check.ru
+- test/apps/rack_crasher.ru
+- test/apps/sha1.ru
+- test/apps/simple.ru
+- test/apps/url_scheme.ru
 - test/config/app.rb
 - test/config/app.ru
 - test/config/config.ru
@@ -236,9 +243,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