rainbows 3.1.0 → 3.2.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v3.1.0.GIT
+DEF_VER=v3.2.0.GIT
 
 LF='
 '

data/README

@@ -86,10 +86,10 @@ fast applications.
 == License
 
 \Rainbows! is copyright 2009,2010 by all contributors (see logs in git).
-It is based on Mongrel and Unicorn and carries the same license.
+It is based on Mongrel 1.1.5 and Unicorn and carries the same license.
 
 Mongrel is copyright 2007 Zed A. Shaw and contributors. It is licensed
-under the Ruby license and the GPL2. See the included LICENSE file for
+under the Ruby (1.8) license and the GPL2. See the included LICENSE file for
 details.
 
 \Rainbows! is 100% Free Software.

data/Static_Files

@@ -9,7 +9,7 @@ to simplify your deployments and only deploy one server?
 
 == {sendfile}[http://rubygems.org/gems/sendfile] RubyGem
 
-To enable the "sendfile" gem, just make sure you have 1.0.0 or later and
+To enable the "sendfile" gem, just make sure you have 1.1.0 or later and
 "require" it in your \Rainbows!/Unicorn config file (not your Rack
 config.ru):
 
@@ -26,7 +26,7 @@ config.ru):
 The sendfile gem is works for all of our concurrency models except
 NeverBlock and EventMachine (see below).
 
-The sendfile gem is less buggy than current (Ruby 1.9.2-rc2)
+The sendfile gem is less buggy than current (Ruby 1.9.2)
 IO.copy_stream and supports FreeBSD and Solaris in addition to Linux.
 This RubyGem also works under Ruby 1.8 (even with threads) and should
 work with rubinius.git, too.
@@ -40,9 +40,9 @@ their Writer* variants use the core IO.copy_stream method under Ruby
 1.9.  IO.copy_stream uses sendfile() under Linux, and a pread()/write()
 loop (implemented in C) on other systems.
 
-IO.copy_stream under Linux with Ruby 1.9.3 (and before) is also
+IO.copy_stream under Linux with Ruby 1.9.2 (and before) is also
 subject to hanging indefinitely when a client disconnected prematurely.
-This issue is fixed in Ruby trunk (July 2010).
+This issue is fixed in Ruby trunk (r28557, July 2010).
 
 \Rainbows! supports IO.copy_stream since v0.93.0
 

data/TODO

@@ -11,7 +11,7 @@ care about.
 * allow _OPTIONAL_ splice(2) with DevFdResponse under Linux
   (splice is very broken under some older kernels)
 
-* use IO#sendfile_nonblock for EventMachine/NeverBlock
+* use IO#trysendfile for EventMachine/NeverBlock
 
 * Open file cache Rack app/middleware (idea from nginx), since sendfile
   (and IO.copy_stream) allows pread(2)-style offsets

data/lib/rainbows/client.rb

@@ -1,5 +1,6 @@
 # -*- encoding: binary -*-
 # :enddoc:
+require "io/wait"
 
 # this class is used for most synchronous concurrency models
 class Rainbows::Client < Kgio::Socket
@@ -8,7 +9,7 @@ class Rainbows::Client < Kgio::Socket
   end
 
   def kgio_wait_readable
-    IO.select([self], nil, nil, Rainbows.keepalive_timeout)
+    wait Rainbows.keepalive_timeout
   end
 
   # used for reading headers (respecting keepalive_timeout)

data/lib/rainbows/const.rb

@@ -2,7 +2,7 @@
 # :enddoc:
 module Rainbows::Const
 
-  RAINBOWS_VERSION = '3.1.0'
+  RAINBOWS_VERSION = '3.2.0'
 
   include Unicorn::Const
 

data/lib/rainbows/coolio/client.rb

@@ -125,11 +125,8 @@ class Rainbows::Coolio::Client < Coolio::IO
     when true then return # #next! will clear this bit
     when nil # fall through
     else
-      begin
-        return stream_file_chunk(@deferred)
-      rescue EOFError # expected at file EOF
-        close_deferred # fall through
-      end
+      return if stream_file_chunk(@deferred)
+      close_deferred # EOF, fall through
     end
 
     case @state
@@ -179,7 +176,7 @@ class Rainbows::Coolio::Client < Coolio::IO
     KATO.delete(self)
   end
 
-  if IO.method_defined?(:sendfile_nonblock)
+  if IO.method_defined?(:trysendfile)
     def defer_file(status, headers, body, alive, io, st)
       if r = sendfile_range(status, headers)
         status, headers, range = r
@@ -192,11 +189,15 @@ class Rainbows::Coolio::Client < Coolio::IO
     end
 
     def stream_file_chunk(sf) # +sf+ is a Rainbows::StreamFile object
-      sf.offset += (n = @_io.sendfile_nonblock(sf, sf.offset, sf.count))
-      0 == (sf.count -= n) and raise EOFError
-      enable_write_watcher
-      rescue Errno::EAGAIN
-        enable_write_watcher
+      case n = @_io.trysendfile(sf, sf.offset, sf.count)
+      when Integer
+        sf.offset += n
+        return if 0 == (sf.count -= n)
+      when :wait_writable
+        return enable_write_watcher
+      else
+        return
+      end while true
     end
   else
     def defer_file(status, headers, body, alive, io, st)
@@ -205,7 +206,7 @@ class Rainbows::Coolio::Client < Coolio::IO
     end
 
     def stream_file_chunk(body)
-      write(body.to_io.sysread(0x4000))
+      buf = body.to_io.read(0x4000) and write(buf)
     end
   end
 

data/lib/rainbows/epoll/client.rb

@@ -183,15 +183,16 @@ module Rainbows::Epoll::Client
 
   # returns +nil+ on EOF, :wait_writable if the client blocks
   def stream_file(sf) # +sf+ is a Rainbows::StreamFile object
-    begin
-      sf.offset += (n = sendfile_nonblock(sf, sf.offset, sf.count))
+    case n = trysendfile(sf, sf.offset, sf.count)
+    when Integer
+      sf.offset += n
       0 == (sf.count -= n) and return sf.close
-    rescue Errno::EAGAIN
-      return :wait_writable
+    else
+      return n # :wait_writable or nil
+    end while true
     rescue
       sf.close
       raise
-    end while true
   end
 
   def defer_file_stream(offset, count, io, body)

data/lib/rainbows/fiber/body.rb

@@ -5,19 +5,20 @@
 # this is meant to be included _after_ Rainbows::Response::Body
 module Rainbows::Fiber::Body # :nodoc:
 
-  # the sendfile 1.0.0+ gem includes IO#sendfile_nonblock
-  if IO.method_defined?(:sendfile_nonblock)
+  # the sendfile 1.1.0+ gem includes IO#trysendfile
+  if IO.method_defined?(:trysendfile)
     def write_body_file(body, range)
       sock, n, body = to_io, nil, body_to_io(body)
       offset, count = range ? range : [ 0, body.stat.size ]
-      begin
-        offset += (n = sock.sendfile_nonblock(body, offset, count))
-      rescue Errno::EAGAIN
+      case n = sock.trysendfile(body, offset, count)
+      when Integer
+        offset += n
+        return if 0 == (count -= n)
+      when :wait_writable
         kgio_wait_writable
-        retry
-      rescue EOFError
-        break
-      end while (count -= n) > 0
+      else # nil
+        return
+      end while true
       ensure
         close_if_private(body)
     end

data/lib/rainbows/response.rb

@@ -67,7 +67,7 @@ module Rainbows::Response
     end
 
     # generic response writer, used for most dynamically-generated responses
-    # and also when IO.copy_stream and/or IO#sendfile_nonblock is unavailable
+    # and also when IO.copy_stream and/or IO#trysendfile is unavailable
     def write_response(status, headers, body, alive)
       write_headers(status, headers, alive)
       write_body_each(body)
@@ -77,7 +77,7 @@ module Rainbows::Response
   end
   include Each
 
-  if IO.method_defined?(:sendfile_nonblock)
+  if IO.method_defined?(:trysendfile)
     module Sendfile
       def write_body_file(body, range)
         io = body_to_io(body)
@@ -90,7 +90,7 @@ module Rainbows::Response
   end
 
   if IO.respond_to?(:copy_stream)
-    unless IO.method_defined?(:sendfile_nonblock)
+    unless IO.method_defined?(:trysendfile)
       module CopyStream
         def write_body_file(body, range)
           range ? IO.copy_stream(body, self, range[1], range[0]) :
@@ -111,7 +111,7 @@ module Rainbows::Response
     alias write_body_stream write_body_each
   end  # ! IO.respond_to?(:copy_stream)
 
-  if IO.method_defined?(:sendfile_nonblock) || IO.respond_to?(:copy_stream)
+  if IO.method_defined?(:trysendfile) || IO.respond_to?(:copy_stream)
     HTTP_RANGE = 'HTTP_RANGE'
     Content_Range = 'Content-Range'.freeze
 
@@ -181,5 +181,5 @@ module Rainbows::Response
       end
     end
     include ToPath
-  end # IO.respond_to?(:copy_stream) || IO.method_defined?(:sendfile_nonblock)
+  end # IO.respond_to?(:copy_stream) || IO.method_defined?(:trysendfile)
 end

data/lib/rainbows/revactor/client/methods.rb

@@ -1,7 +1,7 @@
 # -*- encoding: binary -*-
 # :enddoc:
 module Rainbows::Revactor::Client::Methods
-  if IO.method_defined?(:sendfile_nonblock)
+  if IO.method_defined?(:trysendfile)
     def write_body_file(body, range)
       body, client = body_to_io(body), @client
       sock = @client.instance_variable_get(:@_io)
@@ -9,9 +9,11 @@ module Rainbows::Revactor::Client::Methods
       write_complete = T[:"#{pfx}_write_complete", client]
       closed = T[:"#{pfx}_closed", client]
       offset, count = range ? range : [ 0, body.stat.size ]
-      begin
-        offset += (n = sock.sendfile_nonblock(body, offset, count))
-      rescue Errno::EAGAIN
+      case n = sock.trysendfile(body, offset, count)
+      when Integer
+        offset += n
+        return if 0 == (count -= n)
+      when :wait_writable
         # The @_write_buffer is empty at this point, trigger the
         # on_readable method which in turn triggers on_write_complete
         # even though nothing was written
@@ -21,10 +23,9 @@ module Rainbows::Revactor::Client::Methods
           filter.when(write_complete) {}
           filter.when(closed) { raise Errno::EPIPE }
         end
-        retry
-      rescue EOFError
-        break
-      end while (count -= n) > 0
+      else # nil
+        return
+      end while true
       ensure
         close_if_private(body)
     end

data/lib/rainbows/stream_file.rb

@@ -1,7 +1,7 @@
 # -*- encoding: binary -*-
 # :enddoc:
 
-# Used to keep track of file offsets in IO#sendfile_nonblock + evented
+# Used to keep track of file offsets in IO#trysendfile + evented
 # models.  We always maintain our own file offsets in userspace because
 # because sendfile() implementations offer pread()-like idempotency for
 # concurrency (multiple clients can read the same underlying file handle).

data/lib/rainbows/writer_thread_pool/client.rb

@@ -18,7 +18,7 @@ class Rainbows::WriterThreadPool::Client < Struct.new(:to_io, :q)
       }
     end
 
-    if IO.respond_to?(:copy_stream) || IO.method_defined?(:sendfile_nonblock)
+    if IO.respond_to?(:copy_stream) || IO.method_defined?(:trysendfile)
       def write_response(status, headers, body, alive)
         if body.respond_to?(:close)
           write_response_close(status, headers, body, alive)

data/lib/rainbows/writer_thread_spawn/client.rb

@@ -21,7 +21,7 @@ class Rainbows::WriterThreadSpawn::Client < Struct.new(:to_io, :q, :thr)
       }
     end
 
-    if IO.respond_to?(:copy_stream) || IO.method_defined?(:sendfile_nonblock)
+    if IO.respond_to?(:copy_stream) || IO.method_defined?(:trysendfile)
       def write_response(status, headers, body, alive)
         self.q ||= queue_writer
         if body.respond_to?(:close)

data/rainbows.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<rack>, ['~> 1.1'])
 
   # we need Unicorn for the HTTP parser and process management
-  s.add_dependency(%q<unicorn>, ["~> 3.4"])
+  s.add_dependency(%q<unicorn>, ["~> 3.5"])
   s.add_development_dependency(%q<isolate>, "~> 3.0.0")
   s.add_development_dependency(%q<wrongdoc>, "~> 1.5")
 

data/t/cramp/rainsocket.ru

@@ -1,11 +1,11 @@
 # based on examples/rainsocket.ru git://github.com/lifo/cramp
 # Rack::Lint does not like async + EM stuff, so disable it:
 #\ -E deployment
-require 'cramp/controller'
+require 'cramp'
 
-Cramp::Controller::Websocket.backend = :rainbows
+Cramp::Websocket.backend = :rainbows
 
-class WelcomeController < Cramp::Controller::Websocket
+class WelcomeController < Cramp::Websocket
   periodic_timer :send_hello_world, :every => 2
   on_data :received_data
 

data/t/cramp/streaming.ru

@@ -4,9 +4,9 @@
 # Rack::Lint does not like async + EM stuff, so disable it:
 #\ -E deployment
 
-require 'cramp/controller'
+require 'cramp'
 
-class StreamController < Cramp::Controller::Action
+class StreamController < Cramp::Action
   periodic_timer :send_data, :every => 1
   periodic_timer :check_limit, :every => 2
 

data/t/test_isolate.rb

@@ -16,16 +16,17 @@ $stdout.reopen($stderr)
 lock = File.open(__FILE__, "rb")
 lock.flock(File::LOCK_EX)
 Isolate.now!(opts) do
-  gem 'unicorn', '3.4.0'
-  gem 'kcar', '0.1.2'
+  gem 'unicorn', '3.5.0'
+  gem 'kcar', '0.2.0'
   gem 'raindrops', '0.4.1'
 
   if engine == "ruby"
-    gem 'sendfile', '1.0.0' # next Rubinius should support this
+    gem 'sendfile', '1.1.0' # next Rubinius should support this
     gem 'cool.io', '1.0.0'
 
     gem 'eventmachine', '0.12.10'
-    gem 'async_sinatra', '0.4.0'
+    gem 'sinatra', '1.2.0'
+    gem 'async_sinatra', '0.5.0'
 
     gem 'neverblock', '0.1.6.2'
   end
@@ -35,7 +36,7 @@ Isolate.now!(opts) do
     gem 'rack-fiber_pool', '0.9.1'
   end
 
-  gem 'sleepy_penguin', '1.4.0' if RUBY_PLATFORM =~ /linux/
+  gem 'sleepy_penguin', '2.0.0' if RUBY_PLATFORM =~ /linux/
 end
 
 $stdout.reopen(old_out)

data/t/test_isolate_cramp.rb

@@ -17,7 +17,7 @@ lock = File.open(__FILE__, "rb")
 lock.flock(File::LOCK_EX)
 Isolate.now!(opts) do
   if engine == "ruby"
-    gem 'cramp', '0.11'
+    gem 'cramp', '0.12'
   end
 end
 

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rainbows
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
-  version: 3.1.0
+  segments: 
+  - 3
+  - 2
+  - 0
+  version: 3.2.0
 platform: ruby
 authors: 
 - Rainbows! hackers
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 +00:00
+date: 2011-03-15 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +26,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
         version: "1.1"
   type: :runtime
   version_requirements: *id001
@@ -32,7 +41,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "3.4"
+        hash: 13
+        segments: 
+        - 3
+        - 5
+        version: "3.5"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -43,6 +56,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :development
   version_requirements: *id003
@@ -54,6 +72,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 5
         version: "1.5"
   type: :development
   version_requirements: *id004
@@ -463,17 +485,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rainbows
-rubygems_version: 1.5.0
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: "- Unicorn for sleepy apps and slow clients"