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

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

@@ -1,12 +1,12 @@
 package org.jruby.jubilee;
 
 import io.netty.handler.codec.http.HttpHeaders;
+import io.vertx.core.MultiMap;
 import org.jruby.*;
 import org.jruby.jubilee.utils.RubyHelper;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
-import org.vertx.java.core.MultiMap;
 
 import java.util.HashMap;
 import java.util.List;
@@ -338,12 +338,6 @@ public class RackEnvironmentHash extends RubyHash {
         return super.key(context, expected);
     }
 
-    @Override
-    public RubyArray indices(ThreadContext context, IRubyObject[] indices) {
-        fillEntireHash();
-        return super.indices(context, indices);
-    }
-
     @Override
     public RubyArray keys() {
         fillEntireHash();

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

@@ -6,11 +6,11 @@ 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.http.HttpServer;
-import org.vertx.java.core.http.HttpServerRequest;
-import org.vertx.java.core.http.HttpServerResponse;
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.http.HttpServerResponse;
 
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * Created by isaiah on 21/12/2013.
@@ -67,7 +67,7 @@ public class RubyHttpServerResponse extends RubyObject {
         String cookie = val.asJavaString();
         if (cookie.indexOf(this.lineSeparator) != -1)
             this.resp.putHeader(key.asJavaString(),
-                    Arrays.asList(val.asJavaString().split(this.lineSeparator)));
+                    (List<String>) Arrays.asList(val.asJavaString().split(this.lineSeparator)));
         else this.resp.putHeader(key.asJavaString(), val.asJavaString());
         return context.runtime.getNil();
     }
@@ -84,6 +84,12 @@ public class RubyHttpServerResponse extends RubyObject {
         return context.runtime.getNil();
     }
 
+    @JRubyMethod
+    public IRubyObject end(ThreadContext context, IRubyObject string) {
+        this.resp.end(string.asJavaString());
+        return context.runtime.getNil();
+    }
+
     @JRubyMethod(name = "put_default_headers")
     public IRubyObject putDefaultHeaders(ThreadContext context) {
         this.resp.putHeader("Server", Const.JUBILEE_VERSION);
@@ -92,8 +98,8 @@ public class RubyHttpServerResponse extends RubyObject {
 
     //TODO(isaiah) At the moment Vertx doesn't support hijack the response socket,
     // between request.response() and request.netSocket() only one can be invoked.
-    @JRubyMethod
-    public IRubyObject net_socket(ThreadContext context) {
+    @JRubyMethod(name = "net_socket")
+    public IRubyObject netSocket(ThreadContext context) {
         RubyClass netSocketClass = (RubyClass) context.runtime.getClassFromPath("Jubilee::NetSocket");
         return new RubyNetSocket(context.runtime, netSocketClass, this.req.netSocket());
     }

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

@@ -2,6 +2,11 @@ package org.jruby.jubilee;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import io.vertx.core.Handler;
+import io.vertx.core.VoidHandler;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.net.NetSocket;
+import io.vertx.core.streams.WriteStream;
 import org.jruby.*;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
@@ -9,11 +14,6 @@ import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
-import org.vertx.java.core.Handler;
-import org.vertx.java.core.VoidHandler;
-import org.vertx.java.core.buffer.Buffer;
-import org.vertx.java.core.net.NetSocket;
-import org.vertx.java.core.streams.WriteStream;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -54,13 +54,10 @@ public class RubyNetSocket extends RubyObject {
         this.sock = socket;
         this.buf = Unpooled.buffer(BUFSIZE);
         this.eof = new AtomicBoolean(false);
-        this.sock.dataHandler(new Handler<Buffer>() {
-            @Override
-            public void handle(Buffer buffer) {
-                if (buf.isWritable(buffer.length()))
-                    buf.writeBytes(buffer.getByteBuf());
-                else sock.pause();
-            }
+        this.sock.handler(buffer -> {
+            if (buf.isWritable(buffer.length()))
+                buf.writeBytes(buffer.getByteBuf());
+            else sock.pause();
         });
 
         this.sock.endHandler(new VoidHandler() {

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

@@ -1,5 +1,7 @@
 package org.jruby.jubilee;
 
+import io.vertx.core.*;
+import io.vertx.core.json.JsonObject;
 import org.jruby.*;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.jubilee.vertx.JubileeVertx;
@@ -7,26 +9,20 @@ import org.jruby.runtime.Block;
 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.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * Created by isaiah on 23/01/2014.
  */
 public class RubyPlatformManager extends RubyObject {
-    private PlatformManager pm;
     private RubyHash options;
+    private Vertx vertx;
+    private String deploymentID;
 
     public static void createPlatformManagerClass(Ruby runtime) {
         RubyModule mJubilee = runtime.defineModule("Jubilee");
@@ -51,6 +47,8 @@ public class RubyPlatformManager extends RubyObject {
         RubySymbol clustered_k = runtime.newSymbol("clustered");
         RubySymbol cluster_host_k = runtime.newSymbol("cluster_host");
         RubySymbol cluster_port_k = runtime.newSymbol("cluster_port");
+
+        VertxOptions vertxOptions = new VertxOptions();
         if (options.containsKey(clustered_k) && options.op_aref(context, clustered_k).isTrue()) {
             int clusterPort = 0;
             String clusterHost = null;
@@ -59,43 +57,41 @@ public class RubyPlatformManager extends RubyObject {
             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();
+            vertxOptions.setClustered(true).setClusterHost(clusterHost).setClusterPort(clusterPort);
+
         }
-        JubileeVertx.init(this.pm.vertx());
+
+        this.vertx = Vertx.vertx(vertxOptions);
+        JubileeVertx.init(this.vertx);
         return this;
     }
 
     @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());
-                        }
-                    }
-                });
+        JubileeVerticle verticle = new JubileeVerticle();
+        DeploymentOptions verticleConf = parseOptions(options);
+        this.vertx.deployVerticle(verticle, verticleConf, result -> {
+            if (result.succeeded()) {
+                if (block.isGiven()) {
+                    block.yieldSpecific(context);
+                }
+                deploymentID = result.result();
+            } else {
+                result.cause().printStackTrace(context.runtime.getErrorStream());
+            }
+        });
         return this;
 
     }
 
     @JRubyMethod
     public IRubyObject stop(ThreadContext context) {
-        this.pm.stop();
+        this.vertx.undeploy(deploymentID);
+        this.vertx.close();
         return context.runtime.getNil();
     }
 
-    private JsonObject parseOptions(RubyHash options) {
+    private DeploymentOptions parseOptions(RubyHash options) {
         Ruby runtime = options.getRuntime();
         ThreadContext context = runtime.getCurrentContext();
         RubySymbol port_k = runtime.newSymbol("Port");
@@ -110,31 +106,31 @@ public class RubyPlatformManager extends RubyObject {
         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.put("host", options.op_aref(context, host_k).asJavaString());
+        map.put("port", RubyNumeric.num2int(options.op_aref(context, port_k)));
 
-        map.putNumber("instances", RubyNumeric.num2int(options.op_aref(context, instances_k)));
+        map.put("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.put("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());
+        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());
 
         String environ = options.op_aref(context, environment_k).asJavaString();
-        map.putString("environment", environ);
+        map.put("environment", environ);
         if (environ.equals("production"))
-            map.putBoolean("hide_error_stack", true);
+            map.put("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());
+            map.put("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.put("keystore_password", options.op_aref(context, ssl_password_k).asJavaString());
         }
-        map.putBoolean("ssl", ssl);
+        map.put("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;
+            map.put("event_bus", options.op_aref(context, eventbus_prefix_k).asJavaString());
+        return new DeploymentOptions().setConfig(map);
     }
 
     /*

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

@@ -13,10 +13,11 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
 import org.jruby.util.StringSupport;
-import org.vertx.java.core.http.HttpServerRequest;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import io.vertx.core.http.HttpServerRequest;
+
 /**
  * Created with IntelliJ IDEA.
  * User: isaiah

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

@@ -1,6 +1,6 @@
 package org.jruby.jubilee.vertx;
 
-import org.vertx.java.core.Vertx;
+import io.vertx.core.Vertx;
 
 /**
  * Created with IntelliJ IDEA.

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: jubilee
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc1
+  version: 3.0.0.beta2
 platform: java
 authors:
 - Isaiah Peng
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2016-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.1
   name: rack
@@ -21,13 +21,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
   name: spoon
@@ -35,13 +35,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.7
   name: jeweler
@@ -49,7 +49,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.7
 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.
@@ -62,11 +62,12 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .ruby-version
-- .travis.yml
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - KNOWN_ISSUES
 - LICENSE.txt
 - README.md
@@ -78,7 +79,6 @@ files:
 - examples/chatapp/Gemfile.lock
 - examples/chatapp/README.md
 - examples/chatapp/app.rb
-- examples/chatapp/config.json
 - examples/chatapp/config.ru
 - examples/chatapp/public/assets/javascripts/application.js
 - examples/chatapp/public/assets/javascripts/jquery.js
@@ -89,51 +89,33 @@ files:
 - examples/client/vertxbus.js
 - examples/jubilee.conf.rb
 - examples/keystore.jks
-- jars/annotations-1.3.2.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/lang-jruby-2.1.0-final.jar
-- jars/log4j-1.2.16.jar
-- jars/netty-all-4.0.20.Final.jar
-- jars/slf4j-api-1.6.2.jar
-- jars/vertx-core-2.1.2.jar
-- jars/vertx-hazelcast-2.1.2.jar
-- jars/vertx-platform-2.1.2.jar
+- examples/shims_example/log/development.log
+- jars/hazelcast-3.5.2.jar
+- jars/jackson-annotations-2.6.0.jar
+- jars/jackson-core-2.6.1.jar
+- jars/jackson-databind-2.6.1.jar
+- jars/netty-buffer-4.0.33.Final.jar
+- jars/netty-codec-4.0.33.Final.jar
+- jars/netty-codec-http-4.0.33.Final.jar
+- jars/netty-common-4.0.33.Final.jar
+- jars/netty-handler-4.0.33.Final.jar
+- jars/netty-transport-4.0.33.Final.jar
+- jars/vertx-auth-common-3.2.1.jar
+- jars/vertx-core-3.2.1.jar
+- jars/vertx-hazelcast-3.2.1.jar
+- jars/vertx-lang-ruby-3.2.1.jar
+- jars/vertx-web-3.2.1.jar
 - jubilee.gemspec
-- lib/container.rb
-- lib/core/buffer.rb
-- lib/core/datagram.rb
-- lib/core/dns.rb
-- lib/core/event_bus.rb
-- lib/core/file_system.rb
-- lib/core/http.rb
-- lib/core/net.rb
-- lib/core/network_support.rb
-- lib/core/parsetools.rb
-- lib/core/shared_data.rb
-- lib/core/sock_js.rb
-- lib/core/ssl_support.rb
-- lib/core/streams.rb
-- lib/core/tcp_support.rb
-- lib/core/timers.rb
-- lib/core/vertx_require.rb
-- lib/core/wrapped_handler.rb
 - lib/jubilee.rb
 - lib/jubilee/application.rb
 - lib/jubilee/cli.rb
 - lib/jubilee/configuration.rb
 - lib/jubilee/const.rb
 - lib/jubilee/jubilee.jar
-- lib/jubilee/jubilee_require.rb
 - lib/jubilee/response.rb
 - lib/jubilee/server.rb
 - lib/jubilee/version.rb
 - lib/rack/handler/jubilee.rb
-- lib/test_utils.rb
-- lib/vertx.rb
-- lib/vertx_tests.rb
 - pom.xml
 - spec/apps/rack/basic/config.ru
 - spec/apps/rails4/basic/.gitignore
@@ -209,17 +191,14 @@ files:
 - spec/integration/basic_rails4_spec.rb
 - spec/integration/basic_sinatra_spec.rb
 - spec/spec_helper.rb
-- src/main/assembly/mod.xml
 - src/main/java/jubilee/JubileeService.java
 - src/main/java/org/jruby/jubilee/Const.java
 - src/main/java/org/jruby/jubilee/JubileeVerticle.java
-- src/main/java/org/jruby/jubilee/JubileeVerticleFactory.java
 - src/main/java/org/jruby/jubilee/RackApplication.java
 - src/main/java/org/jruby/jubilee/RackEnvironment.java
 - src/main/java/org/jruby/jubilee/RackEnvironmentHash.java
 - src/main/java/org/jruby/jubilee/RackInput.java
 - src/main/java/org/jruby/jubilee/RackResponse.java
-- src/main/java/org/jruby/jubilee/RubyCallable.java
 - src/main/java/org/jruby/jubilee/RubyHttpServerResponse.java
 - src/main/java/org/jruby/jubilee/RubyNetSocket.java
 - src/main/java/org/jruby/jubilee/RubyPlatformManager.java
@@ -228,9 +207,7 @@ files:
 - src/main/java/org/jruby/jubilee/utils/RubyHelper.java
 - src/main/java/org/jruby/jubilee/vertx/JubileeVertx.java
 - src/main/resources/META-INF/services/org.vertx.java.core.spi.cluster.ClusterManagerFactory
-- src/main/resources/META-INF/services/org.vertx.java.deploy.impl.jruby.JubileeVerticleFactory
 - src/main/resources/default-cluster.xml
-- src/main/resources/mod.json
 - test/.ruby-version
 - test/apps/app.rb
 - test/apps/checker.ru
@@ -259,7 +236,6 @@ files:
 - test/jubilee/test_server.rb
 - test/jubilee/test_upload.rb
 - test/test_helper.rb
-- vertx_classpath.txt
 homepage: http://isaiah.github.io/jubilee
 licenses:
 - MIT
@@ -270,17 +246,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: More than a server for rack applications.