From b2600bfc181664fcfe448d100ca054017b0576dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 7 Oct 2010 15:50:20 +0200
Subject: 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.
---
 actionpack/lib/action_view/template/resolver.rb | 30 +++++++++++++++++++------
 actionpack/lib/action_view/template/text.rb     |  4 ----
 2 files changed, 23 insertions(+), 11 deletions(-)

(limited to 'actionpack/lib/action_view/template')

diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index a031d0dc33..9ec39b16f0 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -6,8 +6,8 @@ module ActionView
   # = Action View Resolver
   class Resolver
     def initialize
-      @cached = Hash.new { |h1,k1| h1[k1] =
-        Hash.new { |h2,k2| h2[k2] = Hash.new { |h3, k3| h3[k3] = {} } } }
+      @cached = Hash.new { |h1,k1| h1[k1] = Hash.new { |h2,k2|
+        h2[k2] = Hash.new { |h3,k3| h3[k3] = Hash.new { |h4,k4| h4[k4] = {} } } } }
     end
 
     def clear_cache
@@ -15,8 +15,8 @@ module ActionView
     end
 
     # Normalizes the arguments and passes it on to find_template.
-    def find_all(name, prefix=nil, partial=false, details={}, key=nil)
-      cached(key, prefix, name, partial) do
+    def find_all(name, prefix=nil, partial=false, details={}, locals=[], key=nil)
+      cached(key, prefix, name, partial, locals) do
         find_templates(name, prefix, partial, details)
       end
     end
@@ -51,9 +51,25 @@ module ActionView
       [handler, format]
     end
 
-    def cached(key, prefix, name, partial)
-      return yield unless key && caching?
-      @cached[key][prefix][name][partial] ||= yield
+    def cached(key, prefix, name, partial, locals)
+      locals = sort_locals(locals)
+      unless key && caching?
+        yield.each { |t| t.locals = locals }
+      else
+        @cached[key][prefix][name][partial][locals] ||= yield.each { |t| t.locals = locals }
+      end
+    end
+
+    if :locale.respond_to?("<=>")
+      def sort_locals(locals)
+        locals.sort.freeze
+      end
+    else
+      def sort_locals(locals)
+        locals = locals.map{ |l| l.to_s }
+        locals.sort!
+        locals.freeze
+      end
     end
   end
 
diff --git a/actionpack/lib/action_view/template/text.rb b/actionpack/lib/action_view/template/text.rb
index 51be831dfb..4261c3b5e2 100644
--- a/actionpack/lib/action_view/template/text.rb
+++ b/actionpack/lib/action_view/template/text.rb
@@ -25,10 +25,6 @@ module ActionView #:nodoc:
       def formats
         [@mime_type.to_sym]
       end
-
-      def partial?
-        false
-      end
     end
   end
 end
-- 
cgit v1.2.3