1 files changed, 27 insertions, 41 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 0aae9f8579..f892bd9b91 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -2,68 +2,54 @@ module ActionController
   module Rendering
     extend ActiveSupport::Concern
 
-    included do
-      include AbstractController::Rendering
-      include AbstractController::LocalizedCache
-    end
+    include ActionController::RackDelegation
+    include AbstractController::Rendering
 
-    def process_action(*)
-      self.formats = request.formats.map {|x| x.to_sym}
+    def process(*)
+      self.formats = request.formats.map { |x| x.to_sym }
       super
     end
 
     def render(*args)
-      if response_body
-        raise ::AbstractController::DoubleRenderError
-      end
-
-      args << {} unless args.last.is_a?(Hash)
-      super(*args)
-      self.content_type ||= args.last[:_template].mime_type.to_s
-      response_body
-    end
-
-    def render_to_body(options)
-      _process_options(options)
+      raise ::AbstractController::DoubleRenderError if response_body
       super
+      response_body
     end
 
     private
 
-      def _render_partial(options)
-        options[:partial] = action_name if options[:partial] == true
-        options[:_details] = {:formats => formats}
-        super
+      def _normalize_args(action=nil, options={}, &blk)
+        options = super
+        options[:update] = blk if block_given?
+        options
       end
 
-      def format_for_text
-        formats.first
+      def _normalize_options(options)
+        if options.key?(:text) && options[:text].respond_to?(:to_text)
+          options[:text] = options[:text].to_text
+        end
+
+        if options[:status]
+          options[:status] = Rack::Utils.status_code(options[:status])
+        end
+
+        super
       end
 
       def _process_options(options)
         status, content_type, location = options.values_at(:status, :content_type, :location)
+
         self.status = status if status
         self.content_type = content_type if content_type
         self.headers["Location"] = url_for(location) if location
-      end
 
-      def _normalize_options(action=nil, options={}, &blk)
-        case action
-        when NilClass
-        when Hash
-          options = super(action.delete(:action), action)
-        when String, Symbol
-          options = super
-        else
-          options.merge! :partial => action
-        end
-
-        if options[:status]
-          options[:status] = Rack::Utils.status_code(options[:status])
-        end
+        super
+      end
 
-        options[:update] = blk if block_given?
-        options
+      def _with_template_hook(template)
+        super
+        self.content_type ||= template.mime_type.to_s
       end
+
   end
 end