From 976c2647240fd40a2b706ab5e41856cd47e7b212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 28 Oct 2009 10:33:05 -0200
Subject: Extracted localized_cache.rb from ActionController, added it to
 AbstractController and made ActionMailer use it.

---
 .../metal/rendering_controller.rb                  | 41 ++--------------------
 1 file changed, 3 insertions(+), 38 deletions(-)

(limited to 'actionpack/lib/action_controller/metal')

diff --git a/actionpack/lib/action_controller/metal/rendering_controller.rb b/actionpack/lib/action_controller/metal/rendering_controller.rb
index c5ade26702..237299cd30 100644
--- a/actionpack/lib/action_controller/metal/rendering_controller.rb
+++ b/actionpack/lib/action_controller/metal/rendering_controller.rb
@@ -1,39 +1,10 @@
 module ActionController
-  class HashKey
-    @hash_keys = Hash.new {|h,k| h[k] = Hash.new {|h,k| h[k] = {} } }
-
-    def self.get(klass, formats, locale)
-      @hash_keys[klass][formats][locale] ||= new(klass, formats, locale)
-    end
-
-    attr_accessor :hash
-    def initialize(klass, formats, locale)
-      @formats, @locale = formats, locale
-      @hash = [formats, locale].hash
-    end
-
-    alias_method :eql?, :equal?
-
-    def inspect
-      "#<HashKey -- formats: #{@formats} locale: #{@locale}>"
-    end
-  end
-
   module RenderingController
     extend ActiveSupport::Concern
 
-    include AbstractController::RenderingController
-
-    module ClassMethods
-      def clear_template_caches!
-        ActionView::Partials::PartialRenderer::TEMPLATES.clear
-        template_cache.clear
-        super
-      end
-
-      def template_cache
-        @template_cache ||= Hash.new {|h,k| h[k] = {} }
-      end
+    included do
+      include AbstractController::RenderingController
+      include AbstractController::LocalizedCache
     end
 
     def process_action(*)
@@ -42,8 +13,6 @@ module ActionController
     end
 
     def render(options)
-      Thread.current[:format_locale_key] = HashKey.get(self.class, formats, I18n.locale)
-
       super
       self.content_type ||= options[:_template].mime_type.to_s
       response_body
@@ -78,10 +47,6 @@ module ActionController
         formats.first
       end
 
-      def with_template_cache(name)
-        self.class.template_cache[Thread.current[:format_locale_key]][name] ||= super
-      end
-
       def _process_options(options)
         status, content_type, location = options.values_at(:status, :content_type, :location)
         self.status = status if status
-- 
cgit v1.2.3