Finish cleaning up rendering stack from views and move assigns evaluation to controller (so plugins and/or controllers can overwrite just one method).

3 files changed, 14 insertions, 11 deletions

diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index e70a20b2be..2ac199265d 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -261,6 +261,7 @@ module ActionController #:nodoc:
       block.call(collector) if block_given?
 
       if format = request.negotiate_mime(collector.order)
+        self.content_type ||= format.to_s
         self.formats = [format.to_sym]
         collector.response_for(format)
       else
diff --git a/actionpack/lib/action_controller/metal/renderers.rb b/actionpack/lib/action_controller/metal/renderers.rb
index 49d3d6b466..08325b468c 100644
--- a/actionpack/lib/action_controller/metal/renderers.rb
+++ b/actionpack/lib/action_controller/metal/renderers.rb
@@ -87,8 +87,9 @@ module ActionController
     end
 
     add :update do |proc, options|
+      _evaluate_assigns(view_context)
       generator = ActionView::Helpers::PrototypeHelper::JavaScriptGenerator.new(view_context, &proc)
-      self.content_type = Mime::JS
+      self.content_type  = Mime::JS
       self.response_body = generator.to_s
     end
   end
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index f892bd9b91..2167fe9a32 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -5,26 +5,31 @@ module ActionController
     include ActionController::RackDelegation
     include AbstractController::Rendering
 
-    def process(*)
+    # Before processing, set the request formats in current controller formats.
+    def process(*) #:nodoc:
       self.formats = request.formats.map { |x| x.to_sym }
       super
     end
 
-    def render(*args)
+    # Check for double render errors and set the content_type after rendering.
+    def render(*args) #:nodoc:
       raise ::AbstractController::DoubleRenderError if response_body
       super
+      self.content_type ||= Mime[formats.first].to_s
       response_body
     end
 
     private
 
-      def _normalize_args(action=nil, options={}, &blk)
+      # Normalize arguments by catching blocks and setting them on :update.
+      def _normalize_args(action=nil, options={}, &blk) #:nodoc:
         options = super
         options[:update] = blk if block_given?
         options
       end
 
-      def _normalize_options(options)
+      # Normalize both text and status options.
+      def _normalize_options(options) #:nodoc:
         if options.key?(:text) && options[:text].respond_to?(:to_text)
           options[:text] = options[:text].to_text
         end
@@ -36,7 +41,8 @@ module ActionController
         super
       end
 
-      def _process_options(options)
+      # Process controller specific options, as status, content-type and location.
+      def _process_options(options) #:nodoc:
         status, content_type, location = options.values_at(:status, :content_type, :location)
 
         self.status = status if status
@@ -46,10 +52,5 @@ module ActionController
         super
       end
 
-      def _with_template_hook(template)
-        super
-        self.content_type ||= template.mime_type.to_s
-      end
-
   end
 end