jubilee 1.1.0-java → 1.1.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 962679d3298e64379fab6c97420d891b247fab19
-  data.tar.gz: ce3372e3ee9fc1a9b560f3f4e19ab505127848b7
+  metadata.gz: c16cf766d7efe95d751c3632278689d12f7e291d
+  data.tar.gz: 998dc3e19d08b137d4544c4df3cf1e6bd65eb0f2
 SHA512:
-  metadata.gz: 2e64bb1443a88d24451f2ff4001c5efcb49d64fe28bdd4c6ea2b998e492b646c7f0c277a836a44fd09b81e497b83ee8a7c983d07bbedd2d36f464bbf9de1afd3
-  data.tar.gz: c0b37d5dbc739f36e5345ad19b60cb8f6fa4fed6e9508e4b73685c29cca67f41c2e13ebb5cb44f4db9be6fd4097931c3699760af8fc05bbfbbcaf72554d81935
+  metadata.gz: f5b84abe8c288243b2f22718cc612b1d04a66458a3d31846b90011aff2b86acfa0c5f9e1d7e92be93d706f5df3c794d526969ffa3ac096dceaad2e51f12bb7c8
+  data.tar.gz: 7e4845162385349ba33158c10bde3f0be547068b1f0191b484998fa18ccd6bbb4d99c93d872daf921ac8248910cebd7de3900acf6594eecf61966b4109e82653

data/CHANGELOG

@@ -1,3 +1,31 @@
+Release 1.1.1
+=============
+
+fix clustering
+enable loading options from config file
+
+Release 1.1.0
+=============
+
+exit gracefully if java version is not supported.
+fix inifinite loop in RackInput #gets and #each
+change jruby requirement to 1.7.5
+monkey patch Rack::Chunked::Body so that rails won't chunk it's streaming body.
+server name change to constant
+add HTTP_VERSION rack header
+fix multiple value header
+change default port to 8080
+add lazy rack environment hash from wunderboss
+Date header moved to vertx
+update vertx: keep-alive if http 1.1 and not requested to closed connection, or http 1.0 and requested to do so, otherwise close connection
+add 'Date' and 'Server' http general header
+set bodybuf max capacity
+remove worker_threads option since vertx can scale itself
+replace scaffold implementation of rackIOError with RubyIO
+instead of allocate a new class every time initialize a RubyIORackInput class, get the one from runtime.
+update vertx to 2.1M3-SNAPSHOT
+
+
 Release 1.0.2
 =============
 

data/Rakefile

@@ -33,6 +33,7 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["Isaiah Peng"]
   gem.version = Jubilee::Version::STRING
   gem.platform = "java"
+  gem.files.include "lib/jubilee/jubilee.jar"
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
@@ -68,7 +69,10 @@ end
 
 require 'ant'
 
-directory "pkg/classes"
+DEST_PATH = "pkg/classes"
+RESOURCE_PATH = "java/resources"
+
+directory DEST_PATH
 
 desc "Clean up build artifacts"
 task :clean do
@@ -79,17 +83,23 @@ end
 BUILDTIME_LIB_DIR = File.join(File.dirname(__FILE__), "jars")
 
 desc "Compile the extension, need jdk7 because vertx relies on it"
-task :compile => "pkg/classes" do |t|
+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,
+    :source => "1.7", :target => "1.7", :debug => true, :includeantruntime => false,
     :classpath => "${java.class.path}:${sun.boot.class.path}:jars/vertx-core-2.1M3-SNAPSHOT.jar:jars/netty-all-4.0.13.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"
 end
 
+desc "Copy META-INF"
+task "#{DEST_PATH}/META-INF" => ["#{RESOURCE_PATH}/META-INF", "#{RESOURCE_PATH}/default-cluster.xml"] do |t|
+  FileUtils.cp_r t.prerequisites.first, t.name, verbose: true
+  cp t.prerequisites[1], DEST_PATH, verbose: true
+end
+
 desc "Build the jar"
 task :jar => [:clean, :compile] do
-  ant.jar :basedir => "pkg/classes", :destfile => "lib/jubilee/jubilee.jar", :includes => "**/*.class"
+  ant.jar :basedir => "pkg/classes", :destfile => "lib/jubilee/jubilee.jar"
 end
- 
+
 task :build => :jar
 
 desc "Run the specs"

data/examples/chatapp/Gemfile

@@ -2,4 +2,4 @@ source "https://rubygems.org"
 gem 'sinatra'
 gem 'haml'
 
-gem 'jubilee', '1.1.0.rc2'
+gem 'jubilee'

data/examples/chatapp/Gemfile.lock

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

data/examples/chatapp/app.rb

@@ -12,7 +12,7 @@ Vertx::EventBus.register_handler('logout') do |message|
   Vertx::SharedData.get_set(:users).delete(message.body)
 end
 
-# register the user and return the pervious users
+# register the user and return the previous users
 Vertx::EventBus.register_handler('login') do |message|
   user = message.body
   users = Vertx::SharedData.get_set(:users).add(user)

data/examples/jubilee.conf.rb

@@ -1,12 +1,17 @@
 # Listen to port 3000
 listen 3000
 
-# the ssl certification path
-ssl_keystore "jubilee/keystore.jks"
+# enable https mode
+ssl keystore: "keystore.jks", password: "hellojubilee"
 
-# the ssl certification key
-ssl_password "helloworld"
+# the directory where the rack app seats in
+working_directory "chatapp"
 
-pid "tmp/jubilee.pid"
-stderr_path "log/jubilee.stderr.log"
-stdout_path "log/jubilee.stdout.log"
+# rack environment
+environment "development"
+
+eventbus "/eventbus", inbound: [{}], outbound: [{}]
+
+clustering true
+
+debug true

data/java/resources/META-INF/services/org.vertx.java.core.spi.cluster.ClusterManagerFactory

@@ -0,0 +1 @@
+org.vertx.java.spi.cluster.impl.hazelcast.HazelcastClusterManagerFactory

data/java/resources/default-cluster.xml

@@ -0,0 +1,133 @@
+<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-basic.xsd"
+           xmlns="http://www.hazelcast.com/schema/config"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<properties>
+	    <property name="hazelcast.mancenter.enabled">false</property>
+	    <property name="hazelcast.memcache.enabled">false</property>
+	    <property name="hazelcast.rest.enabled">false</property>
+	    <property name="hazelcast.wait.seconds.before.join">0</property>
+	    <property name="hazelcast.logging.type">jdk</property>
+	</properties>
+    <group>
+        <name>dev</name>
+        <password>dev-pass</password>
+    </group>
+    <network>
+        <port auto-increment="true">5701</port>
+        <join>
+            <multicast enabled="true">
+                <multicast-group>224.2.2.3</multicast-group>
+                <multicast-port>54327</multicast-port>
+            </multicast>
+            <tcp-ip enabled="false">
+                <interface>192.168.1.28</interface>
+            </tcp-ip>
+            <aws enabled="false">
+                <access-key>my-access-key</access-key>
+                <secret-key>my-secret-key</secret-key>
+                <region>us-east-1</region>
+            </aws>
+        </join>
+        <!--
+        If you have more than one network interface, edit this to select which
+        one you want to use
+        <interfaces enabled="true">
+            <interface>192.168.1.16</interface>
+        </interfaces>
+        -->
+        
+        <symmetric-encryption enabled="false">
+            <!--
+               encryption algorithm such as DES/ECB/PKCS5Padding, PBEWithMD5AndDES,
+               AES/CBC/PKCS5Padding, Blowfish, DESede
+            -->
+            <algorithm>PBEWithMD5AndDES</algorithm>
+            <!-- salt value to use when generating the secret key -->
+            <salt>thesalt</salt>
+            <!-- pass phrase to use when generating the secret key -->
+            <password>thepass</password>
+            <!-- iteration count to use when generating the secret key -->
+            <iteration-count>19</iteration-count>
+        </symmetric-encryption>
+        <asymmetric-encryption enabled="false">
+            <!-- encryption algorithm -->
+            <algorithm>RSA/NONE/PKCS1PADDING</algorithm>
+            <!-- private key password -->
+            <keyPassword>thekeypass</keyPassword>
+            <!-- private key alias -->
+            <keyAlias>local</keyAlias>
+            <!-- key store type -->
+            <storeType>JKS</storeType>
+            <!-- key store password -->
+            <storePassword>thestorepass</storePassword>
+            <!-- path to the key store -->
+            <storePath>keystore</storePath>
+        </asymmetric-encryption>
+    </network>
+    <executor-service>
+        <core-pool-size>4</core-pool-size>
+        <max-pool-size>20</max-pool-size>
+        <keep-alive-seconds>60</keep-alive-seconds>
+    </executor-service>
+    <map name="subs">
+        <!--
+            Number of backups. If 1 is set as the backup-count for example, then all entries of
+            the map will be copied to another JVM for fail-safety. 0 means no backup.
+        -->
+        <backup-count>1</backup-count>
+        <!--
+            Maximum number of seconds for each entry to stay in the map. Entries that are
+            older than <time-to-live-seconds> and not updated for <time-to-live-seconds>
+            will get automatically evicted from the map.
+            Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0.
+        -->
+        <time-to-live-seconds>0</time-to-live-seconds>
+        <!--
+            Maximum number of seconds for each entry to stay idle in the map. Entries that are
+            idle(not touched) for more than <max-idle-seconds> will get
+            automatically evicted from the map. Entry is touched if get, put or containsKey is called.
+            Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0.
+        -->
+        <max-idle-seconds>0</max-idle-seconds>
+        <!--
+            Valid values are:
+            NONE (no eviction),
+            LRU (Least Recently Used),
+            LFU (Least Frequently Used).
+            NONE is the default.
+        -->
+        <eviction-policy>NONE</eviction-policy>
+        <!--
+            Maximum size of the map. When max size is reached,
+            map is evicted based on the policy defined.
+            Any integer between 0 and Integer.MAX_VALUE. 0 means
+            Integer.MAX_VALUE. Default is 0.
+        -->
+        <max-size policy="cluster_wide_map_size">0</max-size>
+        <!--
+            When max. size is reached, specified percentage of
+            the map will be evicted. Any integer between 0 and 100.
+            If 25 is set for example, 25% of the entries will
+            get evicted.
+        -->
+        <eviction-percentage>25</eviction-percentage>
+        <!--
+            While recovering from split-brain (network partitioning),
+            map entries in the small cluster will merge into the bigger cluster
+            based on the policy set here. When an entry merge into the
+            cluster, there might an existing entry with the same key already.
+            Values of these entries might be different for that same key.
+            Which value should be set for the key? Conflict is resolved by
+            the policy set here. Default policy is hz.ADD_NEW_ENTRY
+
+            There are built-in merge policies such as
+            hz.NO_MERGE      ; no entry will merge.
+            hz.ADD_NEW_ENTRY ; entry will be added if the merging entry's key
+                               doesn't exist in the cluster.
+            hz.HIGHER_HITS   ; entry with the higher hits wins.
+            hz.LATEST_UPDATE ; entry with the latest update wins.
+        -->
+        <merge-policy>hz.LATEST_UPDATE</merge-policy>
+
+    </map>
+</hazelcast>

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

@@ -27,8 +27,6 @@ public class RubyServer extends RubyObject {
     private String eventBusPrefix;
     private int port;
     private String host;
-    private int clusterPort;
-    private String clusterHost;
 
     public static void createServerClass(Ruby runtime) {
         RubyModule mJubilee = runtime.defineModule("Jubilee");
@@ -62,36 +60,25 @@ public class RubyServer extends RubyObject {
         RubyHash options = config.convertToHash();
         RubySymbol port_k = runtime.newSymbol("Port");
         RubySymbol host_k = runtime.newSymbol("Host");
-        RubySymbol cluster_port_k = runtime.newSymbol("cluster_port");
-        RubySymbol cluster_host_k = runtime.newSymbol("cluster_host");
         RubySymbol ssl_k = runtime.newSymbol("ssl");
-        RubySymbol keystore_path_k = runtime.newSymbol("keystore_path");
-        RubySymbol keystore_password_k = runtime.newSymbol("keystore_password");
+        RubySymbol ssl_keystore_k = runtime.newSymbol("ssl_keystore");
+        RubySymbol ssl_password_k = runtime.newSymbol("ssl_password");
         RubySymbol eventbus_prefix_k = runtime.newSymbol("eventbus_prefix");
 
         /* retrieve from passed in options */
-        this.port = Integer.parseInt(options.op_aref(context, port_k).toString());
-        this.host = options.op_aref(context, host_k).toString();
+        this.port = RubyNumeric.num2int(options.op_aref(context, port_k));
+        this.host = options.op_aref(context, host_k).asJavaString();
 
         this.ssl = options.op_aref(context, ssl_k).isTrue();
-        if (options.has_key_p(keystore_path_k).isTrue()) {
-            this.keyStorePath = options.op_aref(context, keystore_path_k).toString();
-            this.keyStorePassword = options.op_aref(context, keystore_password_k).toString();
+        if (this.ssl) {
+            this.keyStorePath = options.op_aref(context, ssl_keystore_k).asJavaString();
+            if (options.has_key_p(ssl_password_k).isTrue())
+                this.keyStorePassword = options.op_aref(context, ssl_password_k).asJavaString();
         }
         if (options.has_key_p(eventbus_prefix_k).isTrue())
-            this.eventBusPrefix = options.op_aref(context, eventbus_prefix_k).toString();
+            this.eventBusPrefix = options.op_aref(context, eventbus_prefix_k).asJavaString();
 
-        /* init vertx */
-        if (options.has_key_p(cluster_host_k).isTrue()) {
-            this.clusterHost = options.op_aref(context, cluster_host_k).toString();
-            if (options.has_key_p(cluster_port_k).isTrue()) {
-                this.clusterPort = Integer.parseInt(options.op_aref(context, cluster_port_k).toString());
-                this.vertx = JubileeVertx.init(clusterPort, clusterHost);
-            }
-            this.vertx = JubileeVertx.init(clusterHost);
-        } else {
-            this.vertx = JubileeVertx.init();
-        }
+        this.vertx = JubileeVertx.vertx();
 
         httpServer = vertx.createHttpServer();
         try {

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

@@ -2,8 +2,6 @@ package org.jruby.jubilee.vertx;
 
 import org.vertx.java.core.Vertx;
 import org.vertx.java.core.VertxFactory;
-import org.vertx.java.core.eventbus.EventBus;
-import org.vertx.java.core.shareddata.SharedData;
 
 /**
  * Created with IntelliJ IDEA.
@@ -12,27 +10,27 @@ import org.vertx.java.core.shareddata.SharedData;
  * Time: 15:24
  */
 public class JubileeVertx {
-    public static Vertx vertx;
-    private JubileeVertx() {
-    }
-    public static synchronized Vertx init(int port, String host) {
-        if (vertx != null) return vertx;
-        vertx = VertxFactory.newVertx(port, host);
-        return vertx;
-    }
-    public static synchronized Vertx init(String host) {
-        if (vertx != null) return vertx;
-        vertx = VertxFactory.newVertx(host);
-        return vertx;
-    }
-    public static synchronized Vertx init() {
-        if (vertx != null) return vertx;
-        vertx = VertxFactory.newVertx();
-        return vertx;
-    }
+  public static Vertx vertx;
+  private JubileeVertx() {
+  }
+  public static synchronized Vertx init(int port, String host) {
+    if (JubileeVertx.vertx != null) return vertx;
+    JubileeVertx.vertx = VertxFactory.newVertx(port, host);
+    return JubileeVertx.vertx;
+  }
+  public static synchronized Vertx init(String host) {
+    if (JubileeVertx.vertx != null) return vertx;
+    JubileeVertx.vertx = VertxFactory.newVertx(host);
+    return JubileeVertx.vertx;
+  }
+  public static synchronized Vertx init() {
+    if (JubileeVertx.vertx != null) return vertx;
+    JubileeVertx.vertx = VertxFactory.newVertx();
+    return JubileeVertx.vertx;
+  }
 
-    public synchronized static Vertx vertx() {
-        if (vertx == null) init();
-        return vertx;
-    }
+  public synchronized static Vertx vertx() {
+    if (JubileeVertx.vertx == null) init();
+    return JubileeVertx.vertx;
+  }
 }

data/lib/jubilee/cli.rb

@@ -51,9 +51,8 @@ module Jubilee
       @options = {
         debug: false,
         daemon: false,
-        Port: 8080,
-        Host: "0.0.0.0",
         ssl: false,
+        Port: 8080,
         environment: ENV["RACK_ENV"] || "development"
       }
       @parser = OptionParser.new do |o|
@@ -72,7 +71,7 @@ module Jubilee
         o.on "-p", "--port PORT", "Defind which PORT the server should bind" do |arg|
           @options[:Port] = arg.to_i
         end
-        o.on "--host HOST", "Defind which HOST the server should bind, default 0.0.0.0" do |arg|
+        o.on "-b", "--host HOST", "Defind which HOST the server should bind, default 0.0.0.0" do |arg|
           @options[:Host] = arg
         end
         o.on "-e", "--environment ENV", "Rack environment" do |arg|
@@ -84,10 +83,10 @@ module Jubilee
           @options[:ssl] = true
         end
         o.on "--ssl-keystore PATH", "SSL keystore path" do |arg|
-          @options[:keystore_path] = arg
+          @options[:ssl_keystore] = arg
         end
         o.on "--ssl-password PASS", "SSL keystore password" do |arg|
-          @options[:keystore_password] = arg
+          @options[:ssl_keystore] = arg
         end
         o.separator ""
         o.separator "Event bus options:"
@@ -100,10 +99,10 @@ module Jubilee
         o.on "--cluster", "Enable clustering" do
           @options[:cluster_host] = "0.0.0.0"
         end
-        o.on "--cluster-port", "If the cluster option has also been specified then this determines which port will be used for cluster communication with other Vert.x instances. Default is 0 -which means 'chose a free ephemeral port. You don't usually need to specify this parameter unless you really need to bind to a specific port." do |port|
-          @options[:cluster_host] = port
+        o.on "--cluster-port PORT", "If the cluster option has also been specified then this determines which port will be used for cluster communication with other Vert.x instances. Default is 0 -which means 'chose a free ephemeral port. You don't usually need to specify this parameter unless you really need to bind to a specific port." do |port|
+          @options[:cluster_port] = port.to_i
         end
-        o.on "--cluster-host", "If the cluster option has also been specified then this determines which host address will be used for cluster communication with other Vert.x instances. By default it will try and pick one from the available interfaces. If you have more than one interface and you want to use a specific one, specify it here." do |host|
+        o.on "--cluster-host HOST", "If the cluster option has also been specified then this determines which host address will be used for cluster communication with other Vert.x instances. By default it will try and pick one from the available interfaces. If you have more than one interface and you want to use a specific one, specify it here." do |host|
           @options[:cluster_host] = host
         end
 
@@ -112,7 +111,7 @@ module Jubilee
         o.on "--verbose", "Log low level debug information" do
           @options[:debug] = true
         end
-        o.on "-q", "--quiet" do
+        o.on "-q", "--quiet", "Disable logging" do
           @options[:quiet] = true
         end
       end

data/lib/jubilee/configuration.rb

@@ -16,6 +16,16 @@ module Jubilee
       @block = block
 
       reload
+      # initialize vertx as early as possible
+      if chost = @options[:cluster_host]
+        if cport = @options[:cluster_port]
+          org.jruby.jubilee.vertx.JubileeVertx.init(cport.to_java(:int), chost.to_java)
+        else
+          org.jruby.jubilee.vertx.JubileeVertx.init(chost.to_java)
+        end
+      else
+        org.jruby.jubilee.vertx.JubileeVertx.init()
+      end
     end
 
     def reload
@@ -39,29 +49,28 @@ module Jubilee
     #   listen "127.0.0.1:3000"  # listen to port 3000 on the loopback interface
     #   listen "[::1]:3000" # listen to port 3000 on the IPv6 loopback interface
     def listen(address)
-      @options[:host], @options[:port] = expand_addr(address)
+      @options[:Host], @options[:Port] = expand_addr(address, :listen)
     end
 
     # sets the working directory for jubilee
     def working_directory(path)
-      path = File.expand_path(path)
-      if config_file && config_file[0] != ?/ && ! File.readable?("#{path}/#{config_file}")
-         raise ArgumentError,
-              "config_file=#{config_file} would not be accessible in" \
-              " working_directory=#{path}"
-      end
-      @options[:chdir] = path
+      @options[:chdir] = File.expand_path(path)
+    end
+
+    # sets the RACK_ENV environment variable
+    def environment(env)
+      @options[:environment] = env
     end
 
     # set the event bus bridge prefix, prefix, options
-    # eventbus /eventbus, inbound: {foo:bar}, outbound: {foo: bar}
+    # eventbus /eventbus, inbound: [{foo:bar}], outbound: [{foo: bar}]
     # will set the event bus prefix as eventbus "/eventbus", it can be
     # connected via new EventBus("http://localhost:8080/eventbus"), inbound and
     # outbound options are security measures that will filter the messages
     def eventbus(prefix, options = {})
-      @options[:event_bus][:prefix] = prefix
-      @options[:event_bus][:inbound] = options[:inbound]
-      @options[:event_bus][:outbound] = options[:outbound]
+      @options[:eventbus_prefix] = prefix
+      @options[:eventbus_inbound] = options[:inbound]
+      @options[:eventbus_outbound] = options[:outbound]
     end
 
     # Set the host and port to be discovered by other jubilee instances in the network
@@ -74,10 +83,10 @@ module Jubilee
     #    clustering "0.0.0.0:5701"
     #    clustering 5701
     def clustering(address)
-      if addr == true
+      if address == true
         @options[:cluster_host] = "0.0.0.0"
       else
-        @options[:cluster_host], @options[:cluster_port] = expand_addr(address)
+        @options[:cluster_host], @options[:cluster_port] = expand_addr(address, :clustering)
       end
     end
 
@@ -88,7 +97,7 @@ module Jubilee
 
     # enable daemon mode
     def daemonize(bool)
-      set_bool(:debug, bool)
+      set_bool(:deamon, bool)
     end
 
     # enable https mode, provide the :keystore path and password
@@ -130,8 +139,8 @@ module Jubilee
       inner_app
     end
 
-    def expand_addr(addr)
-      return ["0.0.0.0", addr] if addr === Integer
+    def expand_addr(addr, var = nil)
+      return ["0.0.0.0", addr] if addr.is_a?(Fixnum)
       case addr
       when %r{\A(?:\*:)?(\d+)\z}
         ["0.0.0.0", $1]

data/lib/jubilee/server.rb

@@ -2,8 +2,8 @@ require 'rack/methodoverride'
 module Jubilee
   class Server < VertxServer
     def initialize(app, opts = {})
-      options = {Port: 8080, ssl: false}.merge(opts)
-      if (options[:ssl]) && options[:keystore_path].nil?
+      options = {Host: "0.0.0.0", Port: 8080, ssl: false}.merge(opts)
+      if (options[:ssl]) && options[:ssl_keystore].nil?
           raise ArgumentError, "Please provide a keystore for ssl"
       end
       super(Application.new(app), options)

data/lib/jubilee/version.rb

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

data/lib/jubilee.rb

@@ -3,6 +3,7 @@ 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-SNAPSHOT.jar")
+require File.join(File.dirname(__FILE__), "../jars/vertx-hazelcast-2.1M3-SNAPSHOT.jar")
 require File.join(File.dirname(__FILE__), "../jars/netty-all-4.0.13.Final.jar")
 
 require 'jubilee/jubilee.jar'

data/spec/integration/basic_sinatra_spec.rb

@@ -33,7 +33,7 @@ feature "basic sinatra test" do
     uri = URI.parse("#{Capybara.app_host}/some_page.html")
     Net::HTTP.start(uri.host, uri.port) do |http|
       request = Net::HTTP::Get.new(uri.request_uri)
-      request.add_field('If-Modified-Since', 'Sat, 31 Dec 2050 00:00:00 GMT')
+      request.add_field('If-Modified-Since', 'Mon, 30 Dec 2013 22:20:25 GMT')
       response = http.request(request)
       response.code.should == "304"
     end

data/test/jubilee/test_cli.rb

@@ -6,6 +6,5 @@ class TestJubileeCLI < MiniTest::Unit::TestCase
     cli = Jubilee::CLI.new(["app.rb"])
     cli.parse_options
     assert_equal "app.rb", cli.options[:rackup]
-    assert_equal 8080, cli.options[:Port]
   end
 end

data/test/jubilee/test_configuration.rb

@@ -4,6 +4,12 @@ require 'jubilee/configuration'
 class TestConfig < MiniTest::Unit::TestCase
 
   def setup
+    @tmp = Tempfile.new("jubilee_config")
+  end
+
+  def teardown
+    @tmp.close
+    @tmp.unlink
   end
 
   def test_load
@@ -13,17 +19,68 @@ class TestConfig < MiniTest::Unit::TestCase
   end
 
   def test_config_invalid
-    tmp = Tempfile.new("jubilee_config")
-    tmp.syswrite(%q(abcd "helloword"))
+    @tmp.syswrite(%q(abcd "helloword"))
     assert_raises(NoMethodError) do
-      Jubilee::Configuration.new(config_file: tmp.path)
+      Jubilee::Configuration.new(config_file: @tmp.path)
     end
   end
 
+  def test_config_listen_on_port
+    @tmp.syswrite(%q(listen 3000))
+    options = Jubilee::Configuration.new(config_file: @tmp.path).options
+    assert_equal(3000, options[:Port])
+    assert_equal("0.0.0.0", options[:Host])
+  end
+
+  def test_config_listen_on_host_and_port
+    @tmp.syswrite(%q(listen "localhost:3000"))
+    options = Jubilee::Configuration.new(config_file: @tmp.path).options
+    assert_equal(3000, options[:Port])
+    assert_equal("127.0.0.1", options[:Host])
+  end
+
+  def test_config_ssl
+    @tmp.syswrite(%q(ssl keystore: "keystore.jks", password: "helloworld"))
+    options = Jubilee::Configuration.new(config_file: @tmp.path).options
+    assert_equal("keystore.jks", options[:ssl_keystore])
+    assert_equal("helloworld", options[:ssl_password])
+    assert options[:ssl]
+  end
+
+  def test_config_eventbus
+    @tmp.syswrite(%q(eventbus "/eb", inbound: [{}], outbound: [{}]))
+    options = Jubilee::Configuration.new(config_file: @tmp.path).options
+    assert_equal("/eb", options[:eventbus_prefix])
+  end
+
+  def test_config_file_clustering_true
+    @tmp.syswrite(%q(clustering true))
+    options = Jubilee::Configuration.new(config_file: @tmp.path).options
+    assert_equal("0.0.0.0", options[:cluster_host])
+  end
+
+  def test_config_file_clustering_host_and_port
+    @tmp.syswrite(%q(clustering "localhost:5701"))
+    options = Jubilee::Configuration.new(config_file: @tmp.path).options
+    assert_equal("127.0.0.1", options[:cluster_host])
+    assert_equal(5701, options[:cluster_port])
+  end
+
+  def test_config_file_working_directory
+    @tmp.syswrite(%q(working_directory "chatapp"))
+    options = Jubilee::Configuration.new(config_file: @tmp.path).options
+    assert_match(/chatapp/, options[:chdir])
+  end
+
+  def test_config_file_environment
+    @tmp.syswrite(%q(environment "test"))
+    options = Jubilee::Configuration.new(config_file: @tmp.path).options
+    assert_equal("test", options[:environment])
+  end
+
   def test_config_non_exist
-    tmp = Tempfile.new("jubilee_config")
-    path = tmp.path
-    tmp.close!
+    path = @tmp.path
+    @tmp.close!
     assert_raises(Errno::ENOENT) do
       Jubilee::Configuration.new(config_file: path)
     end

data/test/jubilee/test_server.rb

@@ -49,8 +49,8 @@ class TestJubileeServer < MiniTest::Unit::TestCase
   def test_url_scheme_for_https
     app = lambda { |env| [200, {}, [env['rack.url_scheme']]] }
     @server = Jubilee::Server.new(app, {port:@port, ssl:true, 
-                                 keystore_path: File.join(File.dirname(__FILE__), "../../examples/jubilee/server-keystore.jks"),
-    keystore_password: "wibble"})
+                                 ssl_keystore: File.join(File.dirname(__FILE__), "../../examples/keystore.jks"),
+    ssl_password: "hellojubilee"})
     @server.start
     sleep 0.1
     http = Net::HTTP.new @host, @port

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jubilee
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: java
 authors:
 - Isaiah Peng
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -88,8 +88,7 @@ files:
 - 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
+- examples/keystore.jks
 - jars/hazelcast-2.6.3.jar
 - jars/jackson-annotations-2.2.2.jar
 - jars/jackson-core-2.2.2.jar
@@ -97,6 +96,8 @@ files:
 - jars/netty-all-4.0.13.Final.jar
 - jars/vertx-core-2.1M3-SNAPSHOT.jar
 - jars/vertx-hazelcast-2.1M3-SNAPSHOT.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/RackApplication.java