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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4025890d1a3b94265ecc1baf4b14c29360b2639
-  data.tar.gz: 12d2da1989239ee2b4d52ab5c64e0c0491713c26
+  metadata.gz: 5fe8cb673337ec15f7ae0dd2bb5291a722a13a3a
+  data.tar.gz: 6ee67cbbee89d6847bbef2acf72ec61b04d7509f
 SHA512:
-  metadata.gz: 3d6b27947fe1717e3e5ff1def31dc325ecc6aa00b560e04789a5723d1c4960ed0c70bd90dbc8bc6f369ad290af89386f179fbc6545dfbfe3fe1f439c3c3ff457
-  data.tar.gz: 0fe735bc70b1bade1be8ff36062cb65177763944ba74a9b16213c5fb95a26e9bd61bea60030a8f7ac3c0f7931b739b44c37bbd00778ebd3b9afd01a0598a7435
+  metadata.gz: b3a2de6d05ebb28515f9daa5fa05ca35a9a55332fd2b5d0f879427953f1fbe4f32d1c5f05bb8b310ef7d5517b7e50c04e0e975890c0507ffcc12b3838face9e1
+  data.tar.gz: 387b046ef5c369b25ed92b78ae020f606087d37375a8af6ff8a36f909dec0af2c3768ddea058bd774b0eb89c18d5a8dfb2fb752eba877f04582b7b246a51e94c

data/.ruby-version

@@ -1 +1 @@
-jruby-1.7.13
+jruby-9.0.5.0

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source 'http://rubygems.org'
 
 gem 'rack', '>= 1.4.1'
 #gem 'rack', path: "../../ruby/rack"

data/Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: https://rubygems.org/
+  remote: http://rubygems.org/
   specs:
     actionmailer (4.0.2)
       actionpack (= 4.0.2)
@@ -29,7 +29,6 @@ GEM
       tzinfo (~> 0.3.37)
     addressable (2.3.5)
     arel (4.0.1)
-    atomic (1.1.14)
     atomic (1.1.14-java)
     builder (3.1.4)
     capybara (2.2.0)
@@ -54,7 +53,6 @@ GEM
     execjs (2.0.2)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
-    ffi (1.9.3)
     ffi (1.9.3-java)
     formatador (0.2.4)
     git (1.2.6)
@@ -96,7 +94,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)
     jwt (0.1.8)
       multi_json (>= 1.5)
@@ -114,7 +111,6 @@ GEM
     multi_json (1.8.2)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
-    nokogiri (1.5.10)
     nokogiri (1.5.10-java)
     oauth2 (0.9.2)
       faraday (~> 0.8)
@@ -129,10 +125,6 @@ GEM
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     polyglot (0.3.3)
-    pry (0.9.12.4)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
     pry (0.9.12.4-java)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -156,11 +148,10 @@ GEM
       activesupport (= 4.0.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.1.1)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.3)
       ffi (>= 0.5.0)
-    rcov (0.9.11)
     rcov (0.9.11-java)
     rdoc (4.1.0)
       json (~> 1.4)
@@ -197,8 +188,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)
@@ -212,7 +201,6 @@ GEM
     uglifier (2.4.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    websocket-driver (0.3.2)
     websocket-driver (0.3.2-java)
     xpath (2.0.0)
       nokogiri (~> 1.3)

data/Guardfile

@@ -0,0 +1,24 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'minitest' do
+  # with Minitest::Unit
+  watch(%r|^test/(.*)\/?test_(.*)\.rb|)
+  watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
+  watch(%r|^test/test_helper\.rb|)    { "test" }
+
+  # with Minitest::Spec
+  # watch(%r|^spec/(.*)_spec\.rb|)
+  # watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  # watch(%r|^spec/spec_helper\.rb|)    { "spec" }
+
+  # Rails 3.2
+  # watch(%r|^app/controllers/(.*)\.rb|) { |m| "test/controllers/#{m[1]}_test.rb" }
+  # watch(%r|^app/helpers/(.*)\.rb|)     { |m| "test/helpers/#{m[1]}_test.rb" }
+  # watch(%r|^app/models/(.*)\.rb|)      { |m| "test/unit/#{m[1]}_test.rb" }  
+  
+  # Rails
+  # watch(%r|^app/controllers/(.*)\.rb|) { |m| "test/functional/#{m[1]}_test.rb" }
+  # watch(%r|^app/helpers/(.*)\.rb|)     { |m| "test/helpers/#{m[1]}_test.rb" }
+  # watch(%r|^app/models/(.*)\.rb|)      { |m| "test/unit/#{m[1]}_test.rb" }  
+end

data/README.md

@@ -1,49 +1,53 @@
 [![Build Status](https://travis-ci.org/isaiah/jubilee.png?branch=master)](https://travis-ci.org/isaiah/jubilee)
 
-Jubilee / mod-rack
-==================
+Jubilee server
+=========
+ 
+A rack application compatible http server built on Vertx3. Check out the
+demo [application](https://github.com/isaiah/jubilee/tree/master/examples/chatapp).
 
-> A rack server for jruby.
+Why another rack server?
+------------------------
 
-> Also works as vertx module.
+> "Vert.x is a lightweight, high performance application platform for the JVM
+> that's designed for modern mobile, web, and enterprise applications."
+>      - vertx.io site
 
-Get started
------------
+By using Vertx, jubilee inherent advantages in terms of performance, and all
+the other cool features of Vertx:
 
-Please checkout the [wiki
-page](https://github.com/isaiah/jubilee/wiki/Running-as-vertx-module)
-before you proceed.
+* [EventBus](https://github.com/isaiah/jubilee/wiki/Event-Bus)
+* [SharedData](https://github.com/isaiah/jubilee/wiki/SharedData)
+* [Clustering](https://github.com/isaiah/jubilee/wiki/Clustering)
 
-Add the following snippet to ```$VERTX\_HOME/conf/langs.properties```
-```
-rackup=isaiah~mod-rack~0.1.2:org.jruby.jubilee.JubileeVerticleFactory
-.ru=rackup
-```
 
-Make sure JRUBY_HOME is correctly set, and ```rack``` gem is install before proceed.
 
-Then run the rackup file as a normal verticle,
+Get started
+------------
+
+Make sure you have JDK 8 and jruby 1.7.20+ installed.
 
 ```shell
-vertx run config.ru
+bundle && bundle exec rake install
 ```
 
-Build from source
------------------
+This is the development branch of jubilee, it uses the vertx
+3.0 for a working version, please check out the
+[2.x branch](https://github.com/isaiah/jubilee/tree/2.x).
 
-First checkout the source from github.
+Rails
+-----
 
-1. To run as a vertx module, run the following command in the root directory:
+Under the default setup, jubilee runs 4 instances of web
+servers, each with it's own jruby runtime, if you find that jubilee
+crashes or hangs with OutOfMemeoryError, please tune your JVM OPTS
+like this:
 
-```shell
-mvn package
-vertx create-module-link org.jruby.jubilee~mod-rack~0.1.3-SNAPSHOT
-```
+    $ export JAVA_OPTS="-Xms1024m -Xmx2048m -XX:PermSize=512m -XX:MaxPermSize=512m"
 
-then change your langs.properties file to point to the new module;
+If your OS memory is quite limited, please run jubilee with
 
-2. To run as rubygem, run ```rake install``` in the root directory, maven is
-required.
+    $ jubilee -n 1
 
 Event Bus
 =========
@@ -56,18 +60,10 @@ Examples
 --------
 
 Assume necessary javascript files are loaded in the page (they can be found [here](https://github.com/isaiah/jubilee/tree/master/examples/client)),
-run rack application with the following config:
-
-```
-$ cat config.json
-{ "host": "0.0.0.0",
-  "port": 8080,
-  "event_bus": "/eventbus"
-}
-```
+start jubilee in a rack application with:
 
 ```
-$ vertx run config.ru -conf config.json
+$ jubilee --eventbus eventbus
 ```
 
 In one browser:
@@ -92,34 +88,6 @@ In the previous tab it should print the greetings you just sent.
 For more advanced examples, please checkout the
 [chatapp](https://github.com/isaiah/jubilee/tree/master/examples/chatapp).
 
-EventBus Security
-------------------
-
-The EventBus can (and probably should) be secured by passing in parameters in the config.json 
-object.
-
-The following config will allow all messages from the browser to `accounts.get_balances` and 
-only allow messages outward that match the format `accounts.get_balances.*`.
- 
-```
-$ cat config.json
-{ 
-  "host": "0.0.0.0",
-  "port": 8080,
-  "event_bus": "/eventbus",
-  "event_bus_security": 
-    {
-      "incoming": [{address: "user_accounts.get_balances"}],
-      "outgoing": [{address_re: "user_accounts.balances.*"}]
-    }
-}
-```
-
-More details of parameters can be found in [the VertX docs](http://vertx.io/core_manual_ruby.html#securing-the-bridge)
-
-By default the bridge is left wide open.  Any browser connected to an application can observe *all* messages being 
-passed on your EventBus.
-
 Performance Tuning
 -------------------
 

data/Rakefile

@@ -99,7 +99,7 @@ end
 desc "Build the jar"
 task :jar => :clean do
   sh "mvn package"
-  sh "unzip jars/*.zip *.rb -d lib"
+  #sh "unzip jars/*.zip *.rb -d lib"
 end
 
 task :build => :jar

data/examples/chatapp/Gemfile

@@ -1,4 +1,5 @@
 source "https://rubygems.org"
 gem 'sinatra'
 gem 'haml'
-gem 'jubilee'
+
+gem 'jubilee', '3.0.0.beta1'

data/examples/chatapp/Gemfile.lock

@@ -4,7 +4,7 @@ GEM
     ffi (1.9.3-java)
     haml (4.0.4)
       tilt
-    jubilee (2.1.0.beta-java)
+    jubilee (3.0.0.beta1-java)
       rack (>= 1.4.1)
       spoon (~> 0.0.4)
     rack (1.5.2)
@@ -23,5 +23,5 @@ PLATFORMS
 
 DEPENDENCIES
   haml
-  jubilee
+  jubilee (= 3.0.0.beta1)
   sinatra

data/examples/chatapp/README.md

@@ -6,24 +6,12 @@ application.
 
 Make sure you are using jruby 1.7+ (jubilee 1.1.0+ require jruby 1.7.5 or later) and your JDK version is 7+
 
-Install the lastest stable version of vertx(2.1.2), and put the following snippet in your vertx
-language configuration, you can find the file under $VERTX\_HOME/conf/langs.properties
-
-```
-rackup=isaiah~mod-rack~0.1.1:org.jruby.jubilee.JubileeVerticleFactory
-.ru=rackup
-```
-
-and run
+To run the application:
 
 ```shell
-vertx run config.ru -conf config.json
+bundle && jubilee --eventbus eventbus
 ```
 
 Then go to http://localhost:8080 in your browser, if you have the page
 opened in multiple tabs or windows you can see the message you sent are
 broadcasted to all the other tabs.
-
-Checkout the [wiki
-page](https://github.com/isaiah/jubilee/wiki/Running-as-vertx-module) if
-you run into any trouble.

data/examples/chatapp/app.rb

@@ -1,24 +1,32 @@
 require 'bundler/setup'
 Bundler.require(:default)
-require 'vertx'
-Vertx.deploy_verticle('test.rb')
+require 'vertx/vertx'
 
-def to_a(shared_set)
-  ret = []
-  shared_set.each{ |item| ret << item}
-  ret
+def to_a(users)
+  users.split("\0")
 end
 
-Vertx::EventBus.register_handler('logout') do |message|
-  Vertx::SharedData.get_set(:users).delete(message.body)
+vertx = Jubilee.vertx
+event_bus = vertx.event_bus()
+sd = vertx.shared_data()
+
+event_bus.consumer('logout') do |message|
+  chat_data = sd.get_local_map("chat")
+  users = to_a(chat_data.get("users"))
+  users.reject!{|u| u == message.body }
+  chat_data.put("users", users.join("\0"))
 end
 
+
 # register the user and return the previous users
-Vertx::EventBus.register_handler('login') do |message|
+event_bus.consumer('login') do |message|
   user = message.body
-  users = Vertx::SharedData.get_set(:users).add(user)
+  chat_data = sd.get_local_map("chat")
+    users = chat_data.get("users") || ""
   message.reply(users: to_a(users))
-  Vertx::EventBus.publish("new_user", user)
+  users = user + "\0" + users
+  chat_data.put("users", users)
+  event_bus.publish("new_user", user)
 end
 
 

data/examples/chatapp/public/assets/javascripts/application.js

@@ -50,7 +50,7 @@ $(function() {
     if ((receiver = $("#receivers").val()) === "all") {
       eb.publish("chat", {sender: uid, message: msg});
     } else {
-      updates.append("<div class='public by_you'><span class='sender'>You said to " + uid + ":</span>" + msg + "</div>");
+      updates.append("<div class='public by_you'><span class='sender'>You said to " + receiver + ":</span>" + msg + "</div>");
       eb.send(receiver, {sender: uid, message: msg});
     }
     $("#content").val("");

data/examples/chatapp/public/assets/javascripts/vertxbus.js

@@ -1,17 +1,17 @@
 /*
- * Copyright 2011-2012 the original author or authors.
+ *   Copyright (c) 2011-2015 The original author or authors
+ *   ------------------------------------------------------
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   and Apache License v2.0 which accompanies this distribution.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *       The Eclipse Public License is available at
+ *       http://www.eclipse.org/legal/epl-v10.html
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *       The Apache License v2.0 is available at
+ *       http://www.opensource.org/licenses/apache2.0.php
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *   You may elect to redistribute this code under either of these licenses.
  */
 
 var vertx = vertx || {};
@@ -35,31 +35,26 @@ var vertx = vertx || {};
     var handlerMap = {};
     var replyHandlers = {};
     var state = vertx.EventBus.CONNECTING;
-    var sessionID = null;
     var pingTimerID = null;
+    var pingInterval = null;
+    if (options) {
+      pingInterval = options['vertxbus_ping_interval'];
+    }
+    if (!pingInterval) {
+      pingInterval = 5000;
+    }
   
     that.onopen = null;
     that.onclose = null;
+    that.onerror = null;
 
-    that.login = function(username, password, replyHandler) {
-      sendOrPub("send", 'vertx.basicauthmanager.login', {username: username, password: password}, function(reply) {
-        if (reply.status === 'ok') {
-          that.sessionID = reply.sessionID;
-        }
-        if (replyHandler) {
-          delete reply.sessionID;
-          replyHandler(reply)
-        }
-      });
-    }
-  
-    that.send = function(address, message, replyHandler) {
-      sendOrPub("send", address, message, replyHandler)
-    }
+    that.send = function(address, message, replyHandler, failureHandler) {
+      sendOrPub("send", address, message, replyHandler, failureHandler)
+    };
   
-    that.publish = function(address, message, replyHandler) {
-      sendOrPub("publish", address, message, replyHandler)
-    }
+    that.publish = function(address, message) {
+      sendOrPub("publish", address, message, null)
+    };
   
     that.registerHandler = function(address, handler) {
       checkSpecified("address", 'string', address);
@@ -76,7 +71,7 @@ var vertx = vertx || {};
       } else {
         handlers[handlers.length] = handler;
       }
-    }
+    };
   
     that.unregisterHandler = function(address, handler) {
       checkSpecified("address", 'string', address);
@@ -95,23 +90,22 @@ var vertx = vertx || {};
           delete handlerMap[address];
         }
       }
-    }
+    };
   
     that.close = function() {
       checkOpen();
-      if (pingTimerID) clearInterval(pingTimerID);
       state = vertx.EventBus.CLOSING;
       sockJSConn.close();
-    }
+    };
   
     that.readyState = function() {
       return state;
-    }
+    };
   
     sockJSConn.onopen = function() {
-      // Send the first ping then send a ping every 5 seconds
+      // Send the first ping then send a ping every pingInterval milliseconds
       sendPing();
-      pingTimerID = setInterval(sendPing, 5000);
+      pingTimerID = setInterval(sendPing, pingInterval);
       state = vertx.EventBus.OPEN;
       if (that.onopen) {
         that.onopen();
@@ -120,6 +114,7 @@ var vertx = vertx || {};
   
     sockJSConn.onclose = function() {
       state = vertx.EventBus.CLOSED;
+      if (pingTimerID) clearInterval(pingTimerID);
       if (that.onclose) {
         that.onclose();
       }
@@ -128,6 +123,15 @@ var vertx = vertx || {};
     sockJSConn.onmessage = function(e) {
       var msg = e.data;
       var json = JSON.parse(msg);
+      var type = json.type;
+      if (type === 'err') {
+        if (that.onerror) {
+          that.onerror(json.body);
+        } else {
+          console.error("Error received on connection: " + json.body);
+        }
+        return;
+      }
       var body = json.body;
       var replyAddress = json.replyAddress;
       var address = json.address;
@@ -148,35 +152,43 @@ var vertx = vertx || {};
         }
       } else {
         // Might be a reply message
-        var handler = replyHandlers[address];
-        if (handler) {
+        handlers = replyHandlers[address];
+        if (handlers) {
           delete replyHandlers[address];
-          handler(body, replyHandler);
+          var handler = handlers.replyHandler;
+          if (body) {
+            handler(body, replyHandler);
+          } else if (typeof json.failureCode != 'undefined') {
+            // Check for failure
+            var failure = { failureCode: json.failureCode, failureType: json.failureType, message: json.message };
+            var failureHandler = handlers.failureHandler;
+            if (failureHandler) {
+              failureHandler(failure)
+            }
+          }
         }
       }
-    }
+    };
 
     function sendPing() {
       var msg = {
         type: "ping"
-      }
+      };
       sockJSConn.send(JSON.stringify(msg));
     }
   
-    function sendOrPub(sendOrPub, address, message, replyHandler) {
+    function sendOrPub(sendOrPub, address, message, replyHandler, failureHandler) {
       checkSpecified("address", 'string', address);
       checkSpecified("replyHandler", 'function', replyHandler, true);
+      checkSpecified("failureHandler", 'function', failureHandler, true);
       checkOpen();
       var envelope = { type : sendOrPub,
                        address: address,
                        body: message };
-      if (that.sessionID) {
-        envelope.sessionID = that.sessionID;
-      }
-      if (replyHandler) {
+      if (replyHandler || failureHandler) {
         var replyAddress = makeUUID();
         envelope.replyAddress = replyAddress;
-        replyHandlers[replyAddress] = replyHandler;
+        replyHandlers[replyAddress] = { replyHandler: replyHandler, failureHandler: failureHandler };
       }
       var str = JSON.stringify(envelope);
       sockJSConn.send(str);
@@ -204,7 +216,7 @@ var vertx = vertx || {};
     function makeUUID(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
         .replace(/[xy]/g,function(a,b){return b=Math.random()*16,(a=="y"?b&3|8:b|0).toString(16)})}
   
-  }
+  };
   
   vertx.EventBus.CONNECTING = 0;
   vertx.EventBus.OPEN = 1;