Fall back to #to_s for cache key expansion
This commit is contained in:
parent
72f93b581f
commit
f47c81ff37
@ -19,7 +19,7 @@ def self.lookup_store(*store_option)
|
|||||||
|
|
||||||
def self.expand_cache_key(key, namespace = nil)
|
def self.expand_cache_key(key, namespace = nil)
|
||||||
expanded_cache_key = namespace ? "#{namespace}/" : ""
|
expanded_cache_key = namespace ? "#{namespace}/" : ""
|
||||||
|
|
||||||
if ENV["RAILS_CACHE_ID"] || ENV["RAILS_APP_VERSION"]
|
if ENV["RAILS_CACHE_ID"] || ENV["RAILS_APP_VERSION"]
|
||||||
expanded_cache_key << "#{ENV["RAILS_CACHE_ID"] || ENV["RAILS_APP_VERSION"]}/"
|
expanded_cache_key << "#{ENV["RAILS_CACHE_ID"] || ENV["RAILS_APP_VERSION"]}/"
|
||||||
end
|
end
|
||||||
@ -31,6 +31,8 @@ def self.expand_cache_key(key, namespace = nil)
|
|||||||
key.collect { |element| expand_cache_key(element) }.to_param
|
key.collect { |element| expand_cache_key(element) }.to_param
|
||||||
when key.respond_to?(:to_param)
|
when key.respond_to?(:to_param)
|
||||||
key.to_param
|
key.to_param
|
||||||
|
else
|
||||||
|
key.to_s
|
||||||
end
|
end
|
||||||
|
|
||||||
expanded_cache_key
|
expanded_cache_key
|
||||||
|
@ -1,5 +1,11 @@
|
|||||||
require 'abstract_unit'
|
require 'abstract_unit'
|
||||||
|
|
||||||
|
class CacheKeyTest < Test::Unit::TestCase
|
||||||
|
def test_expand_cache_key
|
||||||
|
assert_equal 'name/1/2/true', ActiveSupport::Cache.expand_cache_key([1, '2', true], :name)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
class CacheStoreSettingTest < Test::Unit::TestCase
|
class CacheStoreSettingTest < Test::Unit::TestCase
|
||||||
def test_file_fragment_cache_store
|
def test_file_fragment_cache_store
|
||||||
store = ActiveSupport::Cache.lookup_store :file_store, "/path/to/cache/directory"
|
store = ActiveSupport::Cache.lookup_store :file_store, "/path/to/cache/directory"
|
||||||
|
Loading…
Reference in New Issue
Block a user