Allow anything that responds to render to be given as :template and use find_template instead of find in views.

6 files changed, 11 insertions, 14 deletions

diff --git a/actionpack/lib/abstract_controller/view_paths.rb b/actionpack/lib/abstract_controller/view_paths.rb
index c2a9f6336d..b331eb51b6 100644
--- a/actionpack/lib/abstract_controller/view_paths.rb
+++ b/actionpack/lib/abstract_controller/view_paths.rb
@@ -7,7 +7,7 @@ module AbstractController
       self._view_paths = ActionView::PathSet.new
     end
 
-    delegate :template_exists?, :view_paths, :formats, :formats=,
+    delegate :find_template, :template_exists?, :view_paths, :formats, :formats=,
              :locale, :locale=, :to => :lookup_context
 
     # LookupContext is the object responsible to hold all information required to lookup
@@ -29,10 +29,6 @@ module AbstractController
       lookup_context.view_paths.unshift(*path)
     end
 
-    def template_exists?(*args)
-      lookup_context.exists?(*args)
-    end
-
     module ClassMethods
       # Append a path to the list of view paths for this controller.
       #
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index ffe3060404..f1b1c22075 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -194,7 +194,7 @@ module ActionView #:nodoc:
     attr_accessor :base_path, :assigns, :template_extension, :lookup_context
     attr_internal :captures, :request, :layout, :controller, :template, :config
 
-    delegate :find, :exists?, :formats, :formats=, :locale, :locale=,
+    delegate :find_template, :template_exists?, :formats, :formats=, :locale, :locale=,
              :view_paths, :view_paths=, :with_fallbacks, :update_details, :to => :lookup_context
 
     delegate :request_forgery_protection_token, :template, :params, :session, :cookies, :response, :headers,
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 27ee8b23c9..22ab076b59 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -70,6 +70,7 @@ module ActionView
       def find(name, prefix = nil, partial = false)
         @view_paths.find(name, prefix, partial, details, details_key)
       end
+      alias :find_template :find
 
       def find_all(name, prefix = nil, partial = false)
         @view_paths.find_all(name, prefix, partial, details, details_key)
@@ -78,6 +79,7 @@ module ActionView
       def exists?(name, prefix = nil, partial = false)
         @view_paths.exists?(name, prefix, partial, details, details_key)
       end
+      alias :template_exists? :exists?
 
       # Add fallbacks to the view paths. Useful in cases you are rendering a :file.
       def with_fallbacks
diff --git a/actionpack/lib/action_view/render/layouts.rb b/actionpack/lib/action_view/render/layouts.rb
index 8688de3d18..91a92a833a 100644
--- a/actionpack/lib/action_view/render/layouts.rb
+++ b/actionpack/lib/action_view/render/layouts.rb
@@ -49,10 +49,10 @@ module ActionView
     def _find_layout(layout) #:nodoc:
       begin
         layout =~ /^\// ?
-          with_fallbacks { find(layout) } : find(layout)
+          with_fallbacks { find_template(layout) } : find_template(layout)
       rescue ActionView::MissingTemplate => e
         update_details(:formats => nil) do
-          raise unless exists?(layout)
+          raise unless template_exists?(layout)
         end
       end
     end
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index 950c9d2cd8..0fe2d560f7 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -294,7 +294,7 @@ module ActionView
       def find_template(path=@path)
         return path unless path.is_a?(String)
         prefix = @view.controller_path unless path.include?(?/)
-        @view.find(path, prefix, true)
+        @view.find_template(path, prefix, true)
       end
 
       def partial_path(object = @object)
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 47ea70f5ad..d9ac1f6290 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -59,13 +59,12 @@ module ActionView
         handler = Template.handler_class_for_extension(options[:type] || "erb")
         Template.new(options[:inline], "inline template", handler, {})
       elsif options.key?(:text)
-        Template::Text.new(options[:text], self.formats.try(:first))
-      elsif options.key?(:_template)
-        options[:_template]
+        Template::Text.new(options[:text], formats.try(:first))
       elsif options.key?(:file)
-        with_fallbacks { find(options[:file], options[:prefix]) }
+        with_fallbacks { find_template(options[:file], options[:prefix]) }
       elsif options.key?(:template)
-        find(options[:template], options[:prefix])
+        options[:template].respond_to?(:render) ?
+          options[:template] : find_template(options[:template], options[:prefix])
       end
     end