jubilee 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

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

@@ -7,6 +7,8 @@ import org.jruby.*;
 import org.jruby.runtime.*;
 import org.jruby.runtime.builtin.*;
 import org.jruby.anno.JRubyMethod;
+import org.vertx.java.core.json.JsonArray;
+import org.vertx.java.core.json.JsonObject;
 
 public class Server extends RubyObject {
   final private Vertx vertx;
@@ -16,7 +18,9 @@ public class Server extends RubyObject {
   private boolean ssl = false;
   private String keyStorePath;
   private String keyStorePassword;
+  private String eventBusPrefix;
   private int port;
+  private String host;
 
   public static void createServerClass(Ruby runtime) {
     RubyModule mJubilee = runtime.defineModule("Jubilee");
@@ -36,23 +40,50 @@ public class Server extends RubyObject {
     httpServer = vertx.createHttpServer();
   }
 
-  @JRubyMethod(name = "initialize", required = 2, optional = 3)
-  public IRubyObject initialize(ThreadContext context, IRubyObject[] args, Block block) {
-    this.port = RubyInteger.num2int(args[1]);
-    if (args.length > 2) {
-      this.ssl = args[2].isTrue();
+  /**
+   * Initialize jubilee server, take a rack application and a configuration hash as parameter
+   * @param context
+   * @param args
+   * @param block
+   * @return
+   */
+  @JRubyMethod(name = "initialize")
+  public IRubyObject initialize(ThreadContext context, IRubyObject app, IRubyObject config, Block block) {
+    Ruby runtime = getRuntime();
+    RubyHash options = config.convertToHash();
+    RubySymbol port_k = runtime.newSymbol("Port");
+    RubySymbol host_k = runtime.newSymbol("Host");
+    RubySymbol ssl_k = runtime.newSymbol("ssl");
+    RubySymbol keystore_path_k = runtime.newSymbol("keystore_path");
+    RubySymbol keystore_password_k = runtime.newSymbol("keystore_password");
+    RubySymbol eventbus_prefix_k = runtime.newSymbol("eventbus_prefix");
+    this.port = RubyInteger.num2int(options.op_aref(context, port_k));
+    if (options.has_key_p(host_k).isTrue()) {
+        this.host = options.op_aref(context, host_k).toString();
+    } else {
+        this.host = "0.0.0.0";
+    }
+    this.ssl = options.op_aref(context, ssl_k).isTrue();
+    this.app = new RackApplication(app, this.ssl);
+    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 (options.has_key_p(eventbus_prefix_k).isTrue()) {
+      this.eventBusPrefix = options.op_aref(context, eventbus_prefix_k).toString();
     }
-    this.app = new RackApplication(args[0], this.ssl);
-    if (args.length > 3)
-      this.keyStorePath = args[3].toString();
-    if (args.length > 4)
-      this.keyStorePassword = args[4].toString();
     running = false;
     return this;
   }
 
-  @JRubyMethod(name = "start", optional = 1)
-  public IRubyObject start(final ThreadContext context, final IRubyObject[] args, final Block block) {
+  /**
+   * Start http server, initialize states
+   * @param context
+   * @param block
+   * @return
+   */
+  @JRubyMethod(name = "start")
+  public IRubyObject start(final ThreadContext context, final Block block) {
     this.running = true;
     httpServer.setAcceptBacklog(10000);
     httpServer.requestHandler(new Handler<HttpServerRequest>() {
@@ -60,9 +91,14 @@ public class Server extends RubyObject {
         app.call(req);
       }
     });
+    if (eventBusPrefix != null) {
+      JsonObject config = new JsonObject().putString("prefix", eventBusPrefix);
+      // TODO read inbounds and outbounds from config file
+      vertx.createSockJSServer(httpServer).bridge(config, new JsonArray(), new JsonArray());
+    }
     if (ssl) httpServer.setSSL(true).setKeyStorePath(this.keyStorePath)
             .setKeyStorePassword(this.keyStorePassword);
-    httpServer.listen(this.port);
+    httpServer.listen(this.port, this.host);
     return this;
   }
 

data/lib/jubilee.rb

@@ -1,3 +1,5 @@
+require File.join(File.dirname(__FILE__), "../jars/jackson-core-asl-1.9.4.jar")
+require File.join(File.dirname(__FILE__), "../jars/jackson-mapper-asl-1.9.4.jar")
 require File.join(File.dirname(__FILE__), "../jars/vertx-core-1.3.0.final.jar")
 require File.join(File.dirname(__FILE__), "../jars/netty-3.6.0.Beta1.jar")
 

data/lib/jubilee/cli.rb

@@ -22,7 +22,7 @@ module Jubilee
       parse_options
       @config = Jubilee::Configuration.new(@options)
       @config.load
-      server = Jubilee::Server.new(@config.app, {port: @config.port, ssl: @config.ssl, keystore_path: @config.keystore_path, keystore_password: @config.keystore_password})
+      server = Jubilee::Server.new(@config.app, @options)
       server.start
       puts "Jubilee is listening on port #{@config.port}, press Ctrl+C to quit"
       starter = org.jruby.jubilee.deploy.Starter.new
@@ -33,7 +33,7 @@ module Jubilee
       @options = {
         debug: false,
         daemon: false,
-        port: 3215,
+        Port: 3215,
         ssl: false,
         environment: "development"
       }
@@ -51,7 +51,10 @@ module Jubilee
           @options[:chdir] = arg
         end
         o.on "-p", "--port PORT", "Defind which PORT the server should bind" do |arg|
-          @options[:port] = arg
+          @options[:Port] = arg
+        end
+        o.on "--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|
           @options[:environment] = arg
@@ -67,6 +70,12 @@ module Jubilee
         o.on "--ssl-password PASS", "SSL keystore password" do |arg|
           @options[:keystore_password] = arg
         end
+        o.separator ""
+        o.separator "Event bus options"
+        o.on "--eventbus PREFIX", "Event bus prefix" do |arg|
+          @options[:eventbus_prefix] = arg
+        end
+
         o.separator ""
         o.separator "Common options:"
         o.on "--verbose", "Log low level debug information" do

data/lib/jubilee/configuration.rb

@@ -19,7 +19,11 @@ module Jubilee
     end
 
     def port
-      @options[:port]
+      @options[:Port]
+    end
+
+    def host
+      @options[:Host]
     end
 
     def ssl

data/lib/jubilee/const.rb

@@ -1,6 +1,6 @@
 module Jubilee
   module Const
-    JUBILEE_VERSION = VERSION = "0.1.0".freeze
+    JUBILEE_VERSION = VERSION = "0.2.1".freeze
     HTTP_11 = "HTTP/1.1".freeze
     HTTP_10 = "HTTP/1.0".freeze
 
@@ -33,6 +33,7 @@ module Jubilee
     HTTP_ACCEPT_LANGUAGE = "HTTP_ACCEPT_LANGUAGE".freeze
     HTTP_ACCEPT_ENCODING = "HTTP_ACCEPT_ENCODING".freeze
     HTTP_CONNECTION = "HTTP_CONNECTION".freeze
+    NEWLINE = "\n".freeze
 
     STATUS_WITH_NO_ENTITY_BODY = Hash[Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.map{|s| [s, true]}]
   end

data/lib/jubilee/response.rb

@@ -36,16 +36,19 @@ module Jubilee
     end
 
     def write_headers(response)
-      @headers.each do |key, value|
+      @headers.each do |key, values|
         case key
         when CONTENT_LENGTH
-          @content_length = value
+          @content_length = values
           next
         when TRANSFER_ENCODING
           @allow_chunked = false
           @content_length = nil
         end
-        response.putHeader(key, value)
+        # Multiple values are joined by \n
+        values.split(NEWLINE).each do |value|
+          response.putHeader(key, value)
+        end
       end
     end
 

data/lib/jubilee/server.rb

@@ -1,16 +1,13 @@
+require 'rack/methodoverride'
 module Jubilee
   class Server < VertxServer
     def initialize(app, opts = {})
-      options = {port: 3215, ssl: false}.merge(opts)
-      if (options[:ssl])
-        if options[:keystore_path].nil?
+      app = Rack::MethodOverride.new(app)
+      options = {Port: 3215, ssl: false}.merge(opts)
+      if (options[:ssl]) && options[:keystore_path].nil?
           raise ArgumentError, "Please provide a keystore for ssl"
-        else
-          super(Application.new(app), options[:port], options[:ssl], options[:keystore_path], options[:keystore_password])
-        end
-      else
-        super(Application.new(app), options[:port])
       end
+      super(Application.new(app), options)
     end
   end
 end

data/lib/rack/handler/jubilee.rb

@@ -6,14 +6,14 @@ module Rack
   module Handler
     module Jubilee
       DEFAULT_OPTIONS = {
-        :host => '0.0.0.0',
-        :port => 3000,
-        :verbose => false
+        :Host => '0.0.0.0',
+        :Port => 3000,
+        :Verbose => false
       }
       def self.run(app, options = {})
         options = DEFAULT_OPTIONS.merge(options)
 
-        if options[:verbose]
+        if options[:Verbose]
           app = Rack::CommonLogger.new(app, STDOUT)
         end
 
@@ -23,8 +23,9 @@ module Rack
 
         @server = ::Jubilee::Server.new(app, options)
 
-        puts "Jubilee starting..."
-        puts "Environment: #{ENV['RACK_ENV']}"
+        puts "Jubilee #{::Jubilee::Const::JUBILEE_VERSION} starting..."
+        puts "* Environment: #{ENV['RACK_ENV']}"
+        puts "* Listening on tcp://#{options[:Host]}:#{options[:Port]}"
 
         yield @server if block_given?
 

data/test/jubilee/test_cli.rb

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

data/test/jubilee/test_config.rb

@@ -8,7 +8,7 @@ class TestConfig < MiniTest::Unit::TestCase
   def test_load
     @config.load
     resp = [200, {"Content-Type" => "text/plain"}, ["embeded app"]]
-    skip "hard to test because of Rack::Lint"
-    #assert_equal resp, @config.app.call({})
+    #skip "hard to test because of Rack::Lint"
+    assert_equal resp, @config.app.call({})
   end
 end

metadata

@@ -2,14 +2,14 @@
 name: jubilee
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Isaiah Peng
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -85,6 +85,8 @@ files:
 - examples/jubilee/server-keystore.jks
 - examples/ssl/ServerTest.java
 - examples/ssl/webroot/index.html
+- jars/jackson-core-asl-1.9.4.jar
+- jars/jackson-mapper-asl-1.9.4.jar
 - jars/netty-3.6.0.Beta1.jar
 - jars/vertx-core-1.3.0.final.jar
 - java/.idea/ant.xml