diff --git a/activesupport/lib/active_support/cache/compressed_mem_cache_store.rb b/activesupport/lib/active_support/cache/compressed_mem_cache_store.rb index 0bff6cf9ad6ee..d87eb17337141 100644 --- a/activesupport/lib/active_support/cache/compressed_mem_cache_store.rb +++ b/activesupport/lib/active_support/cache/compressed_mem_cache_store.rb @@ -3,12 +3,17 @@ module Cache class CompressedMemCacheStore < MemCacheStore def read(name, options = nil) if value = super(name, (options || {}).merge(:raw => true)) - Marshal.load(ActiveSupport::Gzip.decompress(value)) + if raw?(options) + value + else + Marshal.load(ActiveSupport::Gzip.decompress(value)) + end end end def write(name, value, options = nil) - super(name, ActiveSupport::Gzip.compress(Marshal.dump(value)), (options || {}).merge(:raw => true)) + value = ActiveSupport::Gzip.compress(Marshal.dump(value)) unless raw?(options) + super(name, value, (options || {}).merge(:raw => true)) end end end diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb index 58958dccefe0a..5531c30b7f475 100644 --- a/activesupport/lib/active_support/cache/mem_cache_store.rb +++ b/activesupport/lib/active_support/cache/mem_cache_store.rb @@ -34,6 +34,9 @@ def read(key, options = nil) def write(key, value, options = nil) super method = options && options[:unless_exist] ? :add : :set + # memcache-client will break the connection if you send it an integer + # in raw mode, so we convert it to a string to be sure it continues working. + value = value.to_s if raw?(options) response = @data.send(method, key, value, expires_in(options), raw?(options)) response == Response::STORED rescue MemCache::MemCacheError => e diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb index e2da2796eb0bd..88c6d6cca4964 100644 --- a/activesupport/test/caching_test.rb +++ b/activesupport/test/caching_test.rb @@ -159,11 +159,6 @@ def test_store_objects_should_be_immutable @cache.read('foo').gsub!(/.*/, 'baz') assert_equal 'bar', @cache.read('foo') end - - # Disabling increment and decrement tests until issues can be addressed in the - # upstream codebase. - def test_increment; end - def test_decrement; end end class CompressedMemCacheStore < Test::Unit::TestCase @@ -173,9 +168,4 @@ def setup end include CacheStoreBehavior - - # Disabling increment and decrement tests until issues can be addressed in the - # upstream codebase. - def test_increment; end - def test_decrement; end end