Allow cache to be temporarily disabled through lookup_context.

3 files changed, 20 insertions, 5 deletions

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 794fdeae64..0cff888ac1 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -61,6 +61,7 @@ module ActionView
     def initialize(view_paths, details = {})
       @details, @details_key = { :handlers => default_handlers }, nil
       @frozen_formats, @skip_default_locale = false, false
+      @cache = details.key?(:cache) ? details.delete(:cache) : true
 
       self.view_paths = view_paths
       self.registered_detail_setters.each do |key, setter|
@@ -130,10 +131,20 @@ module ActionView
     end
 
     module Details
+      attr_accessor :cache
+
       # Calculate the details key. Remove the handlers from calculation to improve performance
       # since the user cannot modify it explicitly.
       def details_key #:nodoc:
-        @details_key ||= DetailsKey.get(@details)
+        @details_key ||= DetailsKey.get(@details) if @cache
+      end
+
+      # Temporary skip passing the details_key forward.
+      def disable_cache
+        old_value, @cache = @cache, false
+        yield
+      ensure
+        @cache = old_value
       end
 
       # Freeze the current formats in the lookup context. By freezing them, you are guaranteeing
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index c15a0eb568..1268b2f426 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -286,7 +286,9 @@ module ActionView
         pieces  = @virtual_path.split("/")
         name    = pieces.pop
         partial = name.sub!(/^_/, "")
-        view.find_template(name, pieces.join, partial || false, ["unlikely_local_key"])
+        view.lookup_context.disable_cache do
+          view.find_template(name, pieces.join, partial || false, @locals)
+        end
       end
 
       def method_name
diff --git a/actionpack/lib/action_view/testing/resolvers.rb b/actionpack/lib/action_view/testing/resolvers.rb
index 6d82fa0971..ec0db48379 100644
--- a/actionpack/lib/action_view/testing/resolvers.rb
+++ b/actionpack/lib/action_view/testing/resolvers.rb
@@ -16,16 +16,18 @@ module ActionView #:nodoc:
     private
 
     def query(path, exts, formats)
-      query = Regexp.escape(path)
+      query = ""
       exts.each do |ext|
         query << '(' << ext.map {|e| e && Regexp.escape(".#{e}") }.join('|') << '|)'
       end
+      query = /^(#{Regexp.escape(path)})#{query}$/
 
       templates = []
-      @hash.select { |k,v| k =~ /^#{query}$/ }.each do |_path, source|
+      @hash.each do |_path, source|
+        next unless _path =~ query
         handler, format = extract_handler_and_format(_path, formats)
         templates << Template.new(source, _path, handler,
-          :virtual_path => _path, :format => format)
+          :virtual_path => $1, :format => format)
       end
 
       templates.sort_by {|t| -t.identifier.match(/^#{query}$/).captures.reject(&:blank?).size }