0
@@ -332,6 +332,9 @@ module ActionView #:nodoc:
0
       end
0
     end
0
 
0
+    extend ActiveSupport::Memoizable
0
+    memoize :pick_template
0
+
0
     private
0
       # Renders the template present at <tt>template_path</tt>. The hash in <tt>local_assigns</tt>
0
       # is made available as local variables.

0
@@ -102,6 +102,8 @@ module ActionView
0
   #
0
   # As you can see, the <tt>:locals</tt> hash is shared between both the partial and its layout.
0
   module Partials
0
+    extend ActiveSupport::Memoizable
0
+
0
     private
0
       def render_partial(partial_path, object_assigns = nil, local_assigns = {}) #:nodoc:
0
         local_assigns ||= {}
0
@@ -129,14 +131,12 @@ module ActionView
0
 
0
         local_assigns = local_assigns ? local_assigns.clone : {}
0
         spacer = partial_spacer_template ? render(:partial => partial_spacer_template) : ''
0
-        _paths = {}
0
-        _templates = {}
0
 
0
         index = 0
0
         collection.map do |object|
0
           _partial_path ||= partial_path || ActionController::RecordIdentifier.partial_path(object, controller.class.controller_path)
0
-          path = _paths[_partial_path] ||= find_partial_path(_partial_path)
0
-          template = _templates[path] ||= pick_template(path)
0
+          path = find_partial_path(_partial_path)
0
+          template = pick_template(path)
0
           local_assigns[template.counter_name] = index
0
           result = template.render_partial(self, object, local_assigns, as)
0
           index += 1
0
@@ -153,5 +153,6 @@ module ActionView
0
           "_#{partial_path}"
0
         end
0
       end
0
+      memoize :find_partial_path
0
   end
0
 end

0
@@ -84,7 +84,7 @@ module ActionView
0
       # The template will be compiled if the file has not been compiled yet, or
0
       # if local_assigns has a new key, which isn't supported by the compiled code yet.
0
       def recompile?(symbol)
0
-        !(frozen? && Base::CompiledTemplates.method_defined?(symbol))
0
+        !(ActionView::PathSet::Path.eager_load_templates? && Base::CompiledTemplates.method_defined?(symbol))
0
       end
0
   end
0
 end

0
@@ -30,9 +30,12 @@ uses_mocha 'TestTemplateRecompilation' do
0
       assert_equal "Hello world!", render("test/hello_world.erb")
0
     end
0
 
0
-    def test_compiled_template_will_be_recompiled_when_rendered_if_template_is_outside_cache
0
+    def test_compiled_template_will_always_be_recompiled_when_eager_loaded_templates_is_off
0
+      ActionView::PathSet::Path.expects(:eager_load_templates?).times(4).returns(false)
0
       assert_equal 0, @compiled_templates.instance_methods.size
0
       assert_equal "Hello world!", render("#{FIXTURE_LOAD_PATH}/test/hello_world.erb")
0
+      ActionView::Template.any_instance.expects(:compile!).times(3)
0
+      3.times { assert_equal "Hello world!", render("#{FIXTURE_LOAD_PATH}/test/hello_world.erb") }
0
       assert_equal 1, @compiled_templates.instance_methods.size
0
     end
0