From b281a6a5b2137548501ef590379d7af5f6955d2d Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 13 Jan 2009 17:26:29 -0600
Subject: Use Rack's MethodOverride lib [#1699 state:resolved]

---
 actionpack/lib/action_controller/middlewares.rb    |  2 +-
 .../lib/action_controller/verb_piggybacking.rb     | 24 ----------------------
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 actionpack/lib/action_controller/verb_piggybacking.rb

(limited to 'actionpack/lib/action_controller')

diff --git a/actionpack/lib/action_controller/middlewares.rb b/actionpack/lib/action_controller/middlewares.rb
index 914750bc0c..0f038b8856 100644
--- a/actionpack/lib/action_controller/middlewares.rb
+++ b/actionpack/lib/action_controller/middlewares.rb
@@ -19,4 +19,4 @@ use "ActiveRecord::QueryCache", :if => lambda { defined?(ActiveRecord) }
 end
 
 use ActionController::RewindableInput
-use ActionController::VerbPiggybacking
+use Rack::MethodOverride
diff --git a/actionpack/lib/action_controller/verb_piggybacking.rb b/actionpack/lib/action_controller/verb_piggybacking.rb
deleted file mode 100644
index 86cde304a0..0000000000
--- a/actionpack/lib/action_controller/verb_piggybacking.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-module ActionController
-  # TODO: Use Rack::MethodOverride when it is released
-  class VerbPiggybacking
-    HTTP_METHODS = %w(GET HEAD PUT POST DELETE OPTIONS)
-
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      if env["REQUEST_METHOD"] == "POST"
-        req = Request.new(env)
-        if method = (req.parameters[:_method] || env["HTTP_X_HTTP_METHOD_OVERRIDE"])
-          method = method.to_s.upcase
-          if HTTP_METHODS.include?(method)
-            env["REQUEST_METHOD"] = method
-          end
-        end
-      end
-
-      @app.call(env)
-    end
-  end
-end
-- 
cgit v1.2.3