1 files changed, 24 insertions, 28 deletions
diff --git a/actionpack/lib/action_controller/new_base/renderer.rb b/actionpack/lib/action_controller/new_base/renderer.rb
index d7ea9ec4a5..41e3dfbe23 100644
--- a/actionpack/lib/action_controller/new_base/renderer.rb
+++ b/actionpack/lib/action_controller/new_base/renderer.rb
@@ -3,48 +3,44 @@ module ActionController
     extend ActiveSupport::DependencyModule
 
     depends_on AbstractController::Renderer
-
+    
     def initialize(*)
       self.formats = [:html]
       super
     end
-
-    def render(action, options = {})
-      # TODO: Move this into #render_to_body
-      if action.is_a?(Hash)
-        options, action = action, nil
-      else
-        options.merge! :action => action
-      end
-
+    
+    def render(options = {})
       _process_options(options)
-
-      self.response_body = render_to_body(options)
+      
+      super(options)
     end
 
     def render_to_body(options)
-      unless options.is_a?(Hash)
-        options = {:action => options}
-      end
-
       if options.key?(:text)
         options[:_template] = ActionView::TextTemplate.new(_text(options))
         template = nil
+      elsif options.key?(:inline)
+        handler = ActionView::Template.handler_class_for_extension(options[:type] || "erb")
+        template = ActionView::Template.new(options[:inline], "inline #{options[:inline].inspect}", handler, {})
+        options[:_template] = template
       elsif options.key?(:template)
         options[:_template_name] = options[:template]
-      elsif options.key?(:action)
-        options[:_template_name] = options[:action].to_s
-        options[:_prefix] = _prefix
+      else
+        options[:_template_name] = (options[:action] || action_name).to_s
+        options[:_prefix] = _prefix 
       end
-
-      super(options)
+      
+      ret = super(options)
+      response.content_type ||= options[:_template].mime_type
+      ret
     end
-
+    
   private
+  
     def _prefix
       controller_path
-    end
-
+    end  
+  
     def _text(options)
       text = options[:text]
 
@@ -53,11 +49,11 @@ module ActionController
       else text.to_s
       end
     end
-
+  
     def _process_options(options)
-      if status = options[:status]
-        response.status = status.to_i
-      end
+      status, content_type = options.values_at(:status, :content_type)
+      response.status = status.to_i if status
+      response.content_type = content_type if content_type
     end
   end
 end