Extracted localized_cache.rb from ActionController, added it to AbstractController and made ActionMailer use it.

4 files changed, 55 insertions, 40 deletions

diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index 76c5845f5b..1a6c4278c9 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -6,6 +6,7 @@ module AbstractController
   autoload :Callbacks,           "abstract_controller/callbacks"
   autoload :Helpers,             "abstract_controller/helpers"
   autoload :Layouts,             "abstract_controller/layouts"
+  autoload :LocalizedCache,      "abstract_controller/localized_cache"
   autoload :Logger,              "abstract_controller/logger"
   autoload :RenderingController, "abstract_controller/rendering_controller"
   # === Exceptions
diff --git a/actionpack/lib/abstract_controller/localized_cache.rb b/actionpack/lib/abstract_controller/localized_cache.rb
new file mode 100644
index 0000000000..ee7b43cb9f
--- /dev/null
+++ b/actionpack/lib/abstract_controller/localized_cache.rb
@@ -0,0 +1,49 @@
+module AbstractController
+  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.inspect} locale: #{@locale.inspect}>"
+    end
+  end
+
+  module LocalizedCache
+    extend ActiveSupport::Concern
+
+    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
+    end
+
+    def render(options)
+      Thread.current[:format_locale_key] = HashKey.get(self.class, formats, I18n.locale)
+      super
+    end
+
+    private
+
+      def with_template_cache(name)
+        self.class.template_cache[Thread.current[:format_locale_key]][name] ||= super
+      end
+
+  end
+end
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
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 84e4103280..c33695770f 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -187,11 +187,11 @@ module ActionView #:nodoc:
     def reset_formats(formats)
       @formats = formats
 
-      if defined?(ActionController)
+      if defined?(AbstractController::HashKey)
         # This is expensive, but we need to reset this when the format is updated,
         # which currently only happens
         Thread.current[:format_locale_key] =
-          ActionController::HashKey.get(self.class, formats, I18n.locale)
+          AbstractController::HashKey.get(self.class, formats, I18n.locale)
       end
     end