jubilee 2.1.0.Alpha1-java → 2.1.0.beta-java

data/lib/jubilee.rb

@@ -16,4 +16,3 @@ require 'jubilee/application'
 require 'jubilee/configuration'
 require 'jubilee/response'
 require 'rack/handler/jubilee'
-require 'rack/chunked'

data/lib/jubilee/cli.rb

@@ -40,7 +40,9 @@ module Jubilee
       else
         @config = Jubilee::Configuration.new(@options)
         server = Jubilee::Server.new(@config.options)
-        #server.start
+        server.start do
+          puts "Jubilee is listening on port #{@config.options[:Port]}, press Ctrl+C to quit"
+        end
         thread = Thread.current
         Signal.trap("INT") do
           server.stop
@@ -73,7 +75,7 @@ module Jubilee
           @options[:daemon] = true
         end
         o.on "--dir DIR", "Change to DIR before starting" do |arg|
-          @options[:chdir] = arg
+          @options[:root] = arg
         end
         o.on "-p", "--port PORT", "Define which PORT the server should bind" do |arg|
           @options[:Port] = arg.to_i
@@ -84,7 +86,7 @@ module Jubilee
         o.on "-e", "--environment ENV", "Rack environment" do |arg|
           @options[:environment] = arg
         end
-        o.on "-n", "--instances NUM", "Define how many instances of web servers to run" do |arg|
+        o.on "-n", "--instances NUM", "Define how many instances of web servers to run, default 4" do |arg|
           @options[:instances] = arg.to_i
         end
         o.separator ""

data/lib/jubilee/configuration.rb

@@ -19,7 +19,7 @@ module Jubilee
 
     def reload
       instance_eval(File.read(config_file), config_file) if config_file
-      load_rack_adapter
+      @options[:rackup] = rackup
     end
 
     # sets the host and port jubilee listens to +address+ may be an Integer port 
@@ -34,7 +34,7 @@ module Jubilee
 
     # sets the working directory for jubilee
     def working_directory(path)
-      @options[:chdir] = File.expand_path(path)
+      @options[:root] = File.expand_path(path)
     end
 
     # sets the RACK_ENV environment variable
@@ -104,11 +104,6 @@ module Jubilee
     end
 
     private
-    def load_rack_adapter(&block)
-      Dir.chdir(@options[:chdir]) if @options[:chdir]
-      @options[:rackup] = rackup
-    end
-
     def rackup
       @options[:rackup] || "config.ru"
     end

data/lib/jubilee/const.rb

@@ -1,39 +1,41 @@
 module Jubilee
   module Const
-    JUBILEE_VERSION = Version::STRING
-    HTTP_11 = "HTTP/1.1".freeze
-    HTTP_10 = "HTTP/1.0".freeze
+    JUBILEE_VERSION            = Version::STRING
+    HTTP_11                    = "HTTP/1.1".freeze
+    HTTP_10                    = "HTTP/1.0".freeze
 
-    SERVER_SOFTWARE = "SERVER_SOFTWARE".freeze
-    SERVER_PROTOCOL = "SERVER_PROTOCOL".freeze
-    GATEWAY_INTERFACE = "GATEWAY_INTERFACE".freeze
-    SERVER_NAME = "SERVER_NAME".freeze
-    SERVER_PORT = "SERVER_PORT".freeze
+    SERVER_SOFTWARE            = "SERVER_SOFTWARE".freeze
+    SERVER_PROTOCOL            = "SERVER_PROTOCOL".freeze
+    GATEWAY_INTERFACE          = "GATEWAY_INTERFACE".freeze
+    SERVER_NAME                = "SERVER_NAME".freeze
+    SERVER_PORT                = "SERVER_PORT".freeze
 
-    CGI_VER = "CGI/1.2".freeze
+    CGI_VER                    = "CGI/1.2".freeze
 
-    RACK_INPUT = "rack.input".freeze
+    RACK_INPUT                 = "rack.input".freeze
+    HIJACK                     = "rack.hijack".freeze
 
-    REQUEST_METHOD = 'REQUEST_METHOD'.freeze
-    GET = 'GET'.freeze
-    POST = "POST".freeze
-    REQUEST_PATH = "REQUEST_PATH".freeze
-    REQUEST_URI = "REQUEST_URI".freeze
-    PATH_INFO = "PATH_INFO".freeze
-    QUERY_STRING = "QUERY_STRING".freeze
+    REQUEST_METHOD             = 'REQUEST_METHOD'.freeze
+    GET                        = 'GET'.freeze
+    POST                       = "POST".freeze
+    REQUEST_PATH               = "REQUEST_PATH".freeze
+    REQUEST_URI                = "REQUEST_URI".freeze
+    PATH_INFO                  = "PATH_INFO".freeze
+    QUERY_STRING               = "QUERY_STRING".freeze
 
-    CONTENT_LENGTH = "Content-Length".freeze
-    TRANSFER_ENCODING = "Transfer-Encoding".freeze
+    CONTENT_LENGTH             = "Content-Length".freeze
+    TRANSFER_ENCODING          = "Transfer-Encoding".freeze
 
-    HTTP_VERSION = "HTTP_VERSION".freeze
-    HTTP_HOST = "HTTP_HOST".freeze
-    HTTP_USER_AGENT = "HTTP_USER_AGENT".freeze
-    HTTP_ACCEPT = "HTTP_ACCEPT".freeze
-    HTTP_COOKIE = "HTTP_COOKIE".freeze
-    HTTP_ACCEPT_LANGUAGE = "HTTP_ACCEPT_LANGUAGE".freeze
-    HTTP_ACCEPT_ENCODING = "HTTP_ACCEPT_ENCODING".freeze
-    HTTP_CONNECTION = "HTTP_CONNECTION".freeze
-    NEWLINE = "\n".freeze
+    HTTP_VERSION               = "HTTP_VERSION".freeze
+    HTTP_HOST                  = "HTTP_HOST".freeze
+    HTTP_USER_AGENT            = "HTTP_USER_AGENT".freeze
+    HTTP_ACCEPT                = "HTTP_ACCEPT".freeze
+    HTTP_COOKIE                = "HTTP_COOKIE".freeze
+    HTTP_ACCEPT_LANGUAGE       = "HTTP_ACCEPT_LANGUAGE".freeze
+    HTTP_ACCEPT_ENCODING       = "HTTP_ACCEPT_ENCODING".freeze
+    HTTP_CONNECTION            = "HTTP_CONNECTION".freeze
+    NEWLINE                    = "\n".freeze
+    CHUNKED                    = "chunked".freeze
 
     STATUS_WITH_NO_ENTITY_BODY = Hash[[204,205,304].map{|s| [s, true]}]
   end

data/lib/jubilee/response.rb

@@ -6,8 +6,10 @@ module Jubilee
 
     def initialize(array)
       @status, @headers, @body = *array
-      @status = @status.to_i
-      @content_length = nil
+      @status                  = @status.to_i
+      @content_length          = nil
+      @chunked                 = false
+      @hijack                  = nil
       if @body.kind_of? Array and @body.size == 1
         @content_length = @body[0].bytesize
       end
@@ -18,9 +20,13 @@ module Jubilee
       no_body = @status < 200 || STATUS_WITH_NO_ENTITY_BODY[@status]
       write_status(response)
       write_headers(response)
+      if @hijack
+        @hijack.call(response.net_socket)
+        return
+      end
       if no_body
         response.end
-      else 
+      else
         if @body.respond_to?(:to_path)
           response.send_file(@body.to_path)
         else
@@ -46,7 +52,12 @@ module Jubilee
           @content_length = values
           next
         when TRANSFER_ENCODING
-          @content_length = nil
+          if @chunked = (values == CHUNKED)
+            @content_length = nil
+          end
+        when HIJACK
+          @hijack = values
+          next
         end
         # Multiple values are joined by \n
         response.put_header(key, values)
@@ -62,7 +73,31 @@ module Jubilee
       end
 
       @body.each do |part|
-        response.write(part)
+        if chunk = @chunked ? self.class.strip_term_markers(part) : part
+          response.write(chunk)
+        end
+      end
+    end
+
+    def self.strip_term_markers(chunk)
+      # Heavily copied from jruby-rack's rack/response.rb
+      term = "\r\n"
+      tail = "0#{term}#{term}".freeze
+      term_regex = /^([0-9a-fA-F]+)#{Regexp.escape(term)}(.+)#{Regexp.escape(term)}/mo
+      if chunk == tail
+        # end of chunking, do nothing
+        nil
+      elsif chunk =~ term_regex
+        # format is (size.to_s(16)) term (chunk) term
+        # if the size doesn't match then this is some
+        # output that just happened to match our regex
+        if $1.to_i(16) == $2.bytesize
+          $2
+        else
+          chunk
+        end
+      else
+        chunk
       end
     end
   end

data/lib/jubilee/server.rb

@@ -9,8 +9,5 @@ module Jubilee
       options[:Port] = options[:Port].to_i
       super(options)
     end
-
-    def start
-    end
   end
 end

data/lib/jubilee/version.rb

@@ -3,7 +3,7 @@ module Jubilee
     MAJOR = 2
     MINOR = 1
     PATCH = 0
-    BUILD = "Alpha1"
+    BUILD = "beta"
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

data/spec/apps/rails4/basic/Gemfile

@@ -28,8 +28,6 @@ gem 'turbolinks'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 1.2'
 
-gem 'jubilee'
-
 # Use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.0.0'
 

data/spec/apps/rails4/basic/Gemfile.lock

@@ -40,7 +40,6 @@ GEM
     coffee-script-source (1.6.3)
     erubis (2.7.0)
     execjs (2.0.2)
-    ffi (1.9.3-java)
     hike (1.2.3)
     i18n (0.6.9)
     jbuilder (1.5.3)
@@ -52,9 +51,6 @@ GEM
       thor (>= 0.14, < 2.0)
     json (1.8.1)
     json (1.8.1-java)
-    jubilee (2.0.0-java)
-      rack (>= 1.4.1)
-      spoon (~> 0.0.4)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -84,8 +80,6 @@ GEM
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
-    spoon (0.0.4)
-      ffi
     sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -123,7 +117,6 @@ DEPENDENCIES
   jbuilder (~> 1.2)
   jdbc-sqlite3
   jquery-rails (>= 3.0)
-  jubilee
   rails (= 4.0.1)
   sass-rails (~> 4.0.0)
   therubyrhino

data/spec/integration/basic_rack_spec.rb

@@ -3,10 +3,11 @@ require 'spec_helper'
 feature "basic rack at non-root context" do
 
   before(:all) do
-    configurator = Jubilee::Configuration.new(chdir: "#{apps_dir}/rack/basic")
+    configurator = Jubilee::Configuration.new(root: "#{apps_dir}/rack/basic", instances: 1)
     @server = Jubilee::Server.new(configurator.options)
-    @server.start
-    sleep 0.1
+    q = Queue.new
+    @server.start{ q << 1 }
+    q.pop
   end
 
   after(:all) do

data/spec/integration/basic_rails4_spec.rb

@@ -3,10 +3,11 @@ require 'spec_helper'
 feature 'basic rails4 test' do
 
   before(:all) do
-    configurator = Jubilee::Configuration.new(chdir: "#{apps_dir}/rails4/basic")
+    configurator = Jubilee::Configuration.new(root: "#{apps_dir}/rails4/basic", instances: 1)
     @server = Jubilee::Server.new(configurator.options)
-    @server.start
-    sleep 11
+    q = Queue.new
+    @server.start { q << 1 }
+    q.pop
   end
 
   after(:all) do

data/spec/integration/basic_sinatra_spec.rb

@@ -3,10 +3,11 @@ require 'spec_helper'
 feature "basic sinatra test" do
 
   before(:all) do
-    configurator = Jubilee::Configuration.new(chdir: "#{apps_dir}/sinatra/basic")
+    configurator = Jubilee::Configuration.new(root: "#{apps_dir}/sinatra/basic", instances: 1)
     @server = Jubilee::Server.new(configurator.options)
-    @server.start
-    sleep 1
+    q = Queue.new
+    @server.start{ q << 1 }
+    q.pop
   end
 
   after(:all) do
@@ -71,7 +72,6 @@ feature "basic sinatra test" do
     uri = URI.parse("#{Capybara.app_host}/poster")
     Net::HTTP.start(uri.host, uri.port) do |http|
       100.times do |i|
-        http.request(Net::HTTP::Get.new(uri.request_uri))
         request = Net::HTTP::Post.new(uri.request_uri)
         request.form_data = {'field' => 'nothing'}
         response = http.request(request)

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+$:.unshift(File.expand_path("../../lib", __FILE__))
 require 'jubilee'
 require 'capybara/poltergeist'
 require 'capybara/rspec'

data/test/apps/checker.ru

@@ -1,24 +1,18 @@
-require 'rack'
+require 'rack/lint'
+require 'json'
 class ErrorChecker
   def initialize(app)
     @app = app
-    @exception = nil
-    @env = nil
   end
 
-  attr_reader :exception, :env
-
   def call(env)
     begin
-      @env = env
       return @app.call(env)
     rescue Exception => e
-      @exception = e
-
       [
         500,
         { "X-Exception" => e.message, "X-Exception-Class" => e.class.to_s },
-        ["Error detected"]
+        [JSON.dump({"exception" => e.message})]
       ]
     end
   end
@@ -35,4 +29,5 @@ end
 
 use ServerLint
 use ErrorChecker
-run lambda { |env| [200, { "X-Header" => "Works" }, ["Hello"]] }
+app = lambda { |env| [200, { "X-Header" => "Works" }, [JSON.dump({r:'Hello'})]] }
+run app

data/test/apps/chunked.ru

@@ -0,0 +1,3 @@
+require_relative './persistent'
+
+run Persistent.new(["Hello", "Chunked"])

data/test/apps/content_length.ru

@@ -0,0 +1,3 @@
+require_relative './persistent'
+
+run Persistent.new(["hello", " world"], {"X-Header" => "Works", "Content-Length" => 11})

data/test/apps/hex.ru

@@ -0,0 +1,4 @@
+require_relative './persistent'
+
+str = "This is longer and will be in hex"
+run Persistent.new(["Hello", str])

data/test/apps/hijack.ru

@@ -0,0 +1,7 @@
+app = lambda do |env|
+  io = env["rack.hijack"].call
+  io.write "HTTP/1.1 200\r\n\r\nBLAH\n"
+  [-1, {}, []]
+end
+
+run app

data/test/apps/hijack2.ru

@@ -0,0 +1,7 @@
+# hijack response is not supported by vertx yet
+app = lambda do |env|
+  body = lambda {|io| io.write "BLAH\n"; io.close }
+  [200, {'rack.hijack' => body}, []]
+end
+
+run app

data/test/apps/huge.ru

@@ -0,0 +1,4 @@
+require_relative './app.rb'
+
+giant = "x" * 2056610
+run App.new(giant)

data/test/apps/method_override.ru

@@ -1,2 +1,2 @@
 use Rack::MethodOverride
-run lambda { |env| [200, { "X-Header" => "Works" }, ["Hello"]] }
+run lambda { |env| [200, { "X-Header" => "Works" }, [env["REQUEST_METHOD"]]] }

data/test/apps/overwrite_check.ru

@@ -1,8 +1,9 @@
 hdr = {'Content-Type' => 'text/plain', 'Content-Length' => '0'}
-run lambda do |env|
+app = lambda do |env|
   nr = 0
   while buf = env['rack.input'].read(65536)
     nr += buf.size
   end
-  [ 200, hdr.merge('HTTP-X-Read-Length' => nr.length), [] ]
+  [ 200, hdr.merge('X-Read-Length' => nr.to_s), [] ]
 end
+run app

data/test/apps/persistent.rb

@@ -0,0 +1,14 @@
+class Persistent
+  attr_reader :headers, :body
+
+  def initialize(body = ["Hello"], headers = { "X-Header" => "Works" })
+    @body = body
+    @headers = headers
+  end
+
+
+  def call(env)
+    status = Integer(env['HTTP_X_STATUS'] || 200)
+    [status, headers, body]
+  end
+end

data/test/apps/persistent.ru

@@ -0,0 +1,3 @@
+require_relative './persistent'
+
+run Persistent.new