Merge pull request #712 from rafaelfranca/rm-fix-rails-server

default_middleware_by_environment should always returns empty array for unknown keys
rack · Jul 18, 2014 · 4b8e2ed · 4b8e2ed
2 parents 4a02ece + f667205
commit 4b8e2ed
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 18 deletions.
diff --git a/lib/rack/server.rb b/lib/rack/server.rb
@@ -213,23 +213,23 @@ def logging_middleware
       end
 
       def default_middleware_by_environment
-        {
-          "deployment" => [
-            [Rack::ContentLength],
-            [Rack::Chunked],
-            logging_middleware,
-            [Rack::TempfileReaper]
-          ],
-          "development" => [
-            [Rack::ContentLength],
-            [Rack::Chunked],
-            logging_middleware,
-            [Rack::ShowExceptions],
-            [Rack::Lint],
-            [Rack::TempfileReaper]
-          ],
-          "none" => []
-        }
+        m = Hash.new {|h,k| h[k] = []}
+        m["deployment"] = [
+          [Rack::ContentLength],
+          [Rack::Chunked],
+          logging_middleware,
+          [Rack::TempfileReaper]
+        ]
+        m["development"] = [
+          [Rack::ContentLength],
+          [Rack::Chunked],
+          logging_middleware,
+          [Rack::ShowExceptions],
+          [Rack::Lint],
+          [Rack::TempfileReaper]
+        ]
+
+        m
       end
 
       # Aliased for backwards-compatibility

diff --git a/test/spec_server.rb b/test/spec_server.rb
@@ -40,6 +40,11 @@ def with_stderr
     server.default_middleware_by_environment['none'].flatten.should.not.include(Rack::ShowExceptions)
   end
 
+  should "always return an empty array for unknown environments" do
+    server = Rack::Server.new(:app => 'foo')
+    server.default_middleware_by_environment['production'].should.equal []
+  end
+
   should "include Rack::TempfileReaper in deployment environment" do
     server = Rack::Server.new(:app => 'foo')
     server.middleware['deployment'].flatten.should.include(Rack::TempfileReaper)
@@ -72,7 +77,7 @@ def with_stderr
     FileUtils.rm pidfile
     server = Rack::Server.new(
       :app         => app,
-      :environment => 'none',
+      :environment => 'production',
       :pid         => pidfile,
       :Port        => TCPServer.open('127.0.0.1', 0){|s| s.addr[1] },
       :Host        => '127.0.0.1',