From 17a91a6ef93008170e50c073d1c3794f038a0a33 Mon Sep 17 00:00:00 2001
From: David Lee <davidomundo@gmail.com>
Date: Sat, 7 May 2011 01:19:01 -0700
Subject: Logs should show overridden method; Issue 426

---
 actionpack/test/dispatch/request_test.rb           |  7 ++++
 .../active_support/log_subscriber/test_helper.rb   |  1 +
 railties/lib/rails/application.rb                  |  6 ++--
 railties/test/application/middleware_test.rb       |  4 +--
 railties/test/application/rack/logger_test.rb      | 40 ++++++++++++++++++++++
 5 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 railties/test/application/rack/logger_test.rb

diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index d128006404..25b1b4f745 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -358,6 +358,13 @@ class RequestTest < ActiveSupport::TestCase
     assert request.head?
   end
 
+  test "post masquerading as put" do
+    request = stub_request 'REQUEST_METHOD' => 'PUT', "rack.methodoverride.original_method" => "POST"
+    assert_equal "POST", request.method
+    assert_equal "PUT",  request.request_method
+    assert request.put?
+  end
+
   test "xml format" do
     request = stub_request
     request.expects(:parameters).at_least_once.returns({ :format => 'xml' })
diff --git a/activesupport/lib/active_support/log_subscriber/test_helper.rb b/activesupport/lib/active_support/log_subscriber/test_helper.rb
index 392e33edbc..3e54134c5c 100644
--- a/activesupport/lib/active_support/log_subscriber/test_helper.rb
+++ b/activesupport/lib/active_support/log_subscriber/test_helper.rb
@@ -1,5 +1,6 @@
 require 'active_support/log_subscriber'
 require 'active_support/buffered_logger'
+require 'active_support/notifications'
 
 module ActiveSupport
   class LogSubscriber
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index dd01bbab1d..1e4d25f18c 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -157,7 +157,8 @@ module Rails
 
         middleware.use ::Rack::Lock unless config.allow_concurrency
         middleware.use ::Rack::Runtime
-        middleware.use ::Rails::Rack::Logger
+        middleware.use ::Rack::MethodOverride
+        middleware.use ::Rails::Rack::Logger # must come after Rack::MethodOverride to properly log overridden methods
         middleware.use ::ActionDispatch::ShowExceptions, config.consider_all_requests_local
         middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies
         middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header
@@ -171,7 +172,6 @@ module Rails
         end
 
         middleware.use ::ActionDispatch::ParamsParser
-        middleware.use ::Rack::MethodOverride
         middleware.use ::ActionDispatch::Head
         middleware.use ::Rack::ConditionalGet
         middleware.use ::Rack::ETag, "no-cache"
@@ -199,4 +199,4 @@ module Rails
       require "rails/console/helpers"
     end
   end
-end
\ No newline at end of file
+end
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 01e6c49d9c..fd6dc46271 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -23,7 +23,8 @@ module ApplicationTests
         "Rack::Lock",
         "ActiveSupport::Cache::Strategy::LocalCache",
         "Rack::Runtime",
-        "Rails::Rack::Logger",
+        "Rack::MethodOverride",
+        "Rails::Rack::Logger", # must come after Rack::MethodOverride to properly log overridden methods
         "ActionDispatch::ShowExceptions",
         "ActionDispatch::RemoteIp",
         "Rack::Sendfile",
@@ -36,7 +37,6 @@ module ApplicationTests
         "ActionDispatch::Session::CookieStore",
         "ActionDispatch::Flash",
         "ActionDispatch::ParamsParser",
-        "Rack::MethodOverride",
         "ActionDispatch::Head",
         "Rack::ConditionalGet",
         "Rack::ETag",
diff --git a/railties/test/application/rack/logger_test.rb b/railties/test/application/rack/logger_test.rb
new file mode 100644
index 0000000000..a29244357c
--- /dev/null
+++ b/railties/test/application/rack/logger_test.rb
@@ -0,0 +1,40 @@
+require "isolation/abstract_unit"
+require "active_support/log_subscriber/test_helper"
+require "rack/test"
+
+module ApplicationTests
+  module RackTests
+    class LoggerTest < Test::Unit::TestCase
+      include ActiveSupport::LogSubscriber::TestHelper
+      include Rack::Test::Methods
+
+      def setup
+        build_app
+        require "#{app_path}/config/environment"
+        super
+      end
+
+      def logs
+        @logs ||= @logger.logged(:info)
+      end
+
+      test "logger logs proper HTTP verb and path" do
+        get "/blah"
+        wait
+        assert_match /^Started GET "\/blah"/, logs[0]
+      end
+
+      test "logger logs HTTP verb override" do
+        post "/", {:_method => 'put'}
+        wait
+        assert_match /^Started PUT "\/"/, logs[0]
+      end
+
+      test "logger logs HEAD requests" do
+        post "/", {:_method => 'head'}
+        wait
+        assert_match /^Started HEAD "\/"/, logs[0]
+      end
+    end
+  end
+end
-- 
cgit v1.2.3