rhebok 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63c847aca36084736ee20d2439a2a868f9cfdf09
-  data.tar.gz: 8a24d9b12665ace439784f2fe5d727da562a17b4
+  metadata.gz: 1dbfe9f10796f8d8851faa4f2a642d8e462fed15
+  data.tar.gz: 865e2b6464856104ad2cba761e2a82c1967a30f6
 SHA512:
-  metadata.gz: e77d3d23898445c851b65b945306c6fe19bdbe6af7332afa8578deca059e11d6204cb33aed2984492d9d05de2d0d682b89e4847bd831d2f958e0800b7bc8c942
-  data.tar.gz: 430031512ebf4a7a2054dabb651266738eef9ac6051a63b646f87a5b075d63a21ccfb263d2c67786091cf6d97cb9149f0f63b191f6062a0302f55571a5dd7f54
+  metadata.gz: 1bdea8576b3aff0eaec288a7e8613e47d8e7efa7a1b54a55f5e84eb5148e9781896b90b559c4e117104d4ea795a36e80a09e7f23c315ff0188fa845f43717216
+  data.tar.gz: a7973f26793013d7c208b6578076738102df80e42e8eaf5c8b6a379416fbb10247564de242f6986de9d749e50332df615d46fb8818b78aaf437dbf62065d9a20

data/Changes

@@ -1,3 +1,7 @@
+0.8.6 2015-01-26T14:53:06Z
+
+    - add some chunked transfer test. refactor around sending chunk
+
 0.8.5 2015-01-26T02:23:08Z
 
     - fix bug. send 0byte mark when using a non raw Array body

data/ext/rhebok/rhebok.c

@@ -637,7 +637,7 @@ static
 VALUE rhe_write_timeout(VALUE self, VALUE fileno, VALUE buf, VALUE len, VALUE offset, VALUE timeout) {
   char* d;
   ssize_t rv;
-
+  buf = rb_String(buf);
   d = RSTRING_PTR(buf);
   rv = _write_timeout(NUM2INT(fileno), NUM2DBL(timeout), &d[NUM2LONG(offset)], NUM2LONG(len));
   if ( rv < 0 ) {
@@ -654,6 +654,7 @@ VALUE rhe_write_all(VALUE self, VALUE fileno, VALUE buf, VALUE offsetv, VALUE ti
   ssize_t rv = 0;
   ssize_t written = 0;
 
+  buf = rb_String(buf);
   d = RSTRING_PTR(buf);
   buf_len = RSTRING_LEN(buf);
 
@@ -671,6 +672,61 @@ VALUE rhe_write_all(VALUE self, VALUE fileno, VALUE buf, VALUE offsetv, VALUE ti
   return rb_int_new(written);
 }
 
+static
+VALUE rhe_write_chunk(VALUE self, VALUE fileno, VALUE buf, VALUE offsetv, VALUE timeout) {
+  ssize_t buf_len;
+  ssize_t rv = 0;
+  ssize_t written = 0;
+  ssize_t vec_offset = 0;
+  int count =0;
+  ssize_t iovcnt = 3;
+  char chunked_header_buf[18];
+
+  buf = rb_String(buf);
+  buf_len = RSTRING_LEN(buf);
+
+  if ( buf_len == 0 ){
+      return rb_int_new(0);
+  }
+
+  {
+    struct iovec v[iovcnt]; // Needs C99 compiler
+    v[0].iov_len = _chunked_header(chunked_header_buf,buf_len);
+    v[0].iov_base = chunked_header_buf;
+    v[1].iov_len = buf_len;
+    v[1].iov_base = RSTRING_PTR(buf);
+    v[2].iov_base = "\r\n";
+    v[2].iov_len = sizeof("\r\n") -1;
+
+    vec_offset = 0;
+    written = 0;
+    while ( iovcnt - vec_offset > 0 ) {
+      count = (iovcnt > IOV_MAX) ? IOV_MAX : iovcnt;
+      rv = _writev_timeout(NUM2INT(fileno), NUM2DBL(timeout),  &v[vec_offset], count - vec_offset, (vec_offset == 0) ? 0 : 1);
+      if ( rv <= 0 ) {
+        // error or disconnected
+        break;
+      }
+      written += rv;
+      while ( rv > 0 ) {
+        if ( (unsigned int)rv >= v[vec_offset].iov_len ) {
+        rv -= v[vec_offset].iov_len;
+          vec_offset++;
+        }
+        else {
+          v[vec_offset].iov_base = (char*)v[vec_offset].iov_base + rv;
+          v[vec_offset].iov_len -= rv;
+          rv = 0;
+        }
+      }
+    }
+  }
+  if ( rv < 0 ) {
+    return Qnil;
+  }
+  return rb_int_new(written);
+}
+
 static
 int header_to_array(VALUE key_obj, VALUE val_obj, VALUE ary) {
   ssize_t val_len;
@@ -963,6 +1019,7 @@ void Init_rhebok()
   rb_define_module_function(cRhebok, "read_timeout", rhe_read_timeout, 5);
   rb_define_module_function(cRhebok, "write_timeout", rhe_write_timeout, 5);
   rb_define_module_function(cRhebok, "write_all", rhe_write_all, 4);
+  rb_define_module_function(cRhebok, "write_chunk", rhe_write_chunk, 4);
   rb_define_module_function(cRhebok, "close_rack", rhe_close, 1);
   rb_define_module_function(cRhebok, "write_response", rhe_write_response, 7);
 }

data/lib/rack/handler/rhebok.rb

@@ -307,7 +307,7 @@ module Rack
                 body.each do |part|
                   ret = nil
                   if use_chunked == 1
-                    ret = ::Rhebok.write_all(connection, part.bytesize.to_s(16) + "\015\012" + part + "\015\012", 0, @options[:Timeout])
+                    ret = ::Rhebok.write_chunk(connection, part, 0, @options[:Timeout])
                   else
                     ret = ::Rhebok.write_all(connection, part, 0, @options[:Timeout])
                   end

data/lib/rhebok/version.rb

@@ -1,3 +1,3 @@
 class Rhebok
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

data/test/spec_06_curl.rb

@@ -4,27 +4,32 @@ require 'timeout'
 require 'socket'
 require 'rack/handler/rhebok'
 
+class ZeroStreamBody
+  def self.each
+    yield "Content"
+    yield ""
+    yield "Again"
+    yield nil
+    yield 0
+  end
+end
+
+class VacantStreamBody
+  def self.each
+  end
+end
+
+
 describe Rhebok do
   extend TestRequest::Helpers
-  begin
-
-    @host = '127.0.0.1'
-    @port = 9202
-    #@app = Rack::Lint.new(TestRequest.new) Lint requires Content-Length or Transfer-Eoncoding
-    @app = TestRequest.new
-    @pid = fork
-    if @pid == nil
-      #child
-      Rack::Handler::Rhebok.run(@app, :Host=>'127.0.0.1', :Port=>9202, :MaxWorkers=>1,
-                                :BeforeFork => proc { ENV["TEST_FOO"] = "FOO" },
-                                :AfterFork => proc { ENV["TEST_BAR"] = "BAR" },
-                                )
-      exit!(true)
-    end
 
+  @host = '127.0.0.1'
+  @port = 9202
+
+  test_rhebok(TestRequest.new, proc {
     command = 'curl  --stderr - -sv -X POST -T "'+File.expand_path('../testrequest.rb', __FILE__)+'" -H "Content-type: text/plain" --header "Transfer-Encoding: chunked" http://127.0.0.1:9202/remove_length'
-    curl_command(command)
-    should "with curl" do
+    curl_yaml(command)
+    should "chunked with curl" do
       @request["Transfer-Encoding"].should.equal "chunked"
       @request["Expect"].should.equal "100-continue"
       @response.key?("Transfer-Encoding").should.equal false
@@ -35,12 +40,77 @@ describe Rhebok do
       @header.key?("HTTP/1.1 100 Continue").should.equal true
     end
 
-  ensure
-    sleep 1
-    if @pid != nil
-      Process.kill(:TERM, @pid)
-      Process.wait()
+    command = 'curl  --stderr - --http1.0 -sv -X POST -T "'+File.expand_path('../testrequest.rb', __FILE__)+'" -H "Content-type: text/plain" --header "Transfer-Encoding: chunked" http://127.0.0.1:9202/remove_length'
+    curl_yaml(command)
+    should "chunked with curl http1.0" do
+      @response.key?("Transfer-Encoding").should.equal false
+      @request.key?("Expect").should.equal false
+      @response["CONTENT_LENGTH"].should.equal File.stat(File.expand_path('../testrequest.rb', __FILE__)).size.to_s
+      @response["test.postdata"].bytesize.should.equal File.stat(File.expand_path('../testrequest.rb', __FILE__)).size
+      @header.key?("Transfer-Encoding").should.equal false
+      @header["Connection"].should.equal "close"
+      @header.key?("HTTP/1.1 100 Continue").should.equal false
+    end
+  })
+
+  test_rhebok( proc {
+    [200,{"Content-Type"=>"text/plain"},["Content","","Again",nil,0]]
+  }, proc {
+    command = 'curl  --stderr - -sv http://127.0.0.1:9202/'
+    curl_request(command)
+    should "zero length with curl" do
+      @body.should.equal "ContentAgain0"
     end
-  end
+    command = 'curl  --stderr - -sv --http1.0 http://127.0.0.1:9202/'
+    curl_request(command)
+    should "zero length with curl http/1.0" do
+      @body.should.equal "ContentAgain0"
+    end
+  })
+
+  test_rhebok( proc {
+    [200,{"Content-Type"=>"text/plain"},[]]
+  }, proc {
+    command = 'curl  --stderr - -sv http://127.0.0.1:9202/'
+    curl_request(command)
+    should "vacant res with curl" do
+      @body.should.equal ""
+    end
+    command = 'curl  --stderr - -sv --http1.0 http://127.0.0.1:9202/'
+    curl_request(command)
+    should "vacant rew with curl http/1.0" do
+      @body.should.equal ""
+    end
+  })
+
+  test_rhebok( proc {
+    [200,{"Content-Type"=>"text/plain"},ZeroStreamBody]
+  }, proc {
+    command = 'curl  --stderr - -sv http://127.0.0.1:9202/'
+    curl_request(command)
+    should "zerostream length with curl" do
+      @body.should.equal "ContentAgain0"
+    end
+    command = 'curl  --stderr - -sv --http1.0 http://127.0.0.1:9202/'
+    curl_request(command)
+    should "zerostream length with curl http/1.0" do
+      @body.should.equal "ContentAgain0"
+    end
+  })
+
+  test_rhebok( proc {
+    [200,{"Content-Type"=>"text/plain"},VacantStreamBody]
+  }, proc {
+    command = 'curl  --stderr - -sv http://127.0.0.1:9202/'
+    curl_request(command)
+    should "vacantstream length with curl" do
+      @body.should.equal ""
+    end
+    command = 'curl  --stderr - -sv --http1.0 http://127.0.0.1:9202/'
+    curl_request(command)
+    should "vacantstream length with curl http/1.0" do
+      @body.should.equal ""
+    end
+  })
 
 end

data/test/testrequest.rb

@@ -78,7 +78,26 @@ class TestRequest
       }
     end
 
-    def curl_command(command)
+    def test_rhebok(app,cb)
+      begin
+        @pid = fork
+        if @pid == nil
+          # child
+          Rack::Handler::Rhebok.run(app, :Host=>@host, :Port=>@port, :MaxWorkers=>1)
+          exit!(true)
+        end
+        cb.call
+      ensure
+        sleep 1
+        if @pid != nil
+          Process.kill(:TERM, @pid)
+          Process.wait()
+        end
+      end
+    end
+
+    
+    def curl_request(command)
       body = ""
       header = {}
       request = {}
@@ -104,9 +123,15 @@ class TestRequest
         end
       }
       @request = request
-      @response = YAML.load(body)
+      @body = body
       @header = header
     end
+
+    def curl_yaml(command)
+      curl_request(command)
+      @response = YAML.load(@body)
+    end
+    
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhebok
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Masahiro Nagano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler