diff options
author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-03-04 17:11:34 -0500 |
---|---|---|
committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-03-04 17:11:34 -0500 |
commit | 475c96589ca65282e1a61350271c2f83f0d4044f (patch) | |
tree | 8401f8dad04a50dbcc6c72480713ee4ead296924 /activesupport | |
parent | 705915ab5cf24430892107764b0050c07e1df583 (diff) | |
parent | 7d98247446e9f043dc9b6b5cbdb938877dd00a81 (diff) | |
download | rails-475c96589ca65282e1a61350271c2f83f0d4044f.tar.gz rails-475c96589ca65282e1a61350271c2f83f0d4044f.tar.bz2 rails-475c96589ca65282e1a61350271c2f83f0d4044f.zip |
Merge pull request #14269 from arthurnn/expanded_key_array
Cache key should be different when is Array.
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/CHANGELOG.md | 5 | ||||
-rw-r--r-- | activesupport/lib/active_support/cache.rb | 7 | ||||
-rw-r--r-- | activesupport/test/caching_test.rb | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 38a761384e..47580ca0a3 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,8 @@ +* Cache key should add a trailing slash when the key is an array, + so `cache.fetch('foo')` and `cache.fetch(['foo'])` wont conflict. + + *arthurnn* + * Change the signature of `fetch_multi` to return a hash rather than an array. This makes it consistent with the output of `read_multi`. diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb index a627fa8651..f23f6f16d6 100644 --- a/activesupport/lib/active_support/cache.rb +++ b/activesupport/lib/active_support/cache.rb @@ -511,7 +511,7 @@ module ActiveSupport # called. If the key is a Hash, then keys will be sorted alphabetically. def expanded_key(key) # :nodoc: return key.cache_key.to_s if key.respond_to?(:cache_key) - + trailing_slash = false case key when Array if key.size > 1 @@ -519,11 +519,12 @@ module ActiveSupport else key = key.first end + trailing_slash = true when Hash key = key.sort_by { |k,_| k.to_s }.collect{|k,v| "#{k}=#{v}"} end - - key.to_param + key = key.to_param + trailing_slash ? "#{key}/" : key end # Prefix a key with the namespace. Namespace and key will be delimited diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb index 18923f61d1..64d8792dde 100644 --- a/activesupport/test/caching_test.rb +++ b/activesupport/test/caching_test.rb @@ -257,6 +257,10 @@ module CacheStoreBehavior assert_nil @cache.fetch('foo') { 'baz' } end + def test_fetch_with_array_and_without + assert_not_equal @cache.fetch('foo') { 'barz' }, @cache.fetch(['foo']) { 'barr' } + end + def test_should_read_and_write_hash assert @cache.write('foo', {:a => "b"}) assert_equal({:a => "b"}, @cache.read('foo')) @@ -349,7 +353,7 @@ module CacheStoreBehavior def test_array_as_cache_key @cache.write([:fu, "foo"], "bar") - assert_equal "bar", @cache.read("fu/foo") + assert_equal "bar", @cache.read("fu/foo/") end def test_hash_as_cache_key |