Store original HTTP method in MethodOverride middleware

2 files changed, 11 insertions, 0 deletions

diff --git a/lib/rack/methodoverride.rb b/lib/rack/methodoverride.rb
index 36a1d57f..0eed29f4 100644
--- a/lib/rack/methodoverride.rb
+++ b/lib/rack/methodoverride.rb
@@ -16,6 +16,7 @@ module Rack
           env[HTTP_METHOD_OVERRIDE_HEADER]
         method = method.to_s.upcase
         if HTTP_METHODS.include?(method)
+          env["rack.methodoverride.original_method"] = env["REQUEST_METHOD"]
           env["REQUEST_METHOD"] = method
         end
       end
diff --git a/test/spec_rack_methodoverride.rb b/test/spec_rack_methodoverride.rb
index ad7ab4e0..57452394 100644
--- a/test/spec_rack_methodoverride.rb
+++ b/test/spec_rack_methodoverride.rb
@@ -47,4 +47,14 @@ context "Rack::MethodOverride" do
 
     req.env["REQUEST_METHOD"].should.equal "POST"
   end
+
+  specify "should store the original REQUEST_METHOD prior to overriding" do
+    env = Rack::MockRequest.env_for("/",
+            :method => "POST",
+            :input  => "_method=options")
+    app = Rack::MethodOverride.new(lambda { |env| Rack::Request.new(env) })
+    req = app.call(env)
+
+    req.env["rack.methodoverride.original_method"].should.equal "POST"
+  end
 end