aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-12-15 09:35:42 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-12-15 09:35:42 +0100
commit7cd491796a2d6cc7102073344cbed8f94b8ed92c (patch)
tree52132b12f116dc8f6a1a157dc6d11fb1feaf9d33 /actionview
parentcd90f4f273071fd20ff6e4ce34c33171923733b4 (diff)
parent99caf9ae7e46d15a713d821fa8cd516a4d254446 (diff)
downloadrails-7cd491796a2d6cc7102073344cbed8f94b8ed92c.tar.gz
rails-7cd491796a2d6cc7102073344cbed8f94b8ed92c.tar.bz2
rails-7cd491796a2d6cc7102073344cbed8f94b8ed92c.zip
Merge pull request #22595 from sstephenson/fragment_cache_key
Controller-wide fragment cache key prefixes
Diffstat (limited to 'actionview')
-rw-r--r--actionview/lib/action_view/helpers/cache_helper.rb8
-rw-r--r--actionview/test/template/render_test.rb4
2 files changed, 4 insertions, 8 deletions
diff --git a/actionview/lib/action_view/helpers/cache_helper.rb b/actionview/lib/action_view/helpers/cache_helper.rb
index e473aeaea9..18b2102d73 100644
--- a/actionview/lib/action_view/helpers/cache_helper.rb
+++ b/actionview/lib/action_view/helpers/cache_helper.rb
@@ -216,14 +216,6 @@ module ActionView
end
end
- # Given a key (as described in ActionController::Caching::Fragments.expire_fragment),
- # returns a key suitable for use in reading, writing, or expiring a
- # cached fragment. All keys are prefixed with <tt>views/</tt> and uses
- # ActiveSupport::Cache.expand_cache_key for the expansion.
- def fragment_cache_key(key)
- ActiveSupport::Cache.expand_cache_key(key.is_a?(Hash) ? url_for(key).split("://").last : key, :views)
- end
-
private
def fragment_name_with_digest(name, virtual_path) #:nodoc:
diff --git a/actionview/test/template/render_test.rb b/actionview/test/template/render_test.rb
index 84aca222b2..994fd44c52 100644
--- a/actionview/test/template/render_test.rb
+++ b/actionview/test/template/render_test.rb
@@ -9,6 +9,10 @@ module RenderTestCases
@assigns = { :secret => 'in the sauce' }
@view = Class.new(ActionView::Base) do
def view_cache_dependencies; end
+
+ def fragment_cache_key(key)
+ ActiveSupport::Cache.expand_cache_key(key, :views)
+ end
end.new(paths, @assigns)
@controller_view = TestController.new.view_context