1 files changed, 28 insertions, 15 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 74e50bb032..72e2bbd00e 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -12,9 +12,10 @@ module ActionController
       super
     end
 
-    def render(options)
-      super
-      self.content_type ||= options[:_template].mime_type.to_s
+    def render(*args)
+      args << {} unless args.last.is_a?(Hash)
+      super(*args)
+      self.content_type ||= args.last[:_template].mime_type.to_s
       response_body
     end
 
@@ -24,18 +25,6 @@ module ActionController
     end
 
     private
-      def _prefix
-        controller_path
-      end
-
-      def _determine_template(options)
-        if (options.keys & [:partial, :file, :template, :text, :inline]).empty?
-          options[:_template_name] ||= options[:action]
-          options[:_prefix] = _prefix
-        end
-
-        super
-      end
 
       def _render_partial(options)
         options[:partial] = action_name if options[:partial] == true
@@ -53,5 +42,29 @@ module ActionController
         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.keys & [:partial, :file, :template, :text, :inline]).empty?
+          options[:_template_name] ||= options[:action]
+          options[:_prefix] = _prefix
+        end
+
+        if options[:status]
+          options[:status] = Rack::Utils.status_code(options[:status])
+        end
+
+        options[:update] = blk if block_given?
+        options
+      end
   end
 end