From ccf8f27dddcc36fa5c91f614647e0b0bac861d83 Mon Sep 17 00:00:00 2001 From: Godfrey Chan Date: Tue, 4 Mar 2014 17:58:58 -0800 Subject: Revert "Merge pull request #14269 from arthurnn/expanded_key_array" This reverts commit 475c96589ca65282e1a61350271c2f83f0d4044f, reversing changes made to 705915ab5cf24430892107764b0050c07e1df583. We decided that this is not worth busting everyone's cache as this seems like a very unlikely problem. The problem only occurs when the user is 1) not using a namespace, or 2) using the same namesapce for different *kinds* of cache items. The recommended "fix" is to put those cache items into their own namspace: id = 1 Rails.cache.fetch(id, namespace: "user"){ User.find(id) } ids = [1] Rails.cache.fetch(ids, namespace: "users"){ User.find(ids) } See the discussion on #14269 for details. --- activesupport/lib/active_support/cache.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'activesupport/lib/active_support') diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb index f23f6f16d6..a627fa8651 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,12 +519,11 @@ 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 = key.to_param - trailing_slash ? "#{key}/" : key + + key.to_param end # Prefix a key with the namespace. Namespace and key will be delimited -- cgit v1.2.3