Remove deprecated render_component. Please use the plugin from http:/…

…/github.com/rails/render_component/tree/master
rails · Nov 19, 2008 · 27c03e6 · 27c03e6 · josh · Nov 19, 2008
1 parent 0c9f677
commit 27c03e6
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 325 deletions.
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *2.3.0/3.0*
 
+* Remove deprecated render_component. Please use the plugin from http://github.com/rails/render_component/tree/master [Pratik]
+
 * Fixed RedCloth and BlueCloth shouldn't preload. Instead just assume that they're available if you want to use textilize and markdown and let autoload require them [DHH]
 
 

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
@@ -49,7 +49,6 @@
 require 'action_controller/streaming'
 require 'action_controller/session_management'
 require 'action_controller/http_authentication'
-require 'action_controller/components'
 require 'action_controller/rack_process'
 require 'action_controller/record_identifier'
 require 'action_controller/request_forgery_protection'
@@ -72,7 +71,6 @@
   include ActionController::Streaming
   include ActionController::SessionManagement
   include ActionController::HttpAuthentication::Basic::ControllerMethods
-  include ActionController::Components
   include ActionController::RecordIdentifier
   include ActionController::RequestForgeryProtection
   include ActionController::Translation

diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
@@ -529,7 +529,7 @@ def process(request, response, method = :perform_action, *arguments) #:nodoc:
       end
 
       def send_response
-        response.prepare! unless component_request?
+        response.prepare!
         response
       end
 

diff --git a/actionpack/lib/action_controller/components.rb b/actionpack/lib/action_controller/components.rb
diff --git a/actionpack/lib/action_controller/flash.rb b/actionpack/lib/action_controller/flash.rb
@@ -165,7 +165,7 @@ def flash(refresh = false) #:doc:
         def assign_shortcuts_with_flash(request, response) #:nodoc:
           assign_shortcuts_without_flash(request, response)
           flash(:refresh)
-          flash.sweep if @_session && !component_request?
+          flash.sweep if @_session
         end
     end
   end

diff --git a/actionpack/test/controller/components_test.rb b/actionpack/test/controller/components_test.rb