Merge branch 'master' of git://github.com/rails/rails

4 files changed, 45 insertions, 42 deletions

diff --git a/actionpack/lib/action_dispatch/http/parameters.rb b/actionpack/lib/action_dispatch/http/parameters.rb
index 97546d5f93..68ba3637bf 100644
--- a/actionpack/lib/action_dispatch/http/parameters.rb
+++ b/actionpack/lib/action_dispatch/http/parameters.rb
@@ -29,9 +29,31 @@ module ActionDispatch
       def path_parameters
         @env["action_dispatch.request.path_parameters"] ||= {}
       end
-  
-    private
 
+      def filter_parameters
+        # TODO: Remove dependency on controller
+        if controller = @env['action_controller.instance']
+          controller.send(:filter_parameters, params)
+        else
+          params
+        end
+      end
+
+      def filter_env
+        if controller = @env['action_controller.instance']
+          @env.map do |key, value|
+            if (key =~ /RAW_POST_DATA/i)
+              '[FILTERED]'
+            else
+              controller.send(:filter_parameters, {key => value}).values[0]
+            end
+          end
+        else
+          env
+        end
+      end
+
+    private
       # Convert nested Hashs to HashWithIndifferentAccess
       def normalize_parameters(value)
         case value
diff --git a/actionpack/lib/action_dispatch/middleware/notifications.rb b/actionpack/lib/action_dispatch/middleware/notifications.rb
index c3776d53a8..ce3732b740 100644
--- a/actionpack/lib/action_dispatch/middleware/notifications.rb
+++ b/actionpack/lib/action_dispatch/middleware/notifications.rb
@@ -9,7 +9,9 @@ module ActionDispatch
     end
 
     def call(env)
-      payload = retrieve_payload_from_env(env)
+      request = Request.new(env)
+      payload = retrieve_payload_from_env(request.filter_env)
+
       ActiveSupport::Notifications.instrument("action_dispatch.before_dispatch", payload)
 
       ActiveSupport::Notifications.instrument!("action_dispatch.after_dispatch", payload) do
@@ -21,11 +23,10 @@ module ActionDispatch
       raise exception
     end
 
-  protected
-
-    # Remove any rack related constants from the env, like rack.input.
-    def retrieve_payload_from_env(env)
-      Hash[:env => env.except(*env.keys.select { |k| k.to_s.index("rack.") == 0 })]
-    end
+    protected
+      # Remove any rack related constants from the env, like rack.input.
+      def retrieve_payload_from_env(env)
+        Hash[:env => env.except(*env.keys.select { |k| k.to_s.index("rack.") == 0 })]
+      end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/action_dispatch/routing/route.rb b/actionpack/lib/action_dispatch/routing/route.rb
index f1431e7a37..e6e44d3546 100644
--- a/actionpack/lib/action_dispatch/routing/route.rb
+++ b/actionpack/lib/action_dispatch/routing/route.rb
@@ -44,6 +44,12 @@ module ActionDispatch
       def to_a
         [@app, @conditions, @defaults, @name]
       end
+
+      def to_s
+        @to_s ||= begin
+          "%-6s %-40s %s" % [(verb || :any).to_s.upcase, path, requirements.inspect]
+        end
+      end
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index d4c9df7ebd..2093bb3a0e 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -240,9 +240,9 @@ module ActionDispatch
             path = location.query ? "#{location.path}?#{location.query}" : location.path
           end
 
-          [ControllerCapture, ActionController::Testing].each do |mod|
-            unless ActionController::Base < mod
-              ActionController::Base.class_eval { include mod }
+          unless ActionController::Base < ActionController::Testing
+            ActionController::Base.class_eval do
+              include ActionController::Testing
             end
           end
 
@@ -269,16 +269,15 @@ module ActionDispatch
           end
 
           session = Rack::Test::Session.new(@mock_session)
-
-          @controller = ActionController::Base.capture_instantiation do
-            session.request(path, env)
-          end
+          session.request(path, env)
 
           @request_count += 1
           @request  = ActionDispatch::Request.new(session.last_request.env)
           @response = ActionDispatch::TestResponse.from_response(@mock_session.last_response)
           @html_document = nil
 
+          @controller = session.last_request.env['action_controller.instance']
+
           return response.status
         end
 
@@ -296,31 +295,6 @@ module ActionDispatch
         end
     end
 
-    # A module used to extend ActionController::Base, so that integration tests
-    # can capture the controller used to satisfy a request.
-    module ControllerCapture #:nodoc:
-      extend ActiveSupport::Concern
-
-      included do
-        alias_method_chain :initialize, :capture
-      end
-
-      def initialize_with_capture(*args)
-        initialize_without_capture
-        self.class.last_instantiation ||= self
-      end
-
-      module ClassMethods #:nodoc:
-        mattr_accessor :last_instantiation
-
-        def capture_instantiation
-          self.last_instantiation = nil
-          yield
-          return last_instantiation
-        end
-      end
-    end
-
     module Runner
       def app
         @app