make pass through error code configurable [#2817 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>

4 files changed, 41 insertions, 5 deletions

diff --git a/railties/lib/rails/rack/metal.rb b/railties/lib/rails/rack/metal.rb
index b031be29af..6c0732f732 100644
--- a/railties/lib/rails/rack/metal.rb
+++ b/railties/lib/rails/rack/metal.rb
@@ -11,6 +11,9 @@ module Rails
       cattr_accessor :metal_paths
       self.metal_paths = ["#{Rails.root}/app/metal"]
       cattr_accessor :requested_metals
+      
+      cattr_accessor :pass_through_on
+      self.pass_through_on = 404
 
       def self.metals
         matcher = /#{Regexp.escape('/app/metal/')}(.*)\.rb\Z/
@@ -36,6 +39,9 @@ module Rails
 
       def initialize(app)
         @app = app
+        @pass_through_on = {}
+        [*self.class.pass_through_on].each { |status| @pass_through_on[status] = true }
+        
         @metals = ActiveSupport::OrderedHash.new
         self.class.metals.each { |app| @metals[app] = true }
         freeze
@@ -44,7 +50,7 @@ module Rails
       def call(env)
         @metals.keys.each do |app|
           result = app.call(env)
-          return result unless result[0].to_i == 404
+          return result unless @pass_through_on.include?(result[0].to_i)
         end
         @app.call(env)
       end
diff --git a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb
index 2d373ce422..4ca4ddd447 100644
--- a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb
+++ b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb
@@ -1,5 +1,5 @@
-class MetalA < Rails::Rack::Metal
+class MetalA
   def self.call(env)
-    [200, { "Content-Type" => "text/html"}, ["Hi"]]
+    [404, { "Content-Type" => "text/html"}, ["Metal A"]]
   end
 end
diff --git a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb
index a8bbf3fd60..80e69fe0b0 100644
--- a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb
+++ b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb
@@ -1,5 +1,5 @@
-class MetalB < Rails::Rack::Metal
+class MetalB
   def self.call(env)
-    [200, { "Content-Type" => "text/html"}, ["Hi"]]
+    [200, { "Content-Type" => "text/html"}, ["Metal B"]]
   end
 end
diff --git a/railties/test/metal_test.rb b/railties/test/metal_test.rb
index d3d231132b..c79a819a76 100644
--- a/railties/test/metal_test.rb
+++ b/railties/test/metal_test.rb
@@ -55,8 +55,38 @@ class MetalTest < Test::Unit::TestCase
       assert_equal(["FooMetal", "EngineMetal"], found_metals_as_string_array)
     end
   end
+  
+  def test_metal_default_pass_through_on_404
+    use_appdir("multiplemetals") do
+      result = Rails::Rack::Metal.new(app).call({})
+      assert_equal 200, result.first
+      assert_equal ["Metal B"], result.last
+    end
+  end
+  
+  def test_metal_pass_through_on_417
+    use_appdir("multiplemetals") do
+      Rails::Rack::Metal.pass_through_on = 417
+      result = Rails::Rack::Metal.new(app).call({})
+      assert_equal 404, result.first
+      assert_equal ["Metal A"], result.last
+    end
+  end
+  
+  def test_metal_pass_through_on_404_and_200
+    use_appdir("multiplemetals") do
+      Rails::Rack::Metal.pass_through_on = [404, 200]
+      result = Rails::Rack::Metal.new(app).call({})
+      assert_equal 402, result.first
+      assert_equal ["End of the Line"], result.last
+    end
+  end
 
   private
+  
+  def app
+    lambda{[402,{},["End of the Line"]]}
+  end
 
   def use_appdir(root)
     dir = "#{File.dirname(__FILE__)}/fixtures/metal/#{root}"