Ticket #2291: component_flash_fix.2322.2.diff

actionpack/test/controller/components_test.rb

@@ -25 +25 @@
-    render_text "Yes, ma'am"
-  end
-
+  def set_flash
+    render_component(:controller => 'callee', :action => 'set_flash')
+  end
+
+  def use_flash
+    render_component(:controller => 'callee', :action => 'use_flash')
+  end
+
-  def rescue_action(e) raise end
-end
-
@@ -36 +44 @@
-  def blowing_up
-    render_text "It's game over, man, just game over, man!", "500 Internal Server Error"
-  end
+  
+  def set_flash
+    flash[:notice] = 'My stoney baby'
+    render :text => 'flash is set'
+  end
+  
+  def use_flash
+    render :text => flash[:notice] || 'no flash'
+  end
-
-  def rescue_action(e) raise end
-end
@@ -71 +88 @@
-    get :internal_caller
-    assert_equal "Are you there? Yes, ma'am", @response.body
-  end
+  
+  def test_flash
+    get :set_flash
+    assert_equal 'My stoney baby', flash[:notice]
+    get :use_flash
+    assert_equal 'My stoney baby', @response.body
+    get :use_flash
+    assert_equal 'no flash', @response.body
+  end
-end

actionpack/lib/action_controller/components.rb

@@ -43 +43 @@
-  
-    private
-      def component_response(options, reuse_response = true)
-
+, true
-      end
-    
-      def component_class(options)

actionpack/lib/action_controller/flash.rb

@@ -28 +28 @@
-      super
-      base.before_filter(:fire_flash)
-      base.after_filter(:sweep_flash)
+      class << base
+        def process(request, response, keep_flash = false)
+          ctrl = new
+          if keep_flash
+            class << ctrl
+              private
+                def fire_flash
+                end
+                
+                def sweep_flash
+                end
+            end
+          end
+          ctrl.process(request, response)
+        end
+      end
-    end
-
-    class FlashNow #:nodoc: