Remove locals dependency from template.

This means that templates does not need to store its source anymore, allowing us to reduce the ammount of memory taken by our Rails processes. Naively speaking, if your app/views contains 2MB of files, each of your processes (after being hit by a bunch of requests) will take 2MB less of memory after this commit.

This is extremely important for the upcoming features. Since Rails will also render CSS and JS files, their source won't be stored as well allowing us to decrease the ammount of memory taken.

1 files changed, 6 insertions, 4 deletions

diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 5320245173..0771b40c37 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -34,16 +34,18 @@ module ActionView
 
     # Determine the template to be rendered using the given options.
     def _determine_template(options) #:nodoc:
+      keys = (options[:locals] ||= {}).keys
+
       if options.key?(:inline)
         handler = Template.handler_class_for_extension(options[:type] || "erb")
-        Template.new(options[:inline], "inline template", handler, {})
+        Template.new(options[:inline], "inline template", handler, { :locals => keys })
       elsif options.key?(:text)
         Template::Text.new(options[:text], formats.try(:first))
       elsif options.key?(:file)
-        with_fallbacks { find_template(options[:file], options[:prefix]) }
+        with_fallbacks { find_template(options[:file], options[:prefix], false, keys) }
       elsif options.key?(:template)
         options[:template].respond_to?(:render) ?
-          options[:template] : find_template(options[:template], options[:prefix])
+          options[:template] : find_template(options[:template], options[:prefix], false, keys)
       end
     end
 
@@ -51,7 +53,7 @@ module ActionView
     # supplied as well.
     def _render_template(template, layout = nil, options = {}) #:nodoc:
       locals = options[:locals] || {}
-      layout = find_layout(layout) if layout
+      layout = find_layout(layout, locals.keys) if layout
 
       ActiveSupport::Notifications.instrument("render_template.action_view",
         :identifier => template.identifier, :layout => layout.try(:virtual_path)) do