rack-fiber_pool 0.9.0 → 0.9.1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Mike Perham
+Copyright (c) 2011 Mike Perham
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -7,15 +7,46 @@ Requirements
 ==============
 
 * Ruby 1.9
-* thin 1.2.7
+* EventMachine-based server (e.g. thin or rainbows)
 
 Usage
 =======
 
 Add a require and use statement to your Rack app.  See example/app.rb for a simple Sinatra app
-which illustrates proper usage.
+which illustrates proper usage.  In general, you want the FiberPool to be inserted as early as
+possible in the middleware pipeline.
+
+
+Rails
+========
+
+You can see your app's current pipeline of Rack middleware using:
+
+    rake middleware
+
+Add Rack::FiberPool to your middleware in `config/environment.rb`:
+
+    require 'rack/fiber_pool'
+    Rails::Initializer.run do |config|
+      config.middleware.use Rack::FiberPool
+      config.threadsafe!
+    end
+
+If you do experience odd issues, make sure it appears as early in the pipeline as possible.  Anything
+that sets/gets thread local variables (like the Rails' session) or performs I/O should be later in the pipeline.  For example, ActionController::Session::CookieStore does not work if it appears before Rack::FiberPool.
+
+You can explicitly place the FiberPool like so:
+
+    ActionController::Dispatcher.middleware.insert_before ActionController::Session::CookieStore, Rack::FiberPool
+
+    
+Thanks to
+==========
+
+Eric Wong - for adding explicit support for Rack::FiberPool to rainbows.
+
 
 Author
 =========
 
-Mike Perham, http://twitter.com/mperham, 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/Rakefile

@@ -1,52 +1,8 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "rack-fiber_pool"
-    gem.summary = %Q{Rack middleware to run each request within a Fiber}
-    gem.email = "mperham@gmail.com"
-    gem.homepage = "http://github.com/mperham/rack-fiber_pool"
-    gem.authors = ["Mike Perham"]
-    gem.add_development_dependency "shoulda", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
+  test.libs << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "rack-fiber_pool #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/example/app.rb

@@ -1,6 +1,5 @@
 raise LoadError, "Ruby 1.9.1 only" if RUBY_VERSION < '1.9.1'
 
-require 'rubygems'
 require 'sinatra/base'
 require 'fiber'
 

data/lib/fiber_pool.rb

@@ -55,7 +55,7 @@ class FiberPool
             block = @queue.shift
           else
             @busy_fibers.delete(Fiber.current.object_id)
-            @fibers << Fiber.current
+            @fibers.unshift Fiber.current
             block = Fiber.yield
           end
         end

data/lib/rack/fiber_pool.rb

@@ -1,13 +1,16 @@
 require 'fiber_pool'
 
 module Rack
-  # Run each request in a Fiber.  This FiberPool is
-  # provided by em_postgresql.  Should probably split
-  # this dependency out.
   class FiberPool
-    def initialize(app)
+    VERSION = '0.9.1'
+    SIZE = 100
+
+    # The size of the pool is configurable:
+    #
+    #   use Rack::FiberPool, :size => 25
+    def initialize(app, options={})
       @app = app
-      @fiber_pool = ::FiberPool.new
+      @fiber_pool = ::FiberPool.new(options[:size] || SIZE)
       yield @fiber_pool if block_given?
     end
 

data/test/helper.rb

@@ -1,10 +1,4 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'minitest/autorun'
+require 'rack'
+require 'rack/mock'
 require 'rack/fiber_pool'
-
-class Test::Unit::TestCase
-end

data/test/test_rack-fiber_pool.rb

@@ -1,5 +1,28 @@
 require 'helper'
 
-class TestRackFiberPool < Test::Unit::TestCase
-  # An exercise left to the reader
+class TestRackFiberPool < MiniTest::Unit::TestCase
+
+  def test_usage
+    app = TestApp.new
+    catch :async do
+      res = Rack::MockRequest.new(Rack::FiberPool.new(app)).get("/")
+    end
+    assert_equal [200, {"Content-Type"=>"text/plain"}, ["Hello world!"]], app.result
+  end
+
+  def test_size
+    app = TestApp.new
+    catch :async do
+      res = Rack::MockRequest.new(Rack::FiberPool.new(app, :size => 5)).get("/")
+    end
+    assert_equal [200, {"Content-Type"=>"text/plain"}, ["Hello world!"]], app.result
+  end
+  
+  class TestApp
+    attr_accessor :result
+    def call(env)
+      env['async.callback'] = proc { |result| @result = result }
+      [200, {"Content-Type" => "text/plain"}, ["Hello world!"]]
+    end
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Mike Perham
@@ -14,35 +14,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-03 00:00:00 -05:00
+date: 2011-01-14 00:00:00 -08:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
-description: 
+dependencies: []
+
+description: Rack middleware to run each request within a Fiber
 email: mperham@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - example/app.rb
 - lib/fiber_pool.rb
 - lib/rack/fiber_pool.rb
@@ -58,6 +45,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -65,6 +53,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -74,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rack middleware to run each request within a Fiber

data/VERSION

@@ -1 +0,0 @@
-0.9.0