aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorStan Lo <a22301613@yahoo.com.tw>2015-12-30 21:07:40 +0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2016-02-23 21:06:40 -0300
commit3e824d3f5b32bae70832fe0c1c329ce062f79ff9 (patch)
tree73ccdbd9d7aec9ff17e3731a0dbfef3710d36ca0 /actionmailer
parenta24d067343e7b14f066490c011828d57599fa94f (diff)
downloadrails-3e824d3f5b32bae70832fe0c1c329ce062f79ff9.tar.gz
rails-3e824d3f5b32bae70832fe0c1c329ce062f79ff9.tar.bz2
rails-3e824d3f5b32bae70832fe0c1c329ce062f79ff9.zip
Move most caching methods to ActionDispatch::Caching, and let ActionMailer and ActionController to include it
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/caching.rb57
-rw-r--r--actionmailer/test/caching_test.rb1
2 files changed, 3 insertions, 55 deletions
diff --git a/actionmailer/lib/action_mailer/caching.rb b/actionmailer/lib/action_mailer/caching.rb
index c5b4890178..319909d1a7 100644
--- a/actionmailer/lib/action_mailer/caching.rb
+++ b/actionmailer/lib/action_mailer/caching.rb
@@ -1,62 +1,11 @@
-require 'active_support/descendants_tracker'
-require 'action_dispatch/caching/fragments'
+require 'action_dispatch/caching'
module ActionMailer
module Caching
- extend ActiveSupport::Concern
extend ActiveSupport::Autoload
-
- module ConfigMethods
- def cache_store
- config.cache_store
- end
-
- def cache_store=(store)
- config.cache_store = ActiveSupport::Cache.lookup_store(store)
- end
-
- private
- def cache_configured?
- perform_caching && cache_store
- end
- end
-
- include AbstractController::Helpers
- include ConfigMethods
- include ActionDispatch::Caching::Fragments
-
+ extend ActiveSupport::Concern
included do
- extend ConfigMethods
-
- config_accessor :default_static_extension
- self.default_static_extension ||= '.html'
-
- config_accessor :perform_caching
- self.perform_caching = true if perform_caching.nil?
-
- class_attribute :_view_cache_dependencies
- self._view_cache_dependencies = []
- helper_method :view_cache_dependencies if respond_to?(:helper_method)
- end
-
- module ClassMethods
- def view_cache_dependency(&dependency)
- self._view_cache_dependencies += [dependency]
- end
- end
-
- def view_cache_dependencies
- self.class._view_cache_dependencies.map { |dep| instance_exec(&dep) }.compact
- end
-
- protected
- # Convenience accessor.
- def cache(key, options = {}, &block)
- if cache_configured?
- cache_store.fetch(ActiveSupport::Cache.expand_cache_key(key, :controller), options, &block)
- else
- yield
- end
+ include ActionDispatch::Caching
end
def perform_caching
diff --git a/actionmailer/test/caching_test.rb b/actionmailer/test/caching_test.rb
index a92f43a6c5..e48d2042ac 100644
--- a/actionmailer/test/caching_test.rb
+++ b/actionmailer/test/caching_test.rb
@@ -2,7 +2,6 @@ require 'fileutils'
require 'abstract_unit'
require 'mailers/base_mailer'
require 'mailers/caching_mailer'
-require 'byebug'
CACHE_DIR = 'test_cache'
# Don't change '/../temp/' cavalierly or you might hose something you don't want hosed