rack-fiber_pool 0.9.1 → 0.9.2

data/README.md

@@ -4,7 +4,7 @@ rack-fiber_pool
 A Rack middleware component which runs each request in a Fiber from a pool of Fibers.
 
 Requirements
-==============
+============
 
 * Ruby 1.9
 * EventMachine-based server (e.g. thin or rainbows)
@@ -16,9 +16,20 @@ Add a require and use statement to your Rack app.  See example/app.rb for a simp
 which illustrates proper usage.  In general, you want the FiberPool to be inserted as early as
 possible in the middleware pipeline.
 
+Options
+=======
+
+You may fix the pool size, otherwise it defaults to 100:
+
+    use Rack::FiberPool, :size => 25
+
+All exceptions raised by request handled within a fiber are rescued, by default returning a 500 with no body content. You may customize exceptions rescuing by providing a Proc object conforming to Rack's API:
+
+    rescue_exception = Proc.new { |env, exception| [503, {}, exception.message] }
+    use Rack::FiberPool, :rescue_exception => rescue_exception
 
 Rails
-========
+=====
 
 You can see your app's current pipeline of Rack middleware using:
 
@@ -39,7 +50,7 @@ You can explicitly place the FiberPool like so:
 
     ActionController::Dispatcher.middleware.insert_before ActionController::Session::CookieStore, Rack::FiberPool
 
-    
+
 Thanks to
 ==========
 
@@ -47,6 +58,6 @@ Eric Wong - for adding explicit support for Rack::FiberPool to rainbows.
 
 
 Author
-=========
+======
 
-Mike Perham, [Twitter](http://twitter.com/mperham), [Github](http://github.com/mperham), mperham AT gmail.com.
+Mike Perham, [Twitter](http://twitter.com/mperham), [Github](http://github.com/mperham), mperham AT gmail.com.

data/lib/rack/fiber_pool.rb

@@ -2,7 +2,7 @@ require 'fiber_pool'
 
 module Rack
   class FiberPool
-    VERSION = '0.9.1'
+    VERSION = '0.9.2'
     SIZE = 100
 
     # The size of the pool is configurable:
@@ -11,17 +11,22 @@ module Rack
     def initialize(app, options={})
       @app = app
       @fiber_pool = ::FiberPool.new(options[:size] || SIZE)
+      @rescue_exception = options[:rescue_exception] || Proc.new { |env, e| [500, {}, "#{e.class.name}: #{e.message.to_s}"] }
       yield @fiber_pool if block_given?
     end
 
     def call(env)
       call_app = lambda do
-        result = @app.call(env)
-        env['async.callback'].call result
+        begin
+          result = @app.call(env)
+          env['async.callback'].call result
+        rescue ::Exception => e
+          env['async.callback'].call @rescue_exception.call(env, e)
+        end
       end
-      
+
       @fiber_pool.spawn(&call_app)
       throw :async
     end
   end
-end
+end

data/test/test_rack-fiber_pool.rb

@@ -17,7 +17,32 @@ class TestRackFiberPool < MiniTest::Unit::TestCase
     end
     assert_equal [200, {"Content-Type"=>"text/plain"}, ["Hello world!"]], app.result
   end
-  
+
+  def test_exception
+    app = TestBuggyApp.new
+    catch :async do
+      res = Rack::MockRequest.new(Rack::FiberPool.new(app)).get("/")
+    end
+    assert_equal [500, {}, "Exception: I'm buggy! Please fix me."], app.result
+  end
+
+  def test_custom_rescue_exception
+    app = TestBuggyApp.new
+    catch :async do
+      rescue_exception = Proc.new { |env, exception| [503, {}, exception.message] }
+      res = Rack::MockRequest.new(Rack::FiberPool.new(app, :rescue_exception => rescue_exception)).get('/')
+    end
+    assert_equal [503, {}, "I'm buggy! Please fix me."], app.result
+  end
+
+  class TestBuggyApp
+    attr_accessor :result
+    def call(env)
+      env['async.callback'] = proc { |result| @result = result }
+      raise Exception.new("I'm buggy! Please fix me.")
+    end
+  end
+
   class TestApp
     attr_accessor :result
     def call(env)

metadata

@@ -1,32 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-fiber_pool
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 1
-  version: 0.9.1
+version: !ruby/object:Gem::Version
+  version: 0.9.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-14 00:00:00 -08:00
+date: 2011-08-24 00:00:00.000000000 -07:00
 default_executable: 
 dependencies: []
-
 description: Rack middleware to run each request within a Fiber
 email: mperham@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE
 - README.md
 - Rakefile
@@ -38,35 +29,29 @@ files:
 has_rdoc: true
 homepage: http://github.com/mperham/rack-fiber_pool
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Rack middleware to run each request within a Fiber
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_rack-fiber_pool.rb