jubilee 1.1.0.rc1 → 1.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f1455eb032eecbf34eb4c64b1f7c2275bf6a712
-  data.tar.gz: f69992911c71786735f250f043720d56fc8ea825
+  metadata.gz: 38c7ff14a0556dd319caf62874e40fc69a1380c2
+  data.tar.gz: 3022b1786dda6ac2a2cef500e5f128996225159c
 SHA512:
-  metadata.gz: ff9925abef232206f19275b9e04f4438c5ce568b74cb4962acd5b368c6f798d514bd8d37cdfdae961504ec82b69d8cbfe19fae256fed5a65e7283287a954915c
-  data.tar.gz: c6b4adf8cd09c53d3cf79c8d4cef04a2c420ee81f10b0ef7d106029a9d838a70d6275f0329b0fe4372b5a2f3ee20b7e922f44f9fc81a33dfc687e707782bfe3c
+  metadata.gz: ccf4e457c07dd123ed41aed249cb3a8c632b789dfeb5c9a937fc52274dc8b857cba2e89e05dee742e0937cf312ef019dba25d6ba931675dc98c8baaf7c8aa82d
+  data.tar.gz: 2dffccc0cd663b3254123e7b3b0f81c89acea0e1ffbd0c9a9af2335218f768ab4688c1835a22d480319f747d4900285d4b44050ef5c5581c55e9750e7860344e

data/README.md

@@ -46,7 +46,7 @@ Setup
 -----
 
 If you use bundler, you might want to add `jubilee` to your Gemfile,
-this is required if you want use rails http stream
+this is also required if you want use rails http streaming,
 
     $ jubilee
 

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

@@ -15,7 +15,6 @@ import org.jruby.util.ByteList;
 import org.jruby.util.StringSupport;
 import org.vertx.java.core.http.HttpServerRequest;
 
-import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -26,7 +25,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
  */
 public class RubyIORackInput extends RubyObject implements RackInput {
     private Encoding BINARY = ASCIIEncoding.INSTANCE;
-    private HttpServerRequest request;
     private int len;
     private boolean chunked;
     private ByteBuf buf;
@@ -52,7 +50,6 @@ public class RubyIORackInput extends RubyObject implements RackInput {
 
     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;
         this.len = this.chunked ? 0 : Integer.parseInt(hdr);
@@ -71,16 +68,19 @@ public class RubyIORackInput extends RubyObject implements RackInput {
     @Override
     @JRubyMethod
     public IRubyObject gets(ThreadContext context) {
-      RubyString line = RubyString.newEmptyString(getRuntime(), BINARY);
-        if (isEOF())
-            return getRuntime().getNil();
+      Ruby runtime = context.runtime;
+      RubyString line = RubyString.newEmptyString(context.runtime, BINARY);
+
+        if (isEOF()) return runtime.getNil();
+
         int lineEnd = -1;
-        while (lineEnd == -1 && !isEOF())
+        while (lineEnd == -1 && !eof.get()) {
             lineEnd = buf.indexOf(buf.readerIndex(), buf.writerIndex(), Const.EOL);
+        }
 
         // No line break found, read all
         if (lineEnd == -1)
-            return readAll(line);
+            return readAll(runtime, line);
 
         int readLength = lineEnd - buf.readerIndex();
         byte[] dst = new byte[readLength + 1];
@@ -105,22 +105,23 @@ public class RubyIORackInput extends RubyObject implements RackInput {
     @Override
     @JRubyMethod(optional = 2)
     public IRubyObject read(ThreadContext context, IRubyObject[] args) {
-        RubyString dst = RubyString.newStringNoCopy(getRuntime(), new ByteList(), BINARY, StringSupport.CR_VALID);
+        Ruby runtime = context.runtime;
+        RubyString dst = RubyString.newStringNoCopy(context.runtime, new ByteList(), BINARY, StringSupport.CR_VALID);
         if (isEOF())
-            return getRuntime().getNil();
+            return runtime.getNil();
         int length;
         switch (args.length) {
             case 0:
-                return readAll(dst);
+                return readAll(runtime, dst);
             case 1:
-                length = RubyInteger.num2int(args[0]);
+                length = RubyNumeric.num2int(args[0]);
                 break;
             default:
-                length = RubyInteger.num2int(args[0]);
+                length = RubyNumeric.num2int(args[0]);
                 dst = (RubyString) args[1];
         }
         if (length < 0)
-            getRuntime().newArgumentError("Negative length " + length + " given");
+            runtime.newArgumentError("Negative length " + length + " given");
         byte[] buffer = new byte[length];
         int toRead = length;
         while (toRead > 0 && !isEOF()) {
@@ -146,7 +147,7 @@ public class RubyIORackInput extends RubyObject implements RackInput {
         while (!(str = gets(context)).isNil()) {
             block.yield(context, str);
         }
-        return getRuntime().getNil();
+        return context.runtime.getNil();
     }
 
     /**
@@ -162,7 +163,7 @@ public class RubyIORackInput extends RubyObject implements RackInput {
     @JRubyMethod
     public IRubyObject rewind(ThreadContext context) {
         buf.readerIndex(0);
-        return getRuntime().getNil();
+        return context.runtime.getNil();
     }
 
     /**
@@ -172,7 +173,7 @@ public class RubyIORackInput extends RubyObject implements RackInput {
     @JRubyMethod
     public IRubyObject close(ThreadContext context) {
         buf.clear();
-        return getRuntime().getNil();
+        return context.runtime.getNil();
     }
 
     private int readableBytes() {
@@ -188,14 +189,13 @@ public class RubyIORackInput extends RubyObject implements RackInput {
         return buf.readableBytes() == 0 && eof.get();
     }
 
-    private IRubyObject readAll(RubyString dst) {
-        buf.readerIndex(0);
+    private IRubyObject readAll(Ruby runtime, RubyString dst) {
         while(!eof.get())
           ; // wait until all data received
         int length = this.chunked ? buf.readableBytes() : Math.min(this.len, buf.readableBytes());
         byte[] data = new byte[length];
         buf.readBytes(data);
         dst.cat(data);
-        return dst.isEmpty() ? getRuntime().getNil() : dst;
+        return dst.isEmpty() ? runtime.getNil() : dst;
     }
 }

data/lib/jubilee/version.rb

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

data/spec/apps/rails4/basic/app/assets/javascripts/application.js

@@ -10,7 +10,3 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require jquery
-//= require jquery_ujs
-//= require turbolinks
-//= require_tree .

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jubilee
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc1
+  version: 1.1.0.rc2
 platform: ruby
 authors:
 - Isaiah Peng