1 files changed, 30 insertions, 18 deletions

diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb
index d04c00fd40..f3abc6d533 100644
--- a/actionpack/lib/action_view/renderer/template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -1,16 +1,13 @@
 require 'active_support/core_ext/object/try'
-require 'active_support/core_ext/array/wrap'
 
 module ActionView
   class TemplateRenderer < AbstractRenderer #:nodoc:
     def render(context, options)
-      @view = context
-
-      wrap_formats(options[:template] || options[:file]) do
-        template = determine_template(options)
-        freeze_formats(template.formats, true)
-        render_template(template, options[:layout], options[:locals])
-      end
+      @view    = context
+      @details = extract_details(options)
+      template = determine_template(options)
+      freeze_formats(template.formats, true)
+      render_template(template, options[:layout], options[:locals])
     end
 
     # Determine the template to be rendered using the given options.
@@ -20,13 +17,15 @@ module ActionView
       if options.key?(:text)
         Template::Text.new(options[:text], formats.try(:first))
       elsif options.key?(:file)
-        with_fallbacks { find_template(options[:file], nil, false, keys) }
+        with_fallbacks { find_template(options[:file], nil, false, keys, @details) }
       elsif options.key?(:inline)
         handler = Template.handler_for_extension(options[:type] || "erb")
         Template.new(options[:inline], "inline template", handler, :locals => keys)
       elsif options.key?(:template)
         options[:template].respond_to?(:render) ?
-          options[:template] : find_template(options[:template], options[:prefixes], false, keys)
+          options[:template] : find_template(options[:template], options[:prefixes], false, keys, @details)
+      else
+        raise ArgumentError, "You invoked render but did not give any of :partial, :template, :inline, :file or :text option."
       end
     end
 
@@ -59,15 +58,28 @@ module ActionView
     # context object. If no layout is found, it checks if at least a layout with
     # the given name exists across all details before raising the error.
     def find_layout(layout, keys)
-      begin
-        with_layout_format do
-          layout =~ /^\// ?
-            with_fallbacks { find_template(layout, nil, false, keys) } : find_template(layout, nil, false, keys)
-        end
-      rescue ActionView::MissingTemplate
-        update_details(:formats => nil) do
-          raise unless template_exists?(layout)
+      with_layout_format { resolve_layout(layout, keys) }
+    end
+
+    def resolve_layout(layout, keys)
+      case layout
+      when String
+        begin
+          if layout =~ /^\//
+            with_fallbacks { find_template(layout, nil, false, keys, @details) }
+          else
+            find_template(layout, nil, false, keys, @details)
+          end
+        rescue ActionView::MissingTemplate
+          all_details = @details.merge(:formats => @lookup_context.default_formats)
+          raise unless template_exists?(layout, nil, false, keys, all_details)
         end
+      when Proc
+        resolve_layout(layout.call, keys)
+      when FalseClass
+        nil
+      else
+        layout
       end
     end
   end