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

data/test/jubilee/test_server.rb

@@ -2,6 +2,7 @@ require 'test_helper'
 require 'net/http'
 
 class TestJubileeServer < MiniTest::Unit::TestCase
+  include Helpers
   def setup
     @host, @port = "localhost", 8080
     @server = nil
@@ -13,27 +14,19 @@ class TestJubileeServer < MiniTest::Unit::TestCase
   end
 
   def test_server_embedded
-    config = Jubilee::Configuration.new(rackup: File.expand_path("../../config/config.ru", __FILE__))
-    @server = Jubilee::Server.new(config.options)
-    @server.start
-    sleep 0.5
-    http, body = Net::HTTP.new(@host, @port), nil
-    http.start do
-      req = Net::HTTP::Get.new "/", {}
-      http.request(req) do |resp|
-        body = resp.body
-      end
-    end
-    assert_equal "embedded app", body
+    start_server('config')
+    resp = GET("/")
+    assert_equal "embedded app", resp.body
   end
 
   def test_url_scheme_for_https
     config = Jubilee::Configuration.new(rackup: File.expand_path("../../apps/url_scheme.ru", __FILE__), port: @port, ssl: true,
                                         ssl_keystore: File.join(File.dirname(__FILE__), "../../examples/keystore.jks"),
-                                        ssl_password: "hellojubilee")
+                                        ssl_password: "hellojubilee", instances: 1)
     @server = Jubilee::Server.new(config.options)
-    @server.start
-    sleep 0.5
+    q = Queue.new
+    @server.start{ q << 1 }
+    q.pop
     http = Net::HTTP.new @host, @port
     http.use_ssl = true
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -50,4 +43,45 @@ class TestJubileeServer < MiniTest::Unit::TestCase
     assert_equal "https", body
   end
 
+  def test_proper_rack_input_io
+    start_server('rack_input')
+    fifteen = "1" * 15
+
+    sock = TCPSocket.new @host, @port
+    sock << "PUT / HTTP/1.0\r\nContent-Length: 30\r\n\r\n#{fifteen}"
+    sleep 0.1 # important so that the previous data is sent as a packet
+    sock << fifteen
+
+    while true
+      line = sock.gets
+      break if line == "\r\n"
+    end
+    data = sock.read
+    assert_equal "#{fifteen}#{fifteen}", data
+  end
+
+  def test_huge_return
+    start_server('huge')
+    sock = TCPSocket.new @host, @port
+    sock << "GET / HTTP/1.0\r\n\r\n"
+
+    while true
+      line = sock.gets
+      break if line == "\r\n"
+    end
+
+    out = sock.read
+
+    giant = 2056610
+    assert_equal giant, out.bytesize
+  end
+
+  def start_server(rack, &block)
+    config = Jubilee::Configuration.new(rackup: File.expand_path("../../apps/#{rack}.ru", __FILE__), instances: 1)
+    @server = Jubilee::Server.new(config.options)
+    q = Queue.new
+    @server.start { q << 1 }
+    q.pop
+    sleep 0.1
+  end
 end

data/test/jubilee/test_upload.rb

@@ -1,7 +1,7 @@
 # -*- encoding: binary -*-
 
 require 'test_helper'
-require 'digest/md5'
+require 'digest'
 
 class TestUpload < MiniTest::Unit::TestCase
 
@@ -15,12 +15,12 @@ class TestUpload < MiniTest::Unit::TestCase
 
     # we want random binary data to test 1.9 encoding-aware IO craziness
     @random = File.open('/dev/urandom','rb')
-    sleep 1
   end
 
   def teardown
     @server.stop
     @random.close
+    sleep 0.1
   end
 
   def test_put
@@ -41,10 +41,10 @@ class TestUpload < MiniTest::Unit::TestCase
 
   def test_put_content_md5
     start_server
-    skip "Vert.x doesn't hendle trailing headers"
     md5 = Digest::MD5.new
     sock = TCPSocket.new(@addr, @port)
     sock.syswrite("PUT / HTTP/1.0\r\nTransfer-Encoding: chunked\r\n" \
+                  "X-Expect-Size: #{length}\r\n" \
                   "Trailer: Content-MD5\r\n\r\n")
     @count.times do |i|
       buf = @random.sysread(@bs)
@@ -60,8 +60,10 @@ class TestUpload < MiniTest::Unit::TestCase
     read = sock.read.split(/\r\n/)
     assert_equal "HTTP/1.0 200 OK", read[0]
     resp = eval(read.grep(/^X-Resp: /).first.sub!(/X-Resp: /, ''))
+    assert_equal length, resp[:size]
     assert_equal @sha1.hexdigest, resp[:sha1]
-    assert_equal content_md5, resp[:content_md5]
+    #Vert.x doesn't handle trailing headers
+    #assert_equal content_md5, resp[:content_md5]
   end
 
   def test_put_trickle_small
@@ -113,6 +115,9 @@ class TestUpload < MiniTest::Unit::TestCase
   def test_put_excessive_overwrite_closed
     config = Jubilee::Configuration.new(rackup: File.expand_path("../../apps/overwrite_check.ru", __FILE__))
     @server = Jubilee::Server.new(config.options)
+    q = Queue.new
+    @server.start { q << 1 }
+    q.pop
 
     sock = TCPSocket.new(@addr, @port)
     # buf = ' ' * @bs # Something is wrong with the vertx http compression
@@ -168,59 +173,6 @@ class TestUpload < MiniTest::Unit::TestCase
     assert_match(/sysread_read_byte_match/, resp)
   end
 
-=begin
-  def test_chunked_upload_via_curl
-    # POSIX doesn't require all of these to be present on a system
-    which('curl') or return
-    which('sha1sum') or return
-    which('dd') or return
-
-    start_server
-
-    tmp = Tempfile.new('dd_dest')
-    assert(system("dd", "if=#{@random.path}", "of=#{tmp.path}",
-                        "bs=#{@bs}", "count=#{@count}"),
-           "dd #@random to #{tmp}")
-    sha1_re = %r!\b([a-f0-9]{40})\b!
-    sha1_out = `sha1sum #{tmp.path}`
-    assert $?.success?, 'sha1sum ran OK'
-
-    assert_match(sha1_re, sha1_out)
-    sha1 = sha1_re.match(sha1_out)[1]
-    cmd = "curl -H 'X-Expect-Size: #{tmp.size}' --tcp-nodelay \
-           -isSf --no-buffer -T- " \
-          "http://#@addr:#@port/"
-    resp = Tempfile.new('resp')
-    resp.sync = true
-
-    rd, wr = IO.pipe
-    wr.sync = rd.sync = true
-    pid = fork {
-      STDIN.reopen(rd)
-      rd.close
-      wr.close
-      STDOUT.reopen(resp)
-      exec cmd
-    }
-    rd.close
-
-    tmp.rewind
-    @count.times { |i|
-      wr.write(tmp.read(@bs))
-      sleep(rand / 10) if 0 == i % 8
-    }
-    wr.close
-    pid, status = Process.waitpid2(pid)
-
-    resp.rewind
-    resp = resp.read
-    assert status.success?, 'curl ran OK'
-    assert_match(%r!\b#{sha1}\b!, resp)
-    assert_match(/sysread_read_byte_match/, resp)
-    assert_match(/expect_size_match/, resp)
-  end
-=end
-
   def test_curl_chunked_small
     # POSIX doesn't require all of these to be present on a system
     which('curl') or return
@@ -255,10 +207,11 @@ class TestUpload < MiniTest::Unit::TestCase
   end
 
   def start_server
-    config = Jubilee::Configuration.new(rackup: File.expand_path("../../apps/sha1.ru", __FILE__))
+    config = Jubilee::Configuration.new(rackup: File.expand_path("../../apps/sha1.ru", __FILE__), instances: 1)
     @server = Jubilee::Server.new(config.options)
-    @server.start
+    q = Queue.new
+    @server.start{ q << 1 }
+    q.pop
     sleep 0.1
   end
-
 end

data/test/test_helper.rb

@@ -52,7 +52,7 @@ module Helpers
 
   def GET(path, header={})
     sleep 0.1
-    Net::HTTP.start(@host, @port) { |http|
+    Net::HTTP.start("localhost", 8080) { |http|
       user = header.delete(:user)
       passwd = header.delete(:passwd)
 
@@ -71,7 +71,7 @@ module Helpers
 
   def POST(path, formdata={}, header={})
     sleep 0.1
-    Net::HTTP.start(@host, @port) { |http|
+    Net::HTTP.start("localhost", 8080) { |http|
       user = header.delete(:user)
       passwd = header.delete(:passwd)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jubilee
 version: !ruby/object:Gem::Version
-  version: 2.1.0.Alpha1
+  version: 2.1.0.beta
 platform: java
 authors:
 - Isaiah Peng
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -107,9 +107,11 @@ files:
 - java/src/org/jruby/jubilee/RackEnvironmentHash.java
 - java/src/org/jruby/jubilee/RackInput.java
 - java/src/org/jruby/jubilee/RackResponse.java
+- java/src/org/jruby/jubilee/RubyCallable.java
+- java/src/org/jruby/jubilee/RubyChannel.java
 - java/src/org/jruby/jubilee/RubyHttpServerResponse.java
+- java/src/org/jruby/jubilee/RubyNetSocket.java
 - java/src/org/jruby/jubilee/RubyPlatformManager.java
-- java/src/org/jruby/jubilee/RubyServer.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
@@ -120,11 +122,9 @@ files:
 - lib/jubilee/cli.rb
 - lib/jubilee/configuration.rb
 - lib/jubilee/const.rb
-- lib/jubilee/jubilee.jar
 - lib/jubilee/response.rb
 - lib/jubilee/server.rb
 - lib/jubilee/version.rb
-- lib/rack/chunked.rb
 - lib/rack/handler/jubilee.rb
 - lib/vertx.rb
 - lib/vertx/README.md
@@ -211,20 +211,30 @@ files:
 - spec/integration/basic_sinatra_spec.rb
 - spec/spec_helper.rb
 - test/.ruby-version
+- test/apps/app.rb
 - test/apps/checker.ru
+- test/apps/chunked.ru
+- test/apps/config.ru
+- test/apps/content_length.ru
+- test/apps/hex.ru
+- test/apps/hijack.ru
+- test/apps/hijack2.ru
+- test/apps/huge.ru
 - test/apps/method_override.ru
 - test/apps/overwrite_check.ru
+- test/apps/persistent.rb
+- test/apps/persistent.ru
 - test/apps/rack_crasher.ru
+- test/apps/rack_input.ru
+- test/apps/self_chunked.ru
 - test/apps/sha1.ru
 - test/apps/simple.ru
 - test/apps/url_scheme.ru
-- test/config/app.rb
-- test/config/app.ru
-- test/config/config.ru
 - test/jubilee/test_cli.rb
 - test/jubilee/test_configuration.rb
+- test/jubilee/test_hijack.rb
+- test/jubilee/test_persistent.rb
 - test/jubilee/test_rack_server.rb
-- test/jubilee/test_response.rb
 - test/jubilee/test_server.rb
 - test/jubilee/test_upload.rb
 - test/test_helper.rb

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

@@ -1,159 +0,0 @@
-package org.jruby.jubilee;
-
-import org.jruby.*;
-import org.jruby.anno.JRubyMethod;
-import org.jruby.jubilee.vertx.JubileeVertx;
-import org.jruby.runtime.Block;
-import org.jruby.runtime.ObjectAllocator;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.vertx.java.core.Handler;
-import org.vertx.java.core.Vertx;
-import org.vertx.java.core.http.HttpServer;
-import org.vertx.java.core.http.HttpServerRequest;
-import org.vertx.java.core.json.JsonArray;
-import org.vertx.java.core.json.JsonObject;
-import org.vertx.java.platform.impl.WrappedVertx;
-
-import java.io.IOException;
-
-public class RubyServer extends RubyObject {
-    private Vertx vertx;
-    private HttpServer httpServer;
-    private RackApplication app;
-    private boolean running = false;
-    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");
-        RubyClass serverClass = mJubilee.defineClassUnder("VertxServer", runtime.getObject(), ALLOCATOR);
-        serverClass.defineAnnotatedMethods(RubyServer.class);
-    }
-
-    private static ObjectAllocator ALLOCATOR = new ObjectAllocator() {
-        public IRubyObject allocate(Ruby ruby, RubyClass rubyClass) {
-            return new RubyServer(ruby, rubyClass);
-        }
-    };
-
-    public RubyServer(Ruby ruby, RubyClass rubyClass) {
-        super(ruby, rubyClass);
-    }
-
-    /**
-     * Initialize jubilee server, take a rack application and a configuration hash as parameter
-     *
-     * @param context
-     * @param app
-     * @param config
-     * @param block
-     * @return
-     */
-    @JRubyMethod(name = "initialize")
-    public IRubyObject initialize(ThreadContext context, IRubyObject app, IRubyObject config, Block block) {
-        Ruby runtime = getRuntime();
-        /* configuration keys */
-        RubyHash options = config.convertToHash();
-        RubySymbol port_k = runtime.newSymbol("Port");
-        RubySymbol host_k = runtime.newSymbol("Host");
-        RubySymbol ssl_k = runtime.newSymbol("ssl");
-        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 = 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 (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).asJavaString();
-
-        this.vertx = JubileeVertx.vertx();
-
-        httpServer = vertx.createHttpServer();
-        try {
-            this.app = new RackApplication((WrappedVertx) vertx, context, app, this.ssl);
-            if (block.isGiven()) block.yieldSpecific(context, this);
-        } catch (IOException e) {
-            // noop
-        }
-        return this;
-    }
-
-    /**
-     * Start http server, initialize states
-     *
-     * @param context
-     * @param block
-     * @return
-     */
-    @JRubyMethod(name = "start")
-    public IRubyObject start(final ThreadContext context, final Block block) {
-        httpServer.setAcceptBacklog(10000);
-        httpServer.requestHandler(new Handler<HttpServerRequest>() {
-            public void handle(final HttpServerRequest req) {
-                app.call(req);
-            }
-        });
-        if (eventBusPrefix != null) {
-            JsonObject config = new JsonObject().putString("prefix", eventBusPrefix);
-            JsonArray allowAll = new JsonArray();
-            allowAll.add(new JsonObject());
-            // TODO read inbounds and outbounds from config file
-            vertx.createSockJSServer(httpServer).bridge(config, allowAll, allowAll);
-        }
-        if (ssl) httpServer.setSSL(true).setKeyStorePath(this.keyStorePath)
-                .setKeyStorePassword(this.keyStorePassword);
-        httpServer.listen(this.port, this.host);
-        this.running = true;
-        if (block.isGiven()) block.yieldSpecific(context, this);
-        return this;
-    }
-
-    /**
-     * Set timeout for keep alive connection
-     *
-     * @param context
-     * @param timeout (in TimeUnit.SECONDS)
-     * @return this
-     */
-    @JRubyMethod(name = "persistent_timeout=")
-    public IRubyObject setPersistentTimeout(final ThreadContext context, final IRubyObject timeout) {
-        // FIXME
-        //httpServer.setPersistentTimeout(RubyInteger.fix2long(timeout) * 1000);
-        return this;
-    }
-
-    /**
-     * Stop the HttpServer
-     *
-     * @param context
-     * @param args    if shutdown abruptly
-     * @param block   callback on close
-     * @return
-     */
-    @JRubyMethod(name = {"stop", "close"}, optional = 1)
-    public IRubyObject close(ThreadContext context, IRubyObject[] args, Block block) {
-        if (running) {
-            this.running = false;
-            httpServer.close();
-            // DO I need to stop?
-            //vertx.stop();
-            if (block.isGiven()) block.yieldSpecific(context);
-        } else {
-            getRuntime().getOutputStream().println("jubilee server not running?");
-        }
-        return getRuntime().getNil();
-    }
-}