Ensure the template format is always passed to the template finder. Now we can cleanup some nasty stuff.

1 files changed, 5 insertions, 57 deletions

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 33517ffb7b..8958e61e9d 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -3,7 +3,10 @@ module ActionView #:nodoc:
   end
 
   class MissingTemplate < ActionViewError #:nodoc:
+    attr_reader :path
+
     def initialize(paths, path, template_format = nil)
+      @path = path
       full_template_path = path.include?('.') ? path : "#{path}.erb"
       display_paths = paths.compact.join(":")
       template_type = (path =~ /layouts/i) ? 'layout' : 'template'
@@ -172,17 +175,6 @@ module ActionView #:nodoc:
       delegate :logger, :to => 'ActionController::Base'
     end
 
-    # Templates that are exempt from layouts
-    @@exempt_from_layout = Set.new([/\.rjs$/])
-
-    # Don't render layouts for templates with the given extensions.
-    def self.exempt_from_layout(*extensions)
-      regexps = extensions.collect do |extension|
-        extension.is_a?(Regexp) ? extension : /\.#{Regexp.escape(extension.to_s)}$/
-      end
-      @@exempt_from_layout.merge(regexps)
-    end
-
     @@debug_rjs = false
     ##
     # :singleton-method:
@@ -190,12 +182,6 @@ module ActionView #:nodoc:
     # that alert()s the caught exception (and then re-raises it).
     cattr_accessor :debug_rjs
 
-    @@warn_cache_misses = false
-    ##
-    # :singleton-method:
-    # A warning will be displayed whenever an action results in a cache miss on your view paths.
-    cattr_accessor :warn_cache_misses
-
     attr_internal :request
 
     delegate :request_forgery_protection_token, :template, :params, :session, :cookies, :response, :headers,
@@ -257,7 +243,8 @@ module ActionView #:nodoc:
         if options[:layout]
           _render_with_layout(options, local_assigns, &block)
         elsif options[:file]
-          _pick_template(options[:file]).render_template(self, options[:locals])
+          tempalte = self.view_paths.find_template(options[:file], template_format)
+          tempalte.render_template(self, options[:locals])
         elsif options[:partial]
           render_partial(options)
         elsif options[:inline]
@@ -315,45 +302,6 @@ module ActionView #:nodoc:
         end
       end
 
-      def _pick_template(template_path)
-        return template_path if template_path.respond_to?(:render)
-
-        path = template_path.sub(/^\//, '')
-        if m = path.match(/(.*)\.(\w+)$/)
-          template_file_name, template_file_extension = m[1], m[2]
-        else
-          template_file_name = path
-        end
-
-        # OPTIMIZE: Checks to lookup template in view path
-        if template = self.view_paths.find_template(template_file_name, template_format)
-          template
-        elsif (first_render = @_render_stack.first) && first_render.respond_to?(:format_and_extension) &&
-            (template = self.view_paths["#{template_file_name}.#{first_render.format_and_extension}"])
-          template
-        else
-          template = Template.new(template_path, view_paths)
-
-          if self.class.warn_cache_misses && logger
-            logger.debug "[PERFORMANCE] Rendering a template that was " +
-              "not found in view path. Templates outside the view path are " +
-              "not cached and result in expensive disk operations. Move this " +
-              "file into #{view_paths.join(':')} or add the folder to your " +
-              "view path list"
-          end
-
-          template
-        end
-      end
-      memoize :_pick_template
-
-      def _exempt_from_layout?(template_path) #:nodoc:
-        template = _pick_template(template_path).to_s
-        @@exempt_from_layout.any? { |ext| template =~ ext }
-      rescue ActionView::MissingTemplate
-        return false
-      end
-
       def _render_with_layout(options, local_assigns, &block) #:nodoc:
         partial_layout = options.delete(:layout)