diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2008-01-03 15:35:10 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-01-03 15:35:10 +0000 |
commit | e2e98ef0b8a575712707e4297c5206e2ed7a7d90 (patch) | |
tree | c94755dbacc4a1e693587800f87b535efc2c8e65 /actionpack/lib/action_controller | |
parent | d5645fd4a0b8160646e69273626a77badd9ab1a4 (diff) | |
download | rails-e2e98ef0b8a575712707e4297c5206e2ed7a7d90.tar.gz rails-e2e98ef0b8a575712707e4297c5206e2ed7a7d90.tar.bz2 rails-e2e98ef0b8a575712707e4297c5206e2ed7a7d90.zip |
Made fragment caching in views work for rjs and builder as well (closes #6642) [zsombor]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8542 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r-- | actionpack/lib/action_controller/caching.rb | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index e3e48f660b..024f633d7c 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -371,11 +371,10 @@ module ActionController #:nodoc: name.is_a?(Hash) ? url_for(name).split("://").last : name end - # Called by CacheHelper#cache - def cache_erb_fragment(block, name = {}, options = nil) + def fragment_for(block, name = {}, options = nil) #:nodoc: unless perform_caching then block.call; return end - buffer = eval(ActionView::Base.erb_variable, block.binding) + buffer = yield if cache = read_fragment(name, options) buffer.concat(cache) @@ -386,6 +385,33 @@ module ActionController #:nodoc: end end + # Called by CacheHelper#cache + def cache_rxml_fragment(block, name = {}, options = nil) #:nodoc: + fragment_for(block, name, options) do + eval('xml.target!', block.binding) + end + end + + # Called by CacheHelper#cache + def cache_rjs_fragment(block, name = {}, options = nil) #:nodoc: + fragment_for(block, name, options) do + begin + debug_mode, ActionView::Base.debug_rjs = ActionView::Base.debug_rjs, false + eval('page.to_s', block.binding) + ensure + ActionView::Base.debug_rjs = debug_mode + end + end + end + + # Called by CacheHelper#cache + def cache_erb_fragment(block, name = {}, options = nil) #:nodoc: + fragment_for(block, name, options) do + eval(ActionView::Base.erb_variable, block.binding) + end + end + + # Writes <tt>content</tt> to the location signified by <tt>name</tt> (see <tt>expire_fragment</tt> for acceptable formats) def write_fragment(name, content, options = nil) return unless perform_caching |