Ensure controller filters are executed before stuff starts to happen.

4ba334c0 · José Valim · ee4c8962 · 4ba334c0 · 4ba334c0 · 4ba334c0
3 changed file
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -2,7 +2,6 @@ module ActionController
  class Base < Metal
    abstract!

-    include AbstractController::Callbacks
    include AbstractController::Layouts
    include AbstractController::Translation

@@ -23,6 +22,7 @@ class Base < Metal

    # Rails 2.x compatibility
    include ActionController::Compatibility
+    include ActionController::ImplicitRender

    include ActionController::Cookies
    include ActionController::Flash
@@ -36,8 +36,12 @@ class Base < Metal
    # Add instrumentations hooks at the bottom, to ensure they instrument
    # all the methods properly.
    include ActionController::Instrumentation
-    include ImplicitRender

+    # Before callbacks should also be executed the earliest as possible, so
+    # also include them at the bottom.
+    include AbstractController::Callbacks
+
+    # The same with rescue, append it at the end to wrap as much as possible.
    include ActionController::Rescue

    def self.inherited(klass)

--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -6,7 +6,7 @@ module Rendering
    include AbstractController::Rendering

    # Before processing, set the request formats in current controller formats.
-    def process(*) #:nodoc:
+    def process_action(*) #:nodoc:
      self.formats = request.formats.map { |x| x.to_sym }
      super
    end

--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -617,6 +617,15 @@ def rescue_action(e)
    raise
  end

+  before_filter :only => :render_with_filters do
+    request.format = :xml
+  end
+
+  # Ensure that the before filter is executed *before* self.formats is set.
+  def render_with_filters
+    render :action => :formatted_xml_erb
+  end
+
  private

    def determine_layout
@@ -1034,6 +1043,11 @@ def test_render_with_explicit_string_template
    assert_equal "<html>Hello world!</html>", @response.body
  end

+  def test_render_with_filters
+    get :render_with_filters
+    assert_equal "<test>passed formatted xml erb</test>", @response.body
+  end
+
  # :ported:
  def test_double_render
    assert_raise(ActionController::DoubleRenderError) { get :double_render }