Fall back to #to_s for cache key expansion

2 files changed, 9 insertions, 1 deletions

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 2f1143e610..b8ccd35753 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -19,7 +19,7 @@ module ActiveSupport
 
     def self.expand_cache_key(key, namespace = nil)
       expanded_cache_key = namespace ? "#{namespace}/" : ""
-      
+
       if ENV["RAILS_CACHE_ID"] || ENV["RAILS_APP_VERSION"]
         expanded_cache_key << "#{ENV["RAILS_CACHE_ID"] || ENV["RAILS_APP_VERSION"]}/" 
       end
@@ -31,6 +31,8 @@ module ActiveSupport
         key.collect { |element| expand_cache_key(element) }.to_param
       when key.respond_to?(:to_param)
         key.to_param
+      else
+        key.to_s
       end
 
       expanded_cache_key
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 09b56525e0..f3220d27aa 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -1,5 +1,11 @@
 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
   def test_file_fragment_cache_store
     store = ActiveSupport::Cache.lookup_store :file_store, "/path/to/cache/directory"