rack-handlers 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b948f198ea6965d85bab269cff573e54a26eff8c
-  data.tar.gz: 7299919d68aeac713af9eac1cd4194b4364da589
+  metadata.gz: e1f85445dc157422692fc335ec353709730565f5
+  data.tar.gz: 7dc71015543eeaf78efd5dbfdd762647d6a11e79
 SHA512:
-  metadata.gz: 9ed4400b2673da4009faad8f9396354288cabbcc98fad1fb58c75e920b5e86c1ac6fb17201464fa3e39401e920c56b78c4fa57b29133f6001b3b8bb417f1137e
-  data.tar.gz: 166cbd8a59431e6589aaa02885a3cada973d65ce796e789784231409abcdfc8b64f2a54519aadfe805b502dbaf8dac300cc7e3aa69e1f0e19be92ba7a1717842
+  metadata.gz: e37e57db9417a09ce77161e88b650e7f66814d2b3a8abc7e85462fc04903b4c2913bf3ee22eda593a4bcbab9fe179c06626e0e63e25e8f44e92a76779ecacda7
+  data.tar.gz: 79bd7d6685695cc3f1fe53760559bde8f7d87a7ee43ff2e9a452a5ba19d206a27868321ef69db0ec3c2e2f8b2d1e8d650cf4c2043c17bb952b8fc416d75977f7

data/CHANGES.md

@@ -1,5 +1,12 @@
 # CHANGES
 
+## rack-handlers 0.7.0 -- 2013-08-22
+
+* Introduced rack-handlers.rb for you that patched `Rack::Handler.default`
+  with the following order: zbatery, rainbows, unicorn, puma, thin, webrick.
+  You would no longer need to require 'rack/handler/rails-server' in order to
+  make `rails s` work for unicorns.
+
 ## rack-handlers 0.6.1 -- 2013-07-11
 
 * Ditto.

data/README.md

@@ -10,7 +10,7 @@ by Lin Jen-Shin ([godfat](http://godfat.org))
 
 ## DESCRIPTION:
 
-Some Rack handlers which are not included in Rack distribution.
+Unicorn family Rack handlers for you. Mostly for `rails s`.
 
 ## REQUIREMENTS:
 
@@ -23,19 +23,30 @@ Some Rack handlers which are not included in Rack distribution.
 
 ## SYNOPSIS:
 
+Put `'rack-handlers'` and your favorite unicorns into Gemfile
+then you could do the followings:
+
     rails s unicorn
     rails s rainbows
     rails s zbatery
 
-Additionally, putting `require 'rack/handler/rails-server'` in `script/rails`
-*before* `require 'rails/commands'` would make `rails s` select the server
-by default with this order: zbatery, rainbows, unicorn, puma, and thin.
+Because requiring `'rack-handlers'` would make `Rack::Handler.default`
+pick the server with the following order:
+
+* zbatery
+* rainbows
+* unicorn
+* puma
+* thin
+* webrick
+
+Thus if you have rainbows installed, `rails s` would launch the server with
+rainbows instead of webrick (the original behaviour).
 
-For zbatery, rainbows, and unicorn, it would also try to load the config
-via `config/zbatery.rb`, or `config/rainbows.rb` depending on which server
-is selected.
+Additionally, it would also try to load the config via `config/zbatery.rb`,
+or `config/rainbows.rb` depending on which server is picked.
 
-For people who likes to invoke `rails s`!
+For people who likes to run `rails s`!
 
 ## CONTRIBUTORS:
 

data/Rakefile

@@ -8,7 +8,7 @@ desc 'Generate gemspec'
 task 'gem:spec' do
   Gemgem.spec = Gemgem.create do |s|
     s.name    = 'rack-handlers'
-    s.version = '0.6.1'
+    s.version = '0.7.0'
 
     %w[rack].each{ |g| s.add_runtime_dependency(g) }
   end

data/lib/rack-handlers.rb

@@ -0,0 +1,36 @@
+
+# Assume you want a more sensible default, or don't require this file
+
+require 'rack/handler'
+
+module Rack::Handler
+  DEFAULT = %w[zbatery rainbows unicorn puma thin webrick]
+
+  def self.default(options = {})
+    # Guess.
+    if ENV.include?("PHP_FCGI_CHILDREN")
+      # We already speak FastCGI
+      options.delete :File
+      options.delete :Port
+
+      Rack::Handler::FastCGI
+    elsif ENV.include?("REQUEST_METHOD")
+      Rack::Handler::CGI
+    else
+      pick DEFAULT # We only change this line
+    end
+  end
+
+  # Copied from rack 1.5.2 for backward compatibility
+  def self.pick(server_names)
+    server_names = Array(server_names)
+    server_names.each do |server_name|
+      begin
+        return get(server_name.to_s)
+      rescue LoadError, NameError
+      end
+    end
+
+    raise LoadError, "Couldn't find handler for: #{server_names.join(', ')}."
+  end unless respond_to?(:pick)
+end

data/lib/rack/handler/rails-server.rb

@@ -1,6 +1,6 @@
 
 if ARGV[0] && ARGV[0] == 'server'[0, ARGV[0].size] && ARGV[1] !~ /^\w+/
-  server = %w[zbatery rainbows unicorn puma thin].find do |s|
+  server = %w[zbatery rainbows unicorn puma thin webrick].find do |s|
     begin
       require s
       true

data/rack-handlers.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = "rack-handlers"
-  s.version = "0.6.1"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2013-07-11"
-  s.description = "Some Rack handlers which are not included in Rack distribution."
+  s.date = "2013-08-22"
+  s.description = "Unicorn family Rack handlers for you. Mostly for `rails s`."
   s.email = ["godfat (XD) godfat.org"]
   s.files = [
   ".gitignore",
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   "CHANGES.md",
   "README.md",
   "Rakefile",
+  "lib/rack-handlers.rb",
   "lib/rack/handler/rails-server.rb",
   "lib/rack/handler/rainbows.rb",
   "lib/rack/handler/unicorn.rb",
@@ -24,8 +25,8 @@ Gem::Specification.new do |s|
   "task/gemgem.rb"]
   s.homepage = "https://github.com/godfat/rack-handlers"
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.4"
-  s.summary = "Some Rack handlers which are not included in Rack distribution."
+  s.rubygems_version = "2.0.6"
+  s.summary = "Unicorn family Rack handlers for you. Mostly for `rails s`."
 
   if s.respond_to? :specification_version then
     s.specification_version = 4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-handlers
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -24,7 +24,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Some Rack handlers which are not included in Rack distribution.
+description: Unicorn family Rack handlers for you. Mostly for `rails s`.
 email:
 - godfat (XD) godfat.org
 executables: []
@@ -36,6 +36,7 @@ files:
 - CHANGES.md
 - README.md
 - Rakefile
+- lib/rack-handlers.rb
 - lib/rack/handler/rails-server.rb
 - lib/rack/handler/rainbows.rb
 - lib/rack/handler/unicorn.rb
@@ -62,8 +63,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.4
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
-summary: Some Rack handlers which are not included in Rack distribution.
+summary: Unicorn family Rack handlers for you. Mostly for `rails s`.
 test_files: []