jubilee 1.0.2 → 1.1.0.rc1

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

@@ -39,9 +39,9 @@ public class RubyIORackInput extends RubyObject implements RackInput {
         }
     };
 
-    public static RubyClass createRubyIORackInputClass(Ruby runtime) {
-        RubyModule jModule = runtime.defineModule("Jubilee");
-        RubyClass rackIOInputClass = jModule.defineClassUnder("RubyIORackInput", runtime.getObject(), ALLOCATOR);
+    public static RubyClass createIORackInputClass(Ruby runtime) {
+        RubyModule jModule = runtime.getOrCreateModule("Jubilee");
+        RubyClass rackIOInputClass = jModule.defineClassUnder("IORackInput", runtime.getObject(), ALLOCATOR);
         rackIOInputClass.defineAnnotatedMethods(RubyIORackInput.class);
         return rackIOInputClass;
     }
@@ -50,8 +50,8 @@ public class RubyIORackInput extends RubyObject implements RackInput {
         super(runtime, metaClass);
     }
 
-    public RubyIORackInput(Ruby runtime, HttpServerRequest request, ByteBuf buf, AtomicBoolean eof) {
-        this(runtime, createRubyIORackInputClass(runtime));
+    public RubyIORackInput(Ruby runtime, RubyClass rubyClass, HttpServerRequest request, ByteBuf buf, AtomicBoolean eof) {
+        this(runtime, rubyClass);
         this.request = request;
         String hdr = request.headers().get(Const.Vertx.CONTENT_LENGTH);
         this.chunked = hdr == null;

data/java/src/org/jruby/jubilee/impl/{NullIO.java → RubyNullIO.java}

@@ -17,26 +17,22 @@ import org.jruby.runtime.builtin.IRubyObject;
  * Date: 11/26/12
  * Time: 12:11 PM
  */
-public class NullIO extends RubyObject implements RackInput {
+public class RubyNullIO extends RubyObject implements RackInput {
     public static RubyClass createNullIOClass(Ruby ruby) {
-        RubyModule jModule = ruby.defineModule("Jubilee");
+        RubyModule jModule = ruby.getOrCreateModule("Jubilee");
         RubyClass nullIOClass = jModule.defineClassUnder("NullIO", ruby.getObject(), ALLOCATOR);
-        nullIOClass.defineAnnotatedMethods(NullIO.class);
+        nullIOClass.defineAnnotatedMethods(RubyNullIO.class);
         return nullIOClass;
     }
 
     public static ObjectAllocator ALLOCATOR = new ObjectAllocator() {
         @Override
         public IRubyObject allocate(Ruby ruby, RubyClass rubyClass) {
-            return new NullIO(ruby, rubyClass);
+            return new RubyNullIO(ruby, rubyClass);
         }
     };
 
-    public NullIO(Ruby ruby) {
-        this(ruby, createNullIOClass(ruby));
-    }
-
-    public NullIO(Ruby runtime, RubyClass metaClass) {
+    public RubyNullIO(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
     }
 

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

@@ -0,0 +1,37 @@
+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.
+ *
+ * @author Bob McWhirter <bmcwhirt@redhat.com>
+ */
+public class RubyHelper {
+
+    public static final RubyString toUsAsciiRubyString(final Ruby runtime, final String string) {
+        byte[] bytes = new byte[string.length()];
+        for (int i = 0; i < bytes.length; i++) {
+            bytes[i] = (byte) string.charAt(i);
+        }
+        return toUsAsciiRubyString(runtime, bytes);
+    }
+
+    public static final RubyString toUsAsciiRubyString(final Ruby runtime, final byte[] bytes) {
+        return RubyString.newString(runtime, new ByteList(bytes, USASCIIEncoding.INSTANCE, false));
+    }
+
+    public static final RubyString toUnicodeRubyString(final Ruby runtime, final String string) {
+        return RubyString.newUnicodeString(runtime, string);
+    }
+}
+

data/jubilee.gemspec

@@ -2,15 +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.rc1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "jubilee"
-  s.version = "1.0.0.beta1"
+  s.version = "1.1.0.rc1"
 
-  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 = "2013-09-22"
-  s.description = "Jubilee is a experimental webserver built for speed, it's based on Vertx."
+  s.date = "2013-12-30"
+  s.description = "Jubilee is a jruby webserver built upon Vertx."
   s.email = "issaria@gmail.com"
   s.executables = ["jubilee", "jubilee_d"]
   s.extra_rdoc_files = [
@@ -23,35 +24,48 @@ Gem::Specification.new do |s|
     "Gemfile",
     "Gemfile.lock",
     "Guardfile",
+    "KNOWN_ISSUES",
     "README.md",
     "Rakefile",
-    "VERSION",
     "bin/jubilee",
     "bin/jubilee_d",
+    "examples/chatapp/Gemfile",
+    "examples/chatapp/Gemfile.lock",
+    "examples/chatapp/README.md",
+    "examples/chatapp/app.rb",
+    "examples/chatapp/config.ru",
+    "examples/chatapp/public/assets/javascripts/application.js",
+    "examples/chatapp/public/assets/javascripts/jquery.js",
+    "examples/chatapp/public/assets/javascripts/sockjs-0.3.4.min.js",
+    "examples/chatapp/public/assets/javascripts/vertxbus.js",
+    "examples/chatapp/public/assets/stylesheets/application.css",
     "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.jar",
+    "jars/hazelcast-2.6.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.4.Final.jar",
-    "jars/vertx-core-2.1.0-SNAPSHOT.jar",
+    "jars/netty-all-4.0.13.Final.jar",
+    "jars/vertx-core-2.1M3-SNAPSHOT.jar",
+    "jars/vertx-hazelcast-2.1M3-SNAPSHOT.jar",
     "java/src/jubilee/JubileeService.java",
     "java/src/org/jruby/jubilee/Const.java",
     "java/src/org/jruby/jubilee/RackApplication.java",
     "java/src/org/jruby/jubilee/RackEnvironment.java",
-    "java/src/org/jruby/jubilee/RackErrors.java",
     "java/src/org/jruby/jubilee/RackInput.java",
     "java/src/org/jruby/jubilee/RackResponse.java",
-    "java/src/org/jruby/jubilee/Server.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/impl/DefaultRackEnvironment.java",
-    "java/src/org/jruby/jubilee/impl/NullIO.java",
-    "java/src/org/jruby/jubilee/impl/RubyIORackErrors.java",
+    "java/src/org/jruby/jubilee/impl/RackEnvironment.java",
+    "java/src/org/jruby/jubilee/impl/RackEnvironmentHash.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",
     "java/src/org/jruby/jubilee/vertx/JubileeVertx.java",
     "jubilee.gemspec",
     "lib/jubilee.rb",
@@ -69,6 +83,79 @@ Gem::Specification.new do |s|
     "lib/vertx/buffer.rb",
     "lib/vertx/event_bus.rb",
     "lib/vertx/shared_data.rb",
+    "spec/apps/rack/basic/config.ru",
+    "spec/apps/rails4/basic/.gitignore",
+    "spec/apps/rails4/basic/Gemfile",
+    "spec/apps/rails4/basic/README.rdoc",
+    "spec/apps/rails4/basic/Rakefile",
+    "spec/apps/rails4/basic/app/assets/images/.keep",
+    "spec/apps/rails4/basic/app/assets/images/rails.png",
+    "spec/apps/rails4/basic/app/assets/javascripts/application.js",
+    "spec/apps/rails4/basic/app/assets/stylesheets/application.css",
+    "spec/apps/rails4/basic/app/controllers/application_controller.rb",
+    "spec/apps/rails4/basic/app/controllers/concerns/.keep",
+    "spec/apps/rails4/basic/app/controllers/reloader_controller.rb",
+    "spec/apps/rails4/basic/app/controllers/reloader_controller.rb.erb",
+    "spec/apps/rails4/basic/app/controllers/root_controller.rb",
+    "spec/apps/rails4/basic/app/helpers/application_helper.rb",
+    "spec/apps/rails4/basic/app/mailers/.keep",
+    "spec/apps/rails4/basic/app/models/.keep",
+    "spec/apps/rails4/basic/app/models/concerns/.keep",
+    "spec/apps/rails4/basic/app/views/layouts/application.html.erb",
+    "spec/apps/rails4/basic/app/views/reloader/index.html.erb",
+    "spec/apps/rails4/basic/app/views/root/index.html.erb",
+    "spec/apps/rails4/basic/app/views/root/streaming.html.erb",
+    "spec/apps/rails4/basic/bin/bundle",
+    "spec/apps/rails4/basic/bin/rails",
+    "spec/apps/rails4/basic/bin/rake",
+    "spec/apps/rails4/basic/config.ru",
+    "spec/apps/rails4/basic/config/application.rb",
+    "spec/apps/rails4/basic/config/boot.rb",
+    "spec/apps/rails4/basic/config/database.yml",
+    "spec/apps/rails4/basic/config/environment.rb",
+    "spec/apps/rails4/basic/config/environments/development.rb",
+    "spec/apps/rails4/basic/config/environments/production.rb",
+    "spec/apps/rails4/basic/config/environments/test.rb",
+    "spec/apps/rails4/basic/config/initializers/backtrace_silencers.rb",
+    "spec/apps/rails4/basic/config/initializers/filter_parameter_logging.rb",
+    "spec/apps/rails4/basic/config/initializers/inflections.rb",
+    "spec/apps/rails4/basic/config/initializers/mime_types.rb",
+    "spec/apps/rails4/basic/config/initializers/secret_token.rb",
+    "spec/apps/rails4/basic/config/initializers/session_store.rb",
+    "spec/apps/rails4/basic/config/initializers/wrap_parameters.rb",
+    "spec/apps/rails4/basic/config/locales/en.yml",
+    "spec/apps/rails4/basic/config/routes.rb",
+    "spec/apps/rails4/basic/db/seeds.rb",
+    "spec/apps/rails4/basic/lib/assets/.keep",
+    "spec/apps/rails4/basic/lib/tasks/.keep",
+    "spec/apps/rails4/basic/public/404.html",
+    "spec/apps/rails4/basic/public/422.html",
+    "spec/apps/rails4/basic/public/500.html",
+    "spec/apps/rails4/basic/public/favicon.ico",
+    "spec/apps/rails4/basic/public/robots.txt",
+    "spec/apps/rails4/basic/public/some_page.html",
+    "spec/apps/rails4/basic/test/controllers/.keep",
+    "spec/apps/rails4/basic/test/fixtures/.keep",
+    "spec/apps/rails4/basic/test/helpers/.keep",
+    "spec/apps/rails4/basic/test/integration/.keep",
+    "spec/apps/rails4/basic/test/mailers/.keep",
+    "spec/apps/rails4/basic/test/models/.keep",
+    "spec/apps/rails4/basic/test/test_helper.rb",
+    "spec/apps/rails4/basic/vendor/assets/javascripts/.keep",
+    "spec/apps/rails4/basic/vendor/assets/stylesheets/.keep",
+    "spec/apps/sinatra/basic/Gemfile",
+    "spec/apps/sinatra/basic/Gemfile.lock",
+    "spec/apps/sinatra/basic/basic.rb",
+    "spec/apps/sinatra/basic/config.ru",
+    "spec/apps/sinatra/basic/public/some_page.html",
+    "spec/apps/sinatra/basic/views/index.erb",
+    "spec/apps/sinatra/basic/views/posted.haml",
+    "spec/apps/sinatra/basic/views/poster.haml",
+    "spec/apps/sinatra/basic/views/request_mapping.haml",
+    "spec/integration/basic_rack_spec.rb",
+    "spec/integration/basic_rails4_spec.rb",
+    "spec/integration/basic_sinatra_spec.rb",
+    "spec/spec_helper.rb",
     "test/.ruby-version",
     "test/config/app.rb",
     "test/jubilee/test_cli.rb",
@@ -86,11 +173,11 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/isaiah/jubilee"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.1.9"
   s.summary = "More than a server for rack applications."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, [">= 1.4.1"])

data/lib/jubilee.rb

@@ -1,9 +1,9 @@
 require File.join(File.dirname(__FILE__), "../jars/jackson-core-2.2.2.jar")
 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.jar")
-require File.join(File.dirname(__FILE__), "../jars/vertx-core-2.1.0-SNAPSHOT.jar")
-require File.join(File.dirname(__FILE__), "../jars/netty-all-4.0.4.Final.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/netty-all-4.0.13.Final.jar")
 
 require 'jubilee/jubilee.jar'
 require 'rack'
@@ -14,3 +14,4 @@ require 'jubilee/application'
 require 'jubilee/configuration'
 require 'jubilee/response'
 require 'rack/handler/jubilee'
+require 'rack/chunked'

data/lib/jubilee/cli.rb

@@ -41,7 +41,8 @@ module Jubilee
       @options = {
         debug: false,
         daemon: false,
-        Port: 3215,
+        Port: 8080,
+        Host: "0.0.0.0",
         ssl: false,
         environment: ENV["RACK_ENV"] || "development"
       }

data/lib/jubilee/configuration.rb

@@ -11,7 +11,7 @@ module Jubilee
     attr_reader :options
 
     def initialize(options, &block)
-      config_file = options.delete(:config_file)
+      @config_file = options.delete(:config_file)
       @options = options.dup
       @block = block
 
@@ -50,18 +50,13 @@ module Jubilee
               "config_file=#{config_file} would not be accessible in" \
               " working_directory=#{path}"
       end
-    end
-
-    # sets the number of worker threads in the threads pool, Each worker thread
-    # will serve exactly one client at a time.
-    def worker_threads(nr)
-      set_int(:worker_threads, nr, 1)
+      @options[:chdir] = path
     end
 
     # set the event bus bridge prefix, prefix, options
     # 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:3215/eventbus"), inbound and
+    # 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
@@ -129,7 +124,7 @@ module Jubilee
           inner_app = Object.const_get(File.basename(options[:rackup], '.rb').capitalize.to_sym).new
         else
           Dir.chdir options[:chdir] if options[:chdir]
-          inner_app, opts = Rack::Builder.parse_file "config.ru"
+          inner_app, _ = Rack::Builder.parse_file "config.ru"
         end
       end
       inner_app

data/lib/jubilee/const.rb

@@ -1,6 +1,6 @@
 module Jubilee
   module Const
-    JUBILEE_VERSION = VERSION
+    JUBILEE_VERSION = Version::STRING
     HTTP_11 = "HTTP/1.1".freeze
     HTTP_10 = "HTTP/1.0".freeze
 
@@ -35,6 +35,6 @@ module Jubilee
     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]}]
+    STATUS_WITH_NO_ENTITY_BODY = Hash[[204,205,304].map{|s| [s, true]}]
   end
 end

data/lib/jubilee/response.rb

@@ -13,6 +13,7 @@ module Jubilee
       end
     end
 
+    # See Rack::Utils::
     def respond(response)
       no_body = @status < 200 || STATUS_WITH_NO_ENTITY_BODY[@status]
       write_status(response)
@@ -21,19 +22,21 @@ module Jubilee
         response.end
       else 
         if @body.respond_to?(:to_path)
-          response.sendFile(@body.to_path)
+          response.send_file(@body.to_path)
         else
           write_body(response)
           response.end
         end
       end
+    rescue NativeException => e
+      puts e
     ensure
       @body.close if @body.respond_to?(:close)
     end
 
     private
     def write_status(response)
-      response.setStatusCode(@status)
+      response.status_code = @status
     end
 
     def write_headers(response)
@@ -43,21 +46,19 @@ module Jubilee
           @content_length = values
           next
         when TRANSFER_ENCODING
-          @allow_chunked = false
           @content_length = nil
         end
         # Multiple values are joined by \n
-        values.split(NEWLINE).each do |value|
-          response.putHeader(key, value)
-        end
+        response.put_header(key, values)
       end
     end
 
     def write_body(response)
+      response.put_default_headers
       if @content_length
-        response.putHeader(CONTENT_LENGTH, @content_length.to_s)
+        response.put_header(CONTENT_LENGTH, @content_length.to_s)
       else
-        response.setChunked(true)
+        response.chunked = true
       end
 
       @body.each do |part|

data/lib/jubilee/server.rb

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

data/lib/jubilee/version.rb

@@ -1,3 +1,10 @@
 module Jubilee
-  VERSION = "1.0.2".freeze
+  module Version
+    MAJOR = 1
+    MINOR = 1
+    PATCH = 0
+    BUILD = 'rc1'
+
+    STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
+  end
 end

data/lib/rack/chunked.rb

@@ -0,0 +1,38 @@
+# Rails use this to chunk it's streaming response body, which we don't need
+module Rack
+  class Chunked
+    class Body
+      def initialize(body)
+        @body = body
+      end
+
+      def each
+        @body.each {|chunk| yield chunk}
+      end
+
+      def close
+        @body.close if @body.respond_to?(:close)
+      end
+    end
+
+    include Rack::Utils
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      status, headers, body = @app.call(env)
+      headers = HeaderHash.new(headers)
+
+      unless env['HTTP_VERSION'] == 'HTTP/1.0' ||
+           STATUS_WITH_NO_ENTITY_BODY.include?(status) ||
+           headers['Content-Length'] ||
+           headers['Transfer-Encoding']
+        headers.delete('Content-Length')
+        headers.delete('Transfer-Encoding')
+      end
+      [status, headers, body]
+    end
+  end
+end