summary refs log tree commit
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-04-14 09:08:09 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-04-14 09:08:09 -0700
commitc145b9a05cf6a7c9a5493246d5077eead80470a8 (patch)
tree6b2d36c7545351ab62b04a5927c8c11ff95a0585
parent5e072182014fccb03d9bfd8f36234df8c4bdd5d4 (diff)
downloadrack-c145b9a05cf6a7c9a5493246d5077eead80470a8.tar.gz
Revert "Add handlers for Unicorn, Rainbows! and Zbatery"
This reverts commit dff8e34f43c2897062d5b252406398ced2d360a8.

The author of unicorn / rainbows! / zbatery has asked us to revert this
commit.  So I am.  See here:

  http://groups.google.com/group/rack-devel/browse_thread/thread/23f73707363e0918
-rw-r--r--README6
-rw-r--r--lib/rack/handler.rb6
-rw-r--r--lib/rack/handler/rainbows.rb12
-rw-r--r--lib/rack/handler/unicorn.rb30
-rw-r--r--lib/rack/handler/zbatery.rb9
5 files changed, 3 insertions, 60 deletions
diff --git a/README b/README
index 2ad05b38..3393ad12 100644
--- a/README
+++ b/README
@@ -21,15 +21,15 @@ The included *handlers* connect all kinds of web servers to Rack:
 * SCGI
 * LiteSpeed
 * Thin
-* Rainbows!
-* Unicorn
-* Zbatery
 
 These web servers include Rack handlers in their distributions:
 * Ebb
 * Fuzed
 * Glassfish v3
 * Phusion Passenger (which is mod_rack for Apache and for nginx)
+* Rainbows!
+* Unicorn
+* Zbatery
 
 Any valid Rack app will run the same on all these handlers, without
 changing anything.
diff --git a/lib/rack/handler.rb b/lib/rack/handler.rb
index dd18a656..8223f4ff 100644
--- a/lib/rack/handler.rb
+++ b/lib/rack/handler.rb
@@ -74,9 +74,6 @@ module Rack
     autoload :LSWS, "rack/handler/lsws"
     autoload :SCGI, "rack/handler/scgi"
     autoload :Thin, "rack/handler/thin"
-    autoload :Unicorn, "rack/handler/unicorn"
-    autoload :Rainbows, "rack/handler/rainbows"
-    autoload :Zbatery, "rack/handler/zbatery"
 
     register 'cgi', 'Rack::Handler::CGI'
     register 'fastcgi', 'Rack::Handler::FastCGI'
@@ -87,8 +84,5 @@ module Rack
     register 'lsws', 'Rack::Handler::LSWS'
     register 'scgi', 'Rack::Handler::SCGI'
     register 'thin', 'Rack::Handler::Thin'
-    register 'unicorn', 'Rack::Handler::Unicorn'
-    register 'rainbows', 'Rack::Handler::Rainbows'
-    register 'zbatery', 'Rack::Handler::Zbatery'
   end
 end
diff --git a/lib/rack/handler/rainbows.rb b/lib/rack/handler/rainbows.rb
deleted file mode 100644
index 322ca706..00000000
--- a/lib/rack/handler/rainbows.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'rack/handler/unicorn'
-require 'rainbows'
-
-module Rack
-  module Handler
-    class Rainbows < Unicorn
-      def self.server
-        ::Rainbows
-      end
-    end
-  end
-end
diff --git a/lib/rack/handler/unicorn.rb b/lib/rack/handler/unicorn.rb
deleted file mode 100644
index 70e0a857..00000000
--- a/lib/rack/handler/unicorn.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'unicorn'
-
-module Rack
-  module Handler
-    class Unicorn
-      def self.server
-        ::Unicorn
-      end
-
-      def self.valid_option?(key, value)
-        ::Unicorn::Configurator::DEFAULTS.keys.include?(key) or
-        ::Unicorn::Configurator.method_defined? key
-      end
-
-      def self.run(app, options = {})
-        options[:listeners] ||= begin
-          host = options.delete(:Host) || '0.0.0.0'
-          port = options.delete(:Port) || 8080
-          ["#{host}:#{port}"]
-        end
-
-        options.delete_if { |k, v| not valid_option?(k, v) }
-
-        s = server::HttpServer.new app, options
-        yield s if block_given?
-        s.start.join
-      end
-    end
-  end
-end
diff --git a/lib/rack/handler/zbatery.rb b/lib/rack/handler/zbatery.rb
deleted file mode 100644
index da247eca..00000000
--- a/lib/rack/handler/zbatery.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'rack/handler/rainbows'
-require 'zbatery'
-
-module Rack
-  module Handler
-    class Zbatery < Rainbows
-    end
-  end
-end