From 2a9ad9ccbc706e546bf02ec95f864944e7d7983b Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 3 Jan 2008 21:05:12 +0000 Subject: Moved the caching stores from ActionController::Caching::Fragments::* to ActiveSupport::Cache::*. If you're explicitly referring to a store, like ActionController::Caching::Fragments::MemoryStore, you need to update that reference with ActiveSupport::Cache::MemoryStore [DHH] Deprecated ActionController::Base.fragment_cache_store for ActionController::Base.cache_store [DHH] All fragment cache keys are now by default prefixed with the 'views/' namespace [DHH] Added ActiveRecord::Base.cache_key to make it easier to cache Active Records in combination with the new ActiveSupport::Cache::* libraries [DHH] Added ActiveSupport::Gzip.decompress/compress(source) as an easy wrapper for Zlib [Tobias Luetke] Included MemCache-Client to make the improved ActiveSupport::Cache::MemCacheStore work out of the box [Bob Cottrell, Eric Hodel] Added config.cache_store to environment options to control the default cache store (default is FileStore if tmp/cache is present, otherwise MemoryStore is used) [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8546 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_view/helpers/cache_helper.rb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'actionpack/lib/action_view/helpers') diff --git a/actionpack/lib/action_view/helpers/cache_helper.rb b/actionpack/lib/action_view/helpers/cache_helper.rb index 87a8e8dc98..eb631cf201 100644 --- a/actionpack/lib/action_view/helpers/cache_helper.rb +++ b/actionpack/lib/action_view/helpers/cache_helper.rb @@ -31,21 +31,25 @@ module ActionView # <%= render :partial => "topics", :collection => @topic_list %> # Topics listed alphabetically # <% end %> - def cache(name = {}, &block) + def cache(name = {}, options = nil, &block) template_extension = first_render[/\.(\w+)$/, 1].to_sym + case template_extension when :erb, :rhtml - @controller.cache_erb_fragment(block, name) + @controller.cache_erb_fragment(block, name, options) when :rjs - @controller.cache_rjs_fragment(block, name) + @controller.cache_rjs_fragment(block, name, options) when :builder, :rxml - @controller.cache_rxml_fragment(block, name) + @controller.cache_rxml_fragment(block, name, options) else # do a last ditch effort for those brave souls using # different template engines. This should give plugin # writters a simple hook. - raise "fragment caching not supported for #{template_extension} files." unless @controller.respond_to?("cache_#{template_extension}_fragment") - @controller.send "cache_#{template_extension}_fragment", block, name + unless @controller.respond_to?("cache_#{template_extension}_fragment") + raise "fragment caching not supported for #{template_extension} files." + end + + @controller.send!("cache_#{template_extension}_fragment", block, name, options) end end end -- cgit v1.2.3