jubilee 2.1.0.rc1-java → 3.0.0.beta2-java

data/spec/apps/rails4/basic/Gemfile

@@ -1,7 +1,7 @@
-source :rubygems
+source "https://rubygems.org"
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.0.1'
+gem 'rails'
 
 # Use jdbcsqlite3 as the database for Active Record
 gem 'activerecord-jdbc-adapter'

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

@@ -1,5 +1,5 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (4.0.1)
       actionpack (= 4.0.1)
@@ -28,7 +28,6 @@ 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,7 +48,6 @@ 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)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -93,8 +91,6 @@ 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)
@@ -117,8 +113,11 @@ DEPENDENCIES
   jbuilder (~> 1.2)
   jdbc-sqlite3
   jquery-rails (>= 3.0)
-  rails (= 4.0.1)
+  rails
   sass-rails (~> 4.0.0)
   therubyrhino
   turbolinks
   uglifier (>= 1.3.0)
+
+BUNDLED WITH
+   1.10.5

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

@@ -8,9 +8,7 @@ package org.jruby.jubilee;
  */
 public final class Const {
 
-    public static final String JUBILEE_VERSION = "Jubilee(2.1.0)";
-    public static final String HTTP_11 = "HTTP/1.1";
-    public static final String HTTP_10 = "HTTP/1.0";
+    public static final String JUBILEE_VERSION = "Jubilee(3.0.0)";
 
     public static final String LOCALHOST = "localhost";
     public static final String PORT_80 = "80";
@@ -27,6 +25,5 @@ public final class Const {
     }
 
     // Internal
-    public static final String END_OF_BODY = "__EOF__";
     public static final byte EOL = '\n';
 }

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

@@ -1,17 +1,18 @@
 package org.jruby.jubilee;
 
+import io.vertx.core.*;
+import io.vertx.core.http.HttpServerOptions;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+import io.vertx.core.net.JksOptions;
+import io.vertx.ext.web.Router;
+import io.vertx.ext.web.handler.sockjs.BridgeOptions;
+import io.vertx.ext.web.handler.sockjs.PermittedOptions;
+import io.vertx.ext.web.handler.sockjs.SockJSHandler;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyInstanceConfig;
 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.JRubyVerticleFactory;
-import org.vertx.java.platform.impl.WrappedVertx;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -21,21 +22,17 @@ import java.util.List;
 /**
  * Created by isaiah on 23/01/2014.
  */
-public class JubileeVerticle extends Verticle {
-    private String rackup;
-
-    public JubileeVerticle(){}
-
-    public JubileeVerticle(String rackup) {
-        this.rackup = rackup;
-    }
+public class JubileeVerticle extends AbstractVerticle {
 
     @Override
-    public void start() {
-        JRubyVerticleFactory.vertx = vertx;
-        JRubyVerticleFactory.container = container;
-        JsonObject config = container.config();
-        HttpServer httpServer = vertx.createHttpServer();
+    public void start() throws Exception {
+        JsonObject config = config();
+        HttpServerOptions httpServerOptions = new HttpServerOptions();
+        httpServerOptions.setPort(config.getInteger("port"));
+        httpServerOptions.setHost(config.getString("host"));
+        httpServerOptions.setAcceptBacklog(10000);
+        httpServerOptions.setClientAuthRequired(false);
+
         String root = config.getString("root", ".");
         this.runtime = createRuntime(root, config);
         String expandedRoot = this.runtime.evalScriptlet("File.expand_path(%q(" + root + "))").asJavaString();
@@ -43,31 +40,34 @@ public class JubileeVerticle extends Verticle {
         IRubyObject rackApplication = initRackApplication(config);
         final RackApplication app;
         boolean ssl = config.getBoolean("ssl");
+        if (ssl) {
+            httpServerOptions.setSsl(true).setKeyStoreOptions(
+                    new JksOptions().setPath(config.getString("keystore_path"))
+                            .setPassword(config.getString("keystore_password"))
+            );
+        }
+        Router router = Router.router(vertx);
         try {
-            app = new RackApplication((WrappedVertx) vertx, runtime.getCurrentContext(), rackApplication, config);
-            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);
+            app = new RackApplication(vertx, runtime.getCurrentContext(), rackApplication, config);
+            if (config.containsKey("event_bus")) {
+                BridgeOptions options = new BridgeOptions().addOutboundPermitted(new PermittedOptions().setAddressRegex(".+"));
+                options.addInboundPermitted(new PermittedOptions().setAddressRegex(".+"));
+                router.route("/" + config.getString("event_bus") + "/*").handler(SockJSHandler.create(vertx).bridge(options, event -> {
+                    event.complete(true);
+                }));
             }
-            if (ssl) httpServer.setSSL(true).setKeyStorePath(config.getString("keystore_path"))
-                    .setKeyStorePassword(config.getString("keystore_password"));
-            httpServer.listen(config.getInteger("port"), config.getString("host"));
+            router.route("/*").handler(ctx -> {
+                app.call(ctx.request());
+            });
         } catch (IOException e) {
-            container.logger().fatal("Failed to create RackApplication");
+            runtime.getErrorStream().println("Failed to create RackApplication");
         }
+
+        vertx.createHttpServer(httpServerOptions).requestHandler(router::accept).listen();
     }
 
     @Override
-    public void stop() {
+    public void stop(Future<Void> future) throws Exception {
         this.runtime.tearDown();
     }
 
@@ -77,17 +77,13 @@ public class JubileeVerticle extends Verticle {
 
     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);
         }
-        Object[] argv = options.getArray("argv", new JsonArray(new String[]{})).toArray();
+        Object[] argv = options.getJsonArray("argv", new JsonArray()).getList().toArray();
         instanceConfig.setArgv(Arrays.copyOf(argv, argv.length, String[].class));
-//        }
         RubyArray globalLoadPaths = (RubyArray) Ruby.getGlobalRuntime().getLoadService().getLoadPath();
         List<String> loadPaths = new ArrayList<>();
         for (int i = 0; i < globalLoadPaths.size(); i++) {
@@ -102,8 +98,7 @@ public class JubileeVerticle extends Verticle {
     }
 
     private IRubyObject initRackApplication(JsonObject config) {
-        if (this.rackup == null)
-            this.rackup = config.getString("rackup");
+        String rackup = config.getString("rackup");
         String rackScript = "require 'rack'\n" +
                 "require 'jubilee'\n" +
                 "app, _ = Rack::Builder.parse_file('" + rackup + "')\n";

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

@@ -2,21 +2,15 @@ package org.jruby.jubilee;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import io.vertx.core.Vertx;
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.json.JsonObject;
 import org.jruby.Ruby;
-import org.jruby.RubyArray;
 import org.jruby.RubyClass;
-import org.jruby.RubyFixnum;
 import org.jruby.javasupport.JavaEmbedUtils;
 import org.jruby.jubilee.impl.RubyIORackInput;
-import org.jruby.jubilee.impl.RubyNullIO;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
-import org.vertx.java.core.Handler;
-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.json.JsonObject;
-import org.vertx.java.platform.impl.WrappedVertx;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -34,14 +28,14 @@ public class RackApplication {
     private boolean ssl;
     private boolean hideErrorStack;
     private Ruby runtime;
-    private WrappedVertx vertx;
+    private Vertx vertx;
     private RubyClass rackIOInputClass;
     private RubyClass httpServerResponseClass;
     private RackEnvironment rackEnv;
 
-    public RackApplication(WrappedVertx vertx, ThreadContext context, IRubyObject app, JsonObject config) throws IOException {
+    public RackApplication(Vertx vertx, ThreadContext context, IRubyObject app, JsonObject config) throws IOException {
         this.app = app;
-        this.ssl = config.getBoolean("ssl", false);
+        this.ssl = config.getBoolean("ssl");
         this.hideErrorStack = config.getBoolean("hide_error_stack", false);
         this.vertx = vertx;
         this.runtime = context.runtime;
@@ -64,60 +58,46 @@ public class RackApplication {
         final AtomicBoolean eof = new AtomicBoolean(false);
         input = new RubyIORackInput(runtime, rackIOInputClass, request, bodyBuf, eof);
 
-        request.dataHandler(new Handler<Buffer>() {
-            @Override
-            public void handle(Buffer buffer) {
-                bodyBuf.writeBytes(buffer.getByteBuf());
-            }
+        request.handler(buffer -> {
+            bodyBuf.writeBytes(buffer.getByteBuf());
         });
 
-        request.endHandler(new VoidHandler() {
-            @Override
-            protected void handle() {
-                eof.set(true);
-            }
+        request.endHandler(v -> {
+            eof.set(true);
         });
-        request.exceptionHandler(new Handler<Throwable>() {
-            @Override
-            public void handle(Throwable ignore) {
-                eof.set(true);
-            }
+        request.exceptionHandler(ignore -> {
+            eof.set(true);
         });
 //        } else {
 //            input = nullio;
 //        }
-        Runnable task = new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    // This is a different context, do NOT replace runtime.getCurrentContext()
-                    IRubyObject result = app.callMethod(runtime.getCurrentContext(), "call", rackEnv.getEnv(request, input, ssl));
-                    /*
-                    if (request.isHijacked()) {
-                        // It's the hijacker's response to close the socket.
-                        return;
-                    }
-                    */
-                    RackResponse response = (RackResponse) JavaEmbedUtils.rubyToJava(runtime, result, RackResponse.class);
-                    RubyHttpServerResponse resp = new RubyHttpServerResponse(runtime,
-                            httpServerResponseClass, request);
-                    response.respond(resp);
-                } catch (Exception e) {
-                    request.response().setStatusCode(500);
-                    String message = "Jubilee caught this error: " + e.getMessage() + "\n";
-                    StringWriter stringWriter = new StringWriter();
-                    PrintWriter printWriter = new PrintWriter(stringWriter);
-                    e.printStackTrace(printWriter);
-                    if (hideErrorStack) {
-                        request.response().end("Internal error.");
-                    } else {
-                        request.response().end(message + stringWriter.toString());
-                    }
-                    e.printStackTrace(runtime.getErrorStream());
+        vertx.executeBlocking((future) -> {
+            try {
+                // This is a different context, do NOT replace runtime.getCurrentContext()
+                IRubyObject result = app.callMethod(runtime.getCurrentContext(), "call", rackEnv.getEnv(request, input, ssl));
+//                if (request.isHijacked()) {
+//                    // It's the hijacker's response to close the socket.
+//                    return;
+//                }
+                RackResponse response = (RackResponse) JavaEmbedUtils.rubyToJava(runtime, result, RackResponse.class);
+                RubyHttpServerResponse resp = new RubyHttpServerResponse(runtime,
+                        httpServerResponseClass, request);
+                response.respond(resp);
+                future.complete();
+            } catch (Exception e) {
+                request.response().setStatusCode(500);
+                String message = "Jubilee caught this error: " + e.getMessage() + "\n";
+                StringWriter stringWriter = new StringWriter();
+                PrintWriter printWriter = new PrintWriter(stringWriter);
+                e.printStackTrace(printWriter);
+                if (hideErrorStack) {
+                    request.response().end("Internal error.");
+                } else {
+                    request.response().end(message + stringWriter.toString());
                 }
+                e.printStackTrace(runtime.getErrorStream());
             }
-        };
-        vertx.startInBackground(task, false);
+        }, false, (ar) -> {});
     }
 
 }

data/src/main/java/org/jruby/jubilee/RackEnvironment.java

@@ -1,17 +1,16 @@
 package org.jruby.jubilee;
 
 import io.netty.handler.codec.http.HttpHeaders;
+import io.vertx.core.MultiMap;
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.http.HttpVersion;
+import io.vertx.core.net.SocketAddress;
 import org.jruby.*;
 import org.jruby.jubilee.utils.RubyHelper;
 import org.jruby.runtime.*;
 import org.jruby.runtime.builtin.IRubyObject;
-import org.vertx.java.core.MultiMap;
-import org.vertx.java.core.http.HttpServerRequest;
-import org.vertx.java.core.http.HttpVersion;
-import org.vertx.java.core.net.NetSocket;
 
 import java.io.IOException;
-import java.net.InetSocketAddress;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -81,15 +80,19 @@ public class RackEnvironment {
 
         String scriptName = "";
         String[] hostInfo = getHostInfo(request.headers().get(Const.HOST));
+        String httpVersion = "1.1";
+        if (request.version() == HttpVersion.HTTP_1_0) {
+            httpVersion = "1.0";
+        }
 
-        env.lazyPut(RACK_KEY.REQUEST_METHOD, request.method(), true);
+        env.lazyPut(RACK_KEY.REQUEST_METHOD, request.method().toString(), true);
         env.lazyPut(RACK_KEY.SCRIPT_NAME, scriptName, false);
         env.lazyPut(RACK_KEY.PATH_INFO, pathInfo, false);
         env.lazyPut(RACK_KEY.QUERY_STRING, orEmpty(request.query()), false);
         env.lazyPut(RACK_KEY.SERVER_NAME, hostInfo[0], false);
         env.lazyPut(RACK_KEY.SERVER_PORT, hostInfo[1], true);
         env.lazyPut(RACK_KEY.HTTP_VERSION,
-                request.version() == HttpVersion.HTTP_1_1 ? Const.HTTP_11 : Const.HTTP_10, true);
+                httpVersion, true);
         env.lazyPut(RACK_KEY.CONTENT_TYPE, headers.get(HttpHeaders.Names.CONTENT_TYPE), true);
         env.lazyPut(RACK_KEY.REQUEST_URI, request.uri(), false);
         env.lazyPut(RACK_KEY.REMOTE_ADDR, getRemoteAddr(request), true);
@@ -99,9 +102,9 @@ public class RackEnvironment {
         env.lazyPut(RACK_KEY.MULTIPROCESS, runtime.getFalse(), false);
         env.lazyPut(RACK_KEY.RUN_ONCE, runtime.getFalse(), false);
 
-        // Hijack handling
+        // Hijack handling (disabled)
         env.lazyPut(RACK_KEY.HIJACK_P, runtime.getFalse(), false);
-//        env.lazyPut(RACK_KEY.HIJACK, hijackProc(env, request), false);
+        //env.lazyPut(RACK_KEY.HIJACK, hijackProc(env, request), false);
 
 
         final int contentLength = getContentLength(headers);
@@ -116,30 +119,30 @@ public class RackEnvironment {
         return env;
     }
 
-    private IRubyObject hijackProc(final RackEnvironmentHash env, final HttpServerRequest req) {
-        CompiledBlockCallback19 callback = new CompiledBlockCallback19() {
-            @Override
-            public IRubyObject call(ThreadContext context, IRubyObject self, IRubyObject[] args, Block block) {
-                RubyNetSocket rubyNetSocket = new RubyNetSocket(context.runtime, netSocketClass, req.netSocket());
-                env.put("rack.hijack_io", rubyNetSocket);
-                return rubyNetSocket;
-            }
-
-            @Override
-            public String getFile() {
-                return null;
-            }
-
-            @Override
-            public int getLine() {
-                return 0;
-            }
-        };
-        BlockBody body = CompiledBlockLight19.newCompiledBlockLight(Arity.NO_ARGUMENTS, runtime.getStaticScopeFactory().getDummyScope(), callback, false, 0, new String[]{});
-        Block b = new Block(body, runtime.newBinding().getBinding());
-
-        return RubyProc.newProc(runtime, b, Block.Type.LAMBDA);
-    }
+//    private IRubyObject hijackProc(final RackEnvironmentHash env, final HttpServerRequest req) {
+//        CompiledBlockCallback19 callback = new CompiledBlockCallback19() {
+//            @Override
+//            public IRubyObject call(ThreadContext context, IRubyObject self, IRubyObject[] args, Block block) {
+//                RubyNetSocket rubyNetSocket = new RubyNetSocket(context.runtime, netSocketClass, req.netSocket());
+//                env.put("rack.hijack_io", rubyNetSocket);
+//                return rubyNetSocket;
+//            }
+//
+//            @Override
+//            public String getFile() {
+//                return null;
+//            }
+//
+//            @Override
+//            public int getLine() {
+//                return 0;
+//            }
+//        };
+//        BlockBody body = CompiledBlockLight19.newCompiledBlockLight(Arity.NO_ARGUMENTS, runtime.getStaticScopeFactory().getDummyScope(), callback, false, 0, new String[]{});
+//        Block b = new Block(body, runtime.newBinding().getBinding());
+//
+//        return RubyProc.newProc(runtime, b, Block.Type.LAMBDA);
+//    }
 
     public String[] getHostInfo(String host) {
         String[] hostInfo;
@@ -157,11 +160,11 @@ public class RackEnvironment {
     }
 
     private static String getRemoteAddr(final HttpServerRequest request) {
-        InetSocketAddress sourceAddress = request.remoteAddress();
+        SocketAddress sourceAddress = request.remoteAddress();
         if (sourceAddress == null) {
             return "";
         }
-        return sourceAddress.getHostString();
+        return sourceAddress.host();
     }
 
     private static int getContentLength(final MultiMap headers) {