diff --git a/actionpack/lib/action_controller/caching/fragments.rb b/actionpack/lib/action_controller/caching/fragments.rb
index 868af19780076895a11ac9170935e3d8dbf0e51b..e4d8678a078663f5013f85eeb42f3fdfdf159dd1 100644
--- a/actionpack/lib/action_controller/caching/fragments.rb
+++ b/actionpack/lib/action_controller/caching/fragments.rb
@@ -74,32 +74,6 @@ def fragment_for(block, name = {}, options = nil) #: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 content to the location signified by key (see expire_fragment for acceptable formats)
def write_fragment(key, content, options = nil)
return unless cache_configured?
diff --git a/actionpack/lib/action_view/helpers/cache_helper.rb b/actionpack/lib/action_view/helpers/cache_helper.rb
index 783a5acdbc9ca6476034d840d5280d68da665b2a..059f2edf0f00b1dce3590d962de8d658c0e15102 100644
--- a/actionpack/lib/action_view/helpers/cache_helper.rb
+++ b/actionpack/lib/action_view/helpers/cache_helper.rb
@@ -33,23 +33,8 @@ module CacheHelper
# <% end %>
def cache(name = {}, options = nil, &block)
template_extension = find_template_extension_for(first_render)[/\.(\w+)$/, 1].to_sym
-
- case template_extension
- when :erb, :rhtml
- @controller.cache_erb_fragment(block, name, options)
- when :rjs
- @controller.cache_rjs_fragment(block, name, options)
- when :builder, :rxml
- @controller.cache_rxml_fragment(block, name, options)
- else
- # Give template engine writers a hook to implement their own caching approach
- if @controller.respond_to?("cache_#{template_extension}_fragment")
- @controller.send!("cache_#{template_extension}_fragment", block, name, options)
- else
- # Let the ERb approach be the default one if the plugin doesn't specify it's own
- @controller.cache_erb_fragment(block, name, options)
- end
- end
+ handler = Base.handler_for_extension(template_extension)
+ handler.new(@controller).cache_fragment(block, name, options)
end
end
end
diff --git a/actionpack/lib/action_view/template_handler.rb b/actionpack/lib/action_view/template_handler.rb
index b9f4330a2306afffb30a5df4ed4f198e45f986f4..8ce31ade4927b77c2ff00b3ad955ba0cb2f8e593 100644
--- a/actionpack/lib/action_view/template_handler.rb
+++ b/actionpack/lib/action_view/template_handler.rb
@@ -13,5 +13,9 @@ def render(template, local_assigns)
def compile(template)
end
+
+ # Called by CacheHelper#cache
+ def cache_fragment(block, name = {}, options = nil)
+ end
end
end
diff --git a/actionpack/lib/action_view/template_handlers/builder.rb b/actionpack/lib/action_view/template_handlers/builder.rb
index 0f49d6ab310a5ae9d9fe64fd62f03100b9440ddd..88044917dd282ae4fe5887b57b0f591114cb37a5 100644
--- a/actionpack/lib/action_view/template_handlers/builder.rb
+++ b/actionpack/lib/action_view/template_handlers/builder.rb
@@ -14,6 +14,12 @@ def compile(template)
template +
"\nxml.target!\n"
end
+
+ def cache_fragment(block, name = {}, options = nil)
+ @view.fragment_for(block, name, options) do
+ eval('xml.target!', block.binding)
+ end
+ end
end
end
end
diff --git a/actionpack/lib/action_view/template_handlers/erb.rb b/actionpack/lib/action_view/template_handlers/erb.rb
index 87cb09952cb0891d6001bf568d4b38d71dfdd5ba..26cca586bafec6d58cb60a51b27010963141abbd 100644
--- a/actionpack/lib/action_view/template_handlers/erb.rb
+++ b/actionpack/lib/action_view/template_handlers/erb.rb
@@ -25,6 +25,12 @@ class ERB < TemplateHandler
def compile(template)
::ERB.new(template, nil, @view.erb_trim_mode).src
end
+
+ def cache_fragment(block, name = {}, options = nil) #:nodoc:
+ @view.fragment_for(block, name, options) do
+ eval(ActionView::Base.erb_variable, block.binding)
+ end
+ end
end
end
end
diff --git a/actionpack/lib/action_view/template_handlers/rjs.rb b/actionpack/lib/action_view/template_handlers/rjs.rb
index 4ca9fc3277f8dd54da47a899801f183cb467cb01..bd51cc4d398ae06091dba8d64e149921a6677f1c 100644
--- a/actionpack/lib/action_view/template_handlers/rjs.rb
+++ b/actionpack/lib/action_view/template_handlers/rjs.rb
@@ -9,6 +9,17 @@ def compile(template)
"controller.response.content_type ||= Mime::JS\n" +
"update_page do |page|\n#{template}\nend"
end
+
+ def cache_fragment(block, name = {}, options = nil) #:nodoc:
+ @view.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
end
end
end
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 12397ee8c0b92e014dfaf7890910262d8f74e8af..9d4dc4d01c715af251a3dfd4a8653a5268be0c03 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -445,7 +445,7 @@ def test_cache_erb_fragment
_erbout = 'generated till now -> '
assert_equal( 'generated till now -> fragment content',
- @controller.cache_erb_fragment(Proc.new{ }, 'expensive'))
+ ActionView::TemplateHandlers::ERB.new(@controller).cache_fragment(Proc.new{ }, 'expensive'))
end
def test_cache_rxml_fragment
@@ -454,7 +454,7 @@ def test_cache_rxml_fragment
class << xml; def target!; to_s; end; end
assert_equal( 'generated till now -> fragment content',
- @controller.cache_rxml_fragment(Proc.new{ }, 'expensive'))
+ ActionView::TemplateHandlers::Builder.new(@controller).cache_fragment(Proc.new{ }, 'expensive'))
end
def test_cache_rjs_fragment
@@ -462,7 +462,7 @@ def test_cache_rjs_fragment
page = 'generated till now -> '
assert_equal( 'generated till now -> fragment content',
- @controller.cache_rjs_fragment(Proc.new{ }, 'expensive'))
+ ActionView::TemplateHandlers::RJS.new(@controller).cache_fragment(Proc.new{ }, 'expensive'))
end
def test_cache_rjs_fragment_debug_mode_does_not_interfere
@@ -472,7 +472,7 @@ def test_cache_rjs_fragment_debug_mode_does_not_interfere
begin
debug_mode, ActionView::Base.debug_rjs = ActionView::Base.debug_rjs, true
assert_equal( 'generated till now -> fragment content',
- @controller.cache_rjs_fragment(Proc.new{ }, 'expensive'))
+ ActionView::TemplateHandlers::RJS.new(@controller).cache_fragment(Proc.new{ }, 'expensive'))
assert ActionView::Base.debug_rjs
ensure
ActionView::Base.debug_rjs = debug_mode