jubilee 2.1.0.Alpha1-java → 2.1.0.beta-java

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

@@ -3,6 +3,7 @@ package org.jruby.jubilee;
 import org.jruby.*;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.jubilee.vertx.JubileeVertx;
+import org.jruby.runtime.Block;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -24,127 +25,142 @@ import java.util.Map;
  * Created by isaiah on 23/01/2014.
  */
 public class RubyPlatformManager extends RubyObject {
-  private PlatformManager pm;
+    private PlatformManager pm;
+    private RubyHash options;
 
-  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 static void createPlatformManagerClass(Ruby runtime) {
+        RubyModule mJubilee = runtime.defineModule("Jubilee");
+        RubyClass serverClass = mJubilee.defineClassUnder("PlatformManager", runtime.getObject(), ALLOCATOR);
+        serverClass.defineAnnotatedMethods(RubyPlatformManager.class);
     }
-  };
-
-  public RubyPlatformManager(Ruby ruby, RubyClass rubyClass) {
-    super(ruby, rubyClass);
-  }
-
-  @JRubyMethod
-  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;
-      if (options.containsKey(cluster_port_k))
-        clusterPort = RubyNumeric.num2int(options.op_aref(context, cluster_port_k));
-      if (options.containsKey(cluster_host_k))
-        clusterHost = options.op_aref(context, cluster_host_k).asJavaString();
-      if (clusterHost == null) clusterHost = getDefaultAddress();
-      pm = PlatformLocator.factory.createPlatformManager(clusterPort, clusterHost);
-    } else {
-      pm = PlatformLocator.factory.createPlatformManager();
+
+    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);
     }
-    JubileeVertx.init(pm.vertx());
-    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()) {
-            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();
+
+    @JRubyMethod
+    public IRubyObject initialize(ThreadContext context, IRubyObject config) {
+        this.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");
+        if (options.containsKey(clustered_k) && options.op_aref(context, clustered_k).isTrue()) {
+            int clusterPort = 0;
+            String clusterHost = null;
+            if (options.containsKey(cluster_port_k))
+                clusterPort = RubyNumeric.num2int(options.op_aref(context, cluster_port_k));
+            if (options.containsKey(cluster_host_k))
+                clusterHost = options.op_aref(context, cluster_host_k).asJavaString();
+            if (clusterHost == null) clusterHost = getDefaultAddress();
+            this.pm = PlatformLocator.factory.createPlatformManager(clusterPort, clusterHost);
+        } else {
+            this.pm = PlatformLocator.factory.createPlatformManager();
         }
-      }
-    });
-    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());
-    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());
+        JubileeVertx.init(this.pm.vertx());
+        return this;
     }
-    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;
-  }
-  /*
-  Get default interface to use since the user hasn't specified one
-   */
-  private String getDefaultAddress() {
-    Enumeration<NetworkInterface> nets;
-    try {
-      nets = NetworkInterface.getNetworkInterfaces();
-    } catch (SocketException e) {
-      return null;
+
+    @JRubyMethod(name = "start")
+    public IRubyObject start(final ThreadContext context, final Block block) {
+
+        JsonObject verticleConf = parseOptions(options);
+        int ins = verticleConf.getInteger("instances");
+        this.pm.deployVerticle("org.jruby.jubilee.JubileeVerticle", verticleConf,
+                context.runtime.getJRubyClassLoader().getURLs(), ins, null, new AsyncResultHandler<String>() {
+                    @Override
+                    public void handle(AsyncResult<String> result) {
+                        if (result.succeeded()) {
+                            if (block.isGiven()) {
+                                block.yieldSpecific(context);
+                            }
+                        } else {
+                            result.cause().printStackTrace(context.runtime.getErrorStream());
+                        }
+                    }
+                });
+        return this;
+
+    }
+
+    @JRubyMethod
+    public IRubyObject stop(ThreadContext context) {
+        this.pm.stop();
+        return context.runtime.getNil();
     }
-    NetworkInterface netinf;
-    while (nets.hasMoreElements()) {
-      netinf = nets.nextElement();
 
-      Enumeration<InetAddress> addresses = netinf.getInetAddresses();
+    private JsonObject 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_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");
+        RubySymbol root_k = runtime.newSymbol("root");
+        RubySymbol instances_k = RubySymbol.newSymbol(context.runtime, "instances");
+        JsonObject map = new JsonObject();
+        map.putString("host", options.op_aref(context, host_k).asJavaString());
+        map.putNumber("port", RubyNumeric.num2int(options.op_aref(context, port_k)));
+
+        map.putNumber("instances", RubyNumeric.num2int(options.op_aref(context, instances_k)));
+        if (options.has_key_p(root_k).isTrue())
+            map.putString("root", options.op_aref(context, root_k).asJavaString());
+
+        map.putString("rackup", options.op_aref(context, rack_up_k).asJavaString());
+        map.putBoolean("quiet", options.containsKey(quiet_k) && options.op_aref(context, quiet_k).isTrue());
+
+        String environ = options.op_aref(context, environment_k).asJavaString();
+        map.putString("environment", environ);
+        if (environ.equals("production"))
+            map.putBoolean("hide_error_stack", true);
+
+        boolean ssl = options.op_aref(context, ssl_k).isTrue();
+        if (ssl) {
+            map.putString("keystore_path", options.op_aref(context, ssl_keystore_k).asJavaString());
+            if (options.has_key_p(ssl_password_k).isTrue())
+                map.putString("keystore_password", options.op_aref(context, ssl_password_k).asJavaString());
+        }
+        map.putBoolean("ssl", ssl);
+        if (options.has_key_p(eventbus_prefix_k).isTrue())
+            map.putString("event_bus", options.op_aref(context, eventbus_prefix_k).asJavaString());
+        return map;
+    }
+
+    /*
+    Get default interface to use since the user hasn't specified one
+     */
+    private String getDefaultAddress() {
+        Enumeration<NetworkInterface> nets;
+        try {
+            nets = NetworkInterface.getNetworkInterfaces();
+        } catch (SocketException e) {
+            return null;
+        }
+        NetworkInterface netinf;
+        while (nets.hasMoreElements()) {
+            netinf = nets.nextElement();
+
+            Enumeration<InetAddress> addresses = netinf.getInetAddresses();
 
-      while (addresses.hasMoreElements()) {
-        InetAddress address = addresses.nextElement();
-        if (!address.isAnyLocalAddress() && !address.isMulticastAddress()
-                && !(address instanceof Inet6Address)) {
-          return address.getHostAddress();
+            while (addresses.hasMoreElements()) {
+                InetAddress address = addresses.nextElement();
+                if (!address.isAnyLocalAddress() && !address.isMulticastAddress()
+                        && !(address instanceof Inet6Address)) {
+                    return address.getHostAddress();
+                }
+            }
         }
-      }
+        return null;
     }
-    return null;
-  }
 }

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

@@ -1,8 +1,8 @@
 package org.jruby.jubilee.impl;
 
 import io.netty.buffer.ByteBuf;
-import org.jcodings.specific.ASCIIEncoding;
 import org.jcodings.Encoding;
+import org.jcodings.specific.ASCIIEncoding;
 import org.jruby.*;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.jubilee.Const;
@@ -68,8 +68,8 @@ public class RubyIORackInput extends RubyObject implements RackInput {
     @Override
     @JRubyMethod
     public IRubyObject gets(ThreadContext context) {
-      Ruby runtime = context.runtime;
-      RubyString line = RubyString.newEmptyString(context.runtime, BINARY);
+        Ruby runtime = context.runtime;
+        RubyString line = RubyString.newEmptyString(context.runtime, BINARY);
 
         if (isEOF()) return runtime.getNil();
 
@@ -176,10 +176,10 @@ public class RubyIORackInput extends RubyObject implements RackInput {
     }
 
     private int readableBytes() {
-      if (! this.chunked) {
-        return Math.min(buf.readableBytes(), this.len - buf.readerIndex());
-      }
-      return buf.readableBytes();
+        if (!this.chunked) {
+            return Math.min(buf.readableBytes(), this.len - buf.readerIndex());
+        }
+        return buf.readableBytes();
     }
 
     private boolean isEOF() {
@@ -189,8 +189,8 @@ public class RubyIORackInput extends RubyObject implements RackInput {
     }
 
     private IRubyObject readAll(Ruby runtime, RubyString dst) {
-        while(!eof.get())
-          ; // wait until all data received
+        while (!eof.get())
+            ; // wait until all data received
         int length = this.chunked ? buf.readableBytes() : Math.min(this.len, buf.readableBytes());
         byte[] data = new byte[length];
         buf.readBytes(data);

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

@@ -102,6 +102,6 @@ public class RubyNullIO extends RubyObject implements RackInput {
      */
     @Override
     public IRubyObject close(ThreadContext context) {
-      return getRuntime().getNil();
+        return getRuntime().getNil();
     }
 }

data/java/src/org/jruby/jubilee/utils/RubyHelper.java

@@ -2,15 +2,9 @@ package org.jruby.jubilee.utils;
 
 import org.jcodings.specific.USASCIIEncoding;
 import org.jruby.Ruby;
-import org.jruby.RubyHash;
-import org.jruby.RubyModule;
 import org.jruby.RubyString;
-import org.jruby.javasupport.JavaEmbedUtils;
 import org.jruby.util.ByteList;
 
-import java.util.Map;
-import java.util.Map.Entry;
-
 /**
  * Ruby reflection helper utilities.
  *

data/java/src/org/jruby/jubilee/vertx/JubileeVertx.java

@@ -9,17 +9,18 @@ import org.vertx.java.core.Vertx;
  * Time: 15:24
  */
 public class JubileeVertx {
-  public static Vertx vertx;
-  private JubileeVertx() {
-  }
+    public static Vertx vertx;
 
-  public static void init(Vertx vertx) {
-    JubileeVertx.vertx = vertx;
-  }
+    private JubileeVertx() {
+    }
 
-  public synchronized static Vertx vertx() {
-    if (JubileeVertx.vertx == null)
-      throw new RuntimeException("vertx is not initialized, do you run in jubilee server?");
-    return JubileeVertx.vertx;
-  }
+    public static void init(Vertx vertx) {
+        JubileeVertx.vertx = vertx;
+    }
+
+    public synchronized static Vertx vertx() {
+        if (JubileeVertx.vertx == null)
+            throw new RuntimeException("vertx is not initialized, do you run in jubilee server?");
+        return JubileeVertx.vertx;
+    }
 }

data/jubilee.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: jubilee 1.1.0 java lib
+# stub: jubilee 2.1.0.beta java lib
 
 Gem::Specification.new do |s|
   s.name = "jubilee"
-  s.version = "1.1.0"
+  s.version = "2.1.0.beta"
   s.platform = "java"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Isaiah Peng"]
-  s.date = "2014-01-09"
+  s.date = "2014-07-24"
   s.description = "Jubilee is a rack server for JRuby built upon the high performance Vertx platform. It provides the best features of Vertx such as EventBus, SharedData, and clustering."
   s.email = "issaria@gmail.com"
   s.executables = ["jubilee", "jubilee_d"]
@@ -46,25 +46,30 @@ Gem::Specification.new do |s|
     "examples/client/sockjs-0.3.4.min.js",
     "examples/client/vertxbus.js",
     "examples/jubilee.conf.rb",
-    "examples/jubilee/keystore.jks",
-    "examples/jubilee/server-keystore.jks",
-    "jars/hazelcast-2.6.3.jar",
+    "examples/keystore.jks",
+    "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.13.Final.jar",
-    "jars/vertx-core-2.1M3-SNAPSHOT.jar",
-    "jars/vertx-hazelcast-2.1M3-SNAPSHOT.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",
     "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/RubyCallable.java",
+    "java/src/org/jruby/jubilee/RubyChannel.java",
     "java/src/org/jruby/jubilee/RubyHttpServerResponse.java",
-    "java/src/org/jruby/jubilee/RubyServer.java",
-    "java/src/org/jruby/jubilee/deploy/Starter.java",
+    "java/src/org/jruby/jubilee/RubyNetSocket.java",
+    "java/src/org/jruby/jubilee/RubyPlatformManager.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",
@@ -75,17 +80,20 @@ Gem::Specification.new do |s|
     "lib/jubilee/cli.rb",
     "lib/jubilee/configuration.rb",
     "lib/jubilee/const.rb",
-    "lib/jubilee/jubilee.jar",
     "lib/jubilee/response.rb",
     "lib/jubilee/server.rb",
     "lib/jubilee/version.rb",
-    "lib/rack/chunked.rb",
     "lib/rack/handler/jubilee.rb",
     "lib/vertx.rb",
     "lib/vertx/README.md",
     "lib/vertx/buffer.rb",
     "lib/vertx/event_bus.rb",
+    "lib/vertx/http.rb",
     "lib/vertx/shared_data.rb",
+    "lib/vertx/ssl_support.rb",
+    "lib/vertx/streams.rb",
+    "lib/vertx/tcp_support.rb",
+    "lib/vertx/wrapped_handler.rb",
     "spec/apps/rack/basic/config.ru",
     "spec/apps/rails4/basic/.gitignore",
     "spec/apps/rails4/basic/Gemfile",
@@ -161,17 +169,32 @@ Gem::Specification.new do |s|
     "spec/integration/basic_sinatra_spec.rb",
     "spec/spec_helper.rb",
     "test/.ruby-version",
-    "test/config/app.rb",
+    "test/apps/app.rb",
+    "test/apps/checker.ru",
+    "test/apps/chunked.ru",
+    "test/apps/config.ru",
+    "test/apps/content_length.ru",
+    "test/apps/hex.ru",
+    "test/apps/hijack.ru",
+    "test/apps/hijack2.ru",
+    "test/apps/huge.ru",
+    "test/apps/method_override.ru",
+    "test/apps/overwrite_check.ru",
+    "test/apps/persistent.rb",
+    "test/apps/persistent.ru",
+    "test/apps/rack_crasher.ru",
+    "test/apps/rack_input.ru",
+    "test/apps/self_chunked.ru",
+    "test/apps/sha1.ru",
+    "test/apps/simple.ru",
+    "test/apps/url_scheme.ru",
     "test/jubilee/test_cli.rb",
     "test/jubilee/test_configuration.rb",
+    "test/jubilee/test_hijack.rb",
+    "test/jubilee/test_persistent.rb",
     "test/jubilee/test_rack_server.rb",
-    "test/jubilee/test_response.rb",
     "test/jubilee/test_server.rb",
     "test/jubilee/test_upload.rb",
-    "test/sinatra_app/app.rb",
-    "test/sinatra_app/config.ru",
-    "test/sinatra_app/public/test.html",
-    "test/sinatra_app/unicorn.conf.rb",
     "test/test_helper.rb"
   ]
   s.homepage = "http://isaiah.github.io/jubilee"