Ticket #2291: component_flash_fix_2.2322.diff

actionpack/test/controller/request_test.rb

@@ -52 +52 @@
-    assert_nil @request.domain
-  end
-
+  def test_component_call
+    assert !@request.component_call?
+
+    @request.env['HTTP_X_REQUESTED_WITH'] = 'NotComponent'
+    assert !@request.component_call?
+
+    @request.env['HTTP_X_REQUESTED_WITH'] = 'ComponentCall'
+    assert @request.component_call?
+  end
+
-  def test_subdomains
-    @request.host = "www.rubyonrails.org"
-    assert_equal %w( www ), @request.subdomains

actionpack/lib/action_controller/components.rb

@@ -52 +52 @@
-      
-      def request_for_component(options)
-        request_for_component = @request.dup
+        request_for_component.env['HTTP_X_REQUESTED_WITH'] = 'ComponentCall'
-        request_for_component.send(
-          :instance_variable_set, :@parameters, 
-          (options[:params] || {}).merge({ "controller" => options[:controller], "action" => options[:action], "id" => options[:id] }).with_indifferent_access

actionpack/lib/action_controller/request.rb

@@ -86 +86 @@
-    end
-    alias xhr? :xml_http_request?
-
+    # Returns true if the request's "X-Requested-With" header constains 'ComponentCall'
+    def component_call?
+      not /ComponentCall/i.match(env['HTTP_X_REQUESTED_WITH']).nil?
+    end
+
-    # Determine originating IP address.  REMOTE_ADDR is the standard
-    # but will fail if the user is behind a proxy.  HTTP_CLIENT_IP and/or
-    # HTTP_X_FORWARDED_FOR are set by proxies so check for these before

actionpack/lib/action_controller/base.rb

@@ -270 +270 @@
-    # has been rendered through response.body -- useful for <tt>after_filter</tt>s that wants to manipulate the output,
-    # such as a OutputCompressionFilter.
-    attr_accessor :response
-
+
-    # Holds a hash of objects in the session. Accessed like <tt>session[:person]</tt> to get the object tied to the "person"
-    # key. The session will hold any type of object as values, but the key should be a string.
-    attr_accessor :session

actionpack/lib/action_controller/flash.rb

@@ -143 +143 @@
-  
-      # marks flash entries as used and expose the flash to the view 
-      def fire_flash
+        return if @request.component_call?
-        flash.discard
-        @assigns["flash"] = flash
-      end
-  
-      # deletes the flash entries that were not marked for keeping
-      def sweep_flash
+        return if @request.component_call?
-        flash.sweep
-      end  
-  end