rainbows 2.1.0 → 3.0.0

data/t/t0023-sendfile-byte-range.sh

@@ -17,7 +17,7 @@ EventMachine|NeverBlock)
 *) ;;
 esac
 
-t_plan 7 "sendfile byte range response for $model"
+t_plan 13 "sendfile byte range response for $model"
 
 t_begin "setup and startup" && {
 	rtmpfiles out err
@@ -28,36 +28,6 @@ t_begin "setup and startup" && {
 	# can't load Rack::Lint here since it clobbers body#to_path
 	rainbows -E none -D large-file-response.ru -c $unicorn_config
 	rainbows_wait_start
-	range_head=-r-365
-	range_tail=-r155-
-	range_mid=-r200-300
 }
 
-t_begin "read random blob sha1s" && {
-	sha1_head=$(curl -sSf $range_head file://random_blob | rsha1)
-	sha1_tail=$(curl -sSf $range_tail file://random_blob | rsha1)
-	sha1_mid=$(curl -sSf $range_mid file://random_blob | rsha1)
-}
-
-t_begin "head range matches" && {
-	sha1="$(curl -sSv $range_head http://$listen/random_blob | rsha1)"
-	test x"$sha1_head" = x"$sha1"
-}
-
-t_begin "tail range matches" && {
-	sha1="$(curl -sS $range_tail http://$listen/random_blob | rsha1)"
-	test x"$sha1_tail" = x"$sha1"
-}
-
-t_begin "mid range matches" && {
-	sha1="$(curl -sS $range_mid http://$listen/random_blob | rsha1)"
-	test x"$sha1_mid" = x"$sha1"
-}
-
-t_begin "shutdown server" && {
-	kill -QUIT $rainbows_pid
-}
-
-t_begin "check stderr" && check_stderr
-
-t_done
+. ./byte-range-common.sh

data/t/t0025-write-on-close.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+. ./test-lib.sh
+t_plan 4 "write-on-close tests for funky response-bodies"
+
+t_begin "setup and start" && {
+	rainbows_setup
+	rainbows -D -c $unicorn_config write-on-close.ru
+	rainbows_wait_start
+}
+
+t_begin "write-on-close response body succeeds" && {
+	test xGoodbye = x"$(curl -sSf --http1.0 http://$listen/)"
+}
+
+t_begin "killing succeeds" && {
+	kill $rainbows_pid
+}
+
+t_begin "check stderr" && {
+	check_stderr
+}
+
+t_done

data/t/t0040-keepalive_requests-setting.sh

@@ -6,11 +6,6 @@ t_begin "setup and start" && {
 	rainbows_setup $model 50 666
 	rtmpfiles curl_out curl_err
 	grep 'keepalive_timeout 666' $unicorn_config
-        ed -s $unicorn_config <<EOF
-,s/listen.*/&, :tcp_nodelay => true/
-w
-EOF
-	grep nodelay $unicorn_config
 	rainbows -E none -D env.ru -c $unicorn_config
 	rainbows_wait_start
 }

data/t/t0402-async-keepalive.sh

@@ -0,0 +1,146 @@
+#!/bin/sh
+DELAY=${DELAY-1}
+. ./test-lib.sh
+case $model in
+Coolio|NeverBlock|EventMachine) ;;
+*)
+	t_info "skipping $T since it's not compatible with $model"
+	exit 0
+	;;
+esac
+
+t_plan 12 "async_chunk_app test for test for $model"
+
+CONFIG_RU=async_chunk_app.ru
+
+t_begin "setup and start" && {
+	rainbows_setup
+	rtmpfiles a b c curl_err expect
+
+	# this does not does not support Rack::Lint
+	rainbows -E none -D $CONFIG_RU -c $unicorn_config
+	rainbows_wait_start
+
+	echo 'Hello World /0' >> $expect
+	echo 'Hello World /1' >> $expect
+	echo 'Hello World /2' >> $expect
+}
+
+t_begin "async.callback supports pipelining" && {
+	rm -f $tmp
+	t0=$(date +%s)
+	(
+		cat $fifo > $tmp &
+		printf 'GET /0 HTTP/1.1\r\nHost: example.com\r\n\r\n'
+		printf 'GET /1 HTTP/1.1\r\nHost: example.com\r\n\r\n'
+		printf 'GET /2 HTTP/1.0\r\nHost: example.com\r\n\r\n'
+		wait
+	) | socat - TCP:$listen > $fifo
+	t1=$(date +%s)
+	elapsed=$(( $t1 - $t0 ))
+	t_info "elapsed=$elapsed $model.$0 ($t_current)"
+	test 3 -eq "$(fgrep 'HTTP/1.1 200 OK' $tmp | wc -l)"
+	test 3 -eq "$(grep '^Hello ' $tmp | wc -l)"
+	test 3 -eq "$(grep 'World ' $tmp | wc -l)"
+}
+
+t_begin "async.callback supports delayed pipelining" && {
+	rm -f $tmp
+	t0=$(date +%s)
+	(
+		cat $fifo > $tmp &
+		printf 'GET /0 HTTP/1.1\r\nHost: example.com\r\n\r\n'
+		sleep 1
+		printf 'GET /1 HTTP/1.1\r\nHost: example.com\r\n\r\n'
+		sleep 1
+		printf 'GET /2 HTTP/1.0\r\nHost: example.com\r\n\r\n'
+		wait
+	) | socat - TCP:$listen > $fifo
+	t1=$(date +%s)
+	elapsed=$(( $t1 - $t0 ))
+	t_info "elapsed=$elapsed $model.$0 ($t_current)"
+	test 3 -eq "$(fgrep 'HTTP/1.1 200 OK' $tmp | wc -l)"
+	test 3 -eq "$(grep '^Hello ' $tmp | wc -l)"
+	test 3 -eq "$(grep 'World ' $tmp | wc -l)"
+}
+
+t_begin "async.callback supports pipelining with delay $DELAY" && {
+	rm -f $tmp
+	t0=$(date +%s)
+	(
+		cat $fifo > $tmp &
+		printf 'GET /0 HTTP/1.1\r\nX-Delay: %d\r\n' $DELAY
+		printf 'Host: example.com\r\n\r\n'
+		printf 'GET /1 HTTP/1.1\r\nX-Delay: %d\r\n' $DELAY
+		printf 'Host: example.com\r\n\r\n'
+		printf 'GET /2 HTTP/1.0\r\nX-Delay: %d\r\n' $DELAY
+		printf 'Host: example.com\r\n\r\n'
+		wait
+	) | socat - TCP:$listen > $fifo
+	t1=$(date +%s)
+	elapsed=$(( $t1 - $t0 ))
+	min=$(( $DELAY * 3 ))
+	t_info "elapsed=$elapsed $model.$0 ($t_current) min=$min"
+	test $elapsed -ge $min
+	test 3 -eq "$(fgrep 'HTTP/1.1 200 OK' $tmp | wc -l)"
+	test 3 -eq "$(grep '^Hello ' $tmp | wc -l)"
+	test 3 -eq "$(grep 'World ' $tmp | wc -l)"
+}
+
+t_begin "async.callback supports keepalive" && {
+	t0=$(date +%s)
+	curl -v --no-buffer -sSf http://$listen/[0-2] > $tmp 2>> $curl_err
+	t1=$(date +%s)
+	elapsed=$(( $t1 - $t0 ))
+	t_info "elapsed=$elapsed $model.$0 ($t_current)"
+	cmp $expect $tmp
+	test 2 -eq "$(fgrep 'Re-using existing connection!' $curl_err |wc -l)"
+	rm -f $curl_err
+}
+
+t_begin "async.callback supports keepalive with delay $DELAY" && {
+	t0=$(date +%s)
+	curl -v --no-buffer -sSf -H "X-Delay: $DELAY" \
+	  http://$listen/[0-2] > $tmp 2>> $curl_err
+	t1=$(date +%s)
+	elapsed=$(( $t1 - $t0 ))
+	min=$(( $DELAY * 3 ))
+	t_info "elapsed=$elapsed $model.$0 ($t_current) min=$min"
+	test $elapsed -ge $min
+	cmp $expect $tmp
+	test 2 -eq "$(fgrep 'Re-using existing connection!' $curl_err |wc -l)"
+	rm -f $curl_err
+}
+
+t_begin "send async requests off in parallel" && {
+	t0=$(date +%s)
+	curl --no-buffer -sSf http://$listen/[0-2] > $a 2>> $curl_err &
+	curl --no-buffer -sSf http://$listen/[0-2] > $b 2>> $curl_err &
+	curl --no-buffer -sSf http://$listen/[0-2] > $c 2>> $curl_err &
+}
+
+t_begin "wait for curl terminations" && {
+	wait
+	t1=$(date +%s)
+	elapsed=$(( $t1 - $t0 ))
+	t_info "elapsed=$elapsed"
+}
+
+t_begin "termination signal sent" && {
+	kill $rainbows_pid
+}
+
+t_begin "no errors from curl" && {
+	test ! -s $curl_err
+}
+
+t_begin "no errors in stderr" && check_stderr
+
+t_begin "responses match expected" && {
+	cmp $expect $a
+	cmp $expect $b
+	cmp $expect $c
+}
+
+t_done
+

data/t/t0500-cramp-streaming.sh

@@ -7,6 +7,8 @@ EventMachine) ;;
 	exit 0
 	;;
 esac
+RUBYLIB=$($RUBY test_isolate_cramp.rb):$RUBYLIB
+export RUBYLIB
 require_check cramp Cramp::VERSION
 
 t_plan 7 "streaming test for Cramp"

data/t/t0501-cramp-rainsocket.sh

@@ -7,6 +7,8 @@ EventMachine) ;;
 	exit 0
 	;;
 esac
+RUBYLIB=$($RUBY test_isolate_cramp.rb):$RUBYLIB
+export RUBYLIB
 require_check cramp Cramp::VERSION
 
 t_plan 4 "WebSocket monkey patch validity test for Cramp"

data/t/t9000-rack-app-pool.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 . ./test-lib.sh
 case $model in
-*RevThread*|Thread*|*Fiber*|Revactor|NeverBlock) ;;
+*CoolioThread*|*RevThread*|Thread*|*Fiber*|Revactor|NeverBlock) ;;
 *)
 	t_info "skipping $T since it's not compatible with $model"
 	exit 0

data/t/test_isolate.rb

@@ -13,28 +13,23 @@ opts = {
 old_out = $stdout.dup
 $stdout.reopen($stderr)
 
+lock = File.open(__FILE__, "rb")
+lock.flock(File::LOCK_EX)
 Isolate.now!(opts) do
-  gem 'rack', '1.1.0' # Cramp currently requires ~> 1.1.0
-  gem 'kgio', '2.1.1'
-  gem 'unicorn', '3.2.1'
-  gem 'kcar', '0.1.1'
+  gem 'unicorn', '3.3.1'
+  gem 'kcar', '0.1.2'
 
   if engine == "ruby"
     gem 'sendfile', '1.0.0' # next Rubinius should support this
-
-    gem 'iobuffer', '0.1.3'
     gem 'cool.io', '1.0.0'
 
     gem 'eventmachine', '0.12.10'
-    gem 'sinatra', '1.0.0'
-    gem 'async_sinatra', '0.2.1'
+    gem 'async_sinatra', '0.4.0'
 
     gem 'neverblock', '0.1.6.2'
-    gem 'cramp', '0.11'
   end
 
   if defined?(::Fiber) && engine == "ruby"
-    gem 'case', '0.5'
     gem 'revactor', '0.1.5'
     gem 'rack-fiber_pool', '0.9.0'
   end

data/t/test_isolate_cramp.rb

@@ -0,0 +1,26 @@
+require 'rubygems'
+require 'isolate'
+engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
+
+path = "tmp/isolate/#{engine}-#{RUBY_VERSION}/cramp"
+opts = {
+  :system => false,
+  # we want "ruby-1.8.7" and not "ruby-1.8", so disable multiruby
+  :multiruby => false,
+  :path => path,
+}
+
+old_out = $stdout.dup
+$stdout.reopen($stderr)
+
+lock = File.open(__FILE__, "rb")
+lock.flock(File::LOCK_EX)
+Isolate.now!(opts) do
+  if engine == "ruby"
+    gem 'cramp', '0.11'
+  end
+end
+
+$stdout.reopen(old_out)
+dirs = Dir["#{path}/gems/*-*/lib"]
+puts dirs.map { |x| File.expand_path(x) }.join(':')

data/t/write-on-close.ru

@@ -0,0 +1,11 @@
+class WriteOnClose
+  def each(&block)
+    @callback = block
+  end
+
+  def close
+    @callback.call "7\r\nGoodbye\r\n0\r\n\r\n"
+  end
+end
+use Rack::ContentType, "text/plain"
+run(lambda { |_| [ 200, [%w(Transfer-Encoding chunked)], WriteOnClose.new ] })

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rainbows
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: false
   segments: 
-  - 2
-  - 1
+  - 3
   - 0
-  version: 2.1.0
+  - 0
+  version: 3.0.0
 platform: ruby
 authors: 
 - Rainbows! hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-29 00:00:00 +00:00
+date: 2011-01-12 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,11 +41,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 3
-        - 2
-        version: "3.2"
+        - 3
+        version: "3.3"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -72,12 +72,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 13
         segments: 
         - 1
-        - 0
         - 1
-        version: 1.0.1
+        version: "1.1"
   type: :development
   version_requirements: *id004
 description: |-
@@ -103,11 +102,10 @@ extra_rdoc_files:
 - lib/rainbows/coolio.rb
 - lib/rainbows/coolio/client.rb
 - lib/rainbows/coolio/core.rb
-- lib/rainbows/coolio/deferred_chunk_response.rb
-- lib/rainbows/coolio/deferred_response.rb
 - lib/rainbows/coolio/heartbeat.rb
 - lib/rainbows/coolio/master.rb
-- lib/rainbows/coolio/sendfile.rb
+- lib/rainbows/coolio/response_chunk_pipe.rb
+- lib/rainbows/coolio/response_pipe.rb
 - lib/rainbows/coolio/server.rb
 - lib/rainbows/coolio/thread_client.rb
 - lib/rainbows/coolio_fiber_spawn.rb
@@ -143,6 +141,7 @@ extra_rdoc_files:
 - lib/rainbows/fiber/queue.rb
 - lib/rainbows/fiber_pool.rb
 - lib/rainbows/fiber_spawn.rb
+- lib/rainbows/http_parser.rb
 - lib/rainbows/http_response.rb
 - lib/rainbows/http_server.rb
 - lib/rainbows/max_body.rb
@@ -155,16 +154,15 @@ extra_rdoc_files:
 - lib/rainbows/queue_pool.rb
 - lib/rainbows/rack_input.rb
 - lib/rainbows/response.rb
-- lib/rainbows/response/body.rb
-- lib/rainbows/response/range.rb
 - lib/rainbows/rev.rb
 - lib/rainbows/rev_fiber_spawn.rb
 - lib/rainbows/rev_thread_pool.rb
 - lib/rainbows/rev_thread_spawn.rb
 - lib/rainbows/revactor.rb
-- lib/rainbows/revactor/body.rb
+- lib/rainbows/revactor/client.rb
+- lib/rainbows/revactor/client/methods.rb
+- lib/rainbows/revactor/client/tee_socket.rb
 - lib/rainbows/revactor/proxy.rb
-- lib/rainbows/revactor/tee_socket.rb
 - lib/rainbows/sendfile.rb
 - lib/rainbows/server_token.rb
 - lib/rainbows/socket_proxy.rb
@@ -173,7 +171,6 @@ extra_rdoc_files:
 - lib/rainbows/thread_pool.rb
 - lib/rainbows/thread_spawn.rb
 - lib/rainbows/thread_timeout.rb
-- lib/rainbows/timed_read.rb
 - lib/rainbows/worker_yield.rb
 - lib/rainbows/writer_thread_pool.rb
 - lib/rainbows/writer_thread_pool/client.rb
@@ -196,6 +193,7 @@ files:
 - .manifest
 - .wrongdoc.yml
 - COPYING
+- ChangeLog
 - DEPLOY
 - Documentation/.gitignore
 - Documentation/GNUmakefile
@@ -203,9 +201,12 @@ files:
 - Documentation/comparison.haml
 - Documentation/rainbows.1.txt
 - FAQ
+- GIT-VERSION-FILE
 - GIT-VERSION-GEN
 - GNUmakefile
+- LATEST
 - LICENSE
+- NEWS
 - README
 - Rakefile
 - SIGNALS
@@ -225,11 +226,10 @@ files:
 - lib/rainbows/coolio.rb
 - lib/rainbows/coolio/client.rb
 - lib/rainbows/coolio/core.rb
-- lib/rainbows/coolio/deferred_chunk_response.rb
-- lib/rainbows/coolio/deferred_response.rb
 - lib/rainbows/coolio/heartbeat.rb
 - lib/rainbows/coolio/master.rb
-- lib/rainbows/coolio/sendfile.rb
+- lib/rainbows/coolio/response_chunk_pipe.rb
+- lib/rainbows/coolio/response_pipe.rb
 - lib/rainbows/coolio/server.rb
 - lib/rainbows/coolio/thread_client.rb
 - lib/rainbows/coolio_fiber_spawn.rb
@@ -265,6 +265,7 @@ files:
 - lib/rainbows/fiber/queue.rb
 - lib/rainbows/fiber_pool.rb
 - lib/rainbows/fiber_spawn.rb
+- lib/rainbows/http_parser.rb
 - lib/rainbows/http_response.rb
 - lib/rainbows/http_server.rb
 - lib/rainbows/max_body.rb
@@ -277,16 +278,15 @@ files:
 - lib/rainbows/queue_pool.rb
 - lib/rainbows/rack_input.rb
 - lib/rainbows/response.rb
-- lib/rainbows/response/body.rb
-- lib/rainbows/response/range.rb
 - lib/rainbows/rev.rb
 - lib/rainbows/rev_fiber_spawn.rb
 - lib/rainbows/rev_thread_pool.rb
 - lib/rainbows/rev_thread_spawn.rb
 - lib/rainbows/revactor.rb
-- lib/rainbows/revactor/body.rb
+- lib/rainbows/revactor/client.rb
+- lib/rainbows/revactor/client/methods.rb
+- lib/rainbows/revactor/client/tee_socket.rb
 - lib/rainbows/revactor/proxy.rb
-- lib/rainbows/revactor/tee_socket.rb
 - lib/rainbows/sendfile.rb
 - lib/rainbows/server_token.rb
 - lib/rainbows/socket_proxy.rb
@@ -295,13 +295,13 @@ files:
 - lib/rainbows/thread_pool.rb
 - lib/rainbows/thread_spawn.rb
 - lib/rainbows/thread_timeout.rb
-- lib/rainbows/timed_read.rb
 - lib/rainbows/worker_yield.rb
 - lib/rainbows/writer_thread_pool.rb
 - lib/rainbows/writer_thread_pool/client.rb
 - lib/rainbows/writer_thread_spawn.rb
 - lib/rainbows/writer_thread_spawn/client.rb
 - local.mk.sample
+- man/man1/rainbows.1
 - rainbows.gemspec
 - setup.rb
 - t/.gitignore
@@ -310,6 +310,7 @@ files:
 - t/app_deferred.ru
 - t/async-response-no-autochunk.ru
 - t/async-response.ru
+- t/async_chunk_app.ru
 - t/async_examples/README
 - t/async_examples/async_app.ru
 - t/async_examples/async_tailer.ru
@@ -318,6 +319,7 @@ files:
 - t/bin/sha1sum.rb
 - t/bin/unused_listen
 - t/bin/utee
+- t/byte-range-common.sh
 - t/close-has-env.ru
 - t/close-pipe-response.ru
 - t/close-pipe-to_path-response.ru
@@ -386,6 +388,7 @@ files:
 - t/t0022-copy_stream-byte-range.sh
 - t/t0023-sendfile-byte-range.sh
 - t/t0024-pipelined-sendfile-response.sh
+- t/t0025-write-on-close.sh
 - t/t0030-fast-pipe-response.sh
 - t/t0031-close-pipe-response.sh
 - t/t0032-close-pipe-to_path-response.sh
@@ -410,6 +413,7 @@ files:
 - t/t0300-async_sinatra.sh
 - t/t0400-em-async-app.sh
 - t/t0401-em-async-tailer.sh
+- t/t0402-async-keepalive.sh
 - t/t0500-cramp-streaming.sh
 - t/t0501-cramp-rainsocket.sh
 - t/t0600-rack-fiber_pool.sh
@@ -426,12 +430,11 @@ files:
 - t/t9101.ru
 - t/test-lib.sh
 - t/test_isolate.rb
+- t/test_isolate_cramp.rb
 - t/times.ru
 - t/worker-follows-master-to-death.ru
+- t/write-on-close.ru
 - vs_Unicorn
-- ChangeLog
-- LATEST
-- NEWS
 has_rdoc: true
 homepage: http://rainbows.rubyforge.org/
 licenses: []