Permalink
Browse files

Merge pull request #4196 from gazay/3-2-stable-marshalling

3.2 stable marshalling
  • Loading branch information...
2 parents a0fd9fb + f7b1906 commit df3701872d6c97ff49943aea30761b47e60fa9fe @tenderlove tenderlove committed Dec 28, 2011
Showing with 26 additions and 1 deletion.
  1. +11 −1 activesupport/lib/active_support/cache.rb
  2. +15 −0 activesupport/test/caching_test.rb
@@ -578,7 +578,17 @@ def value
# it is marshalled and eventually compressed. Both operations yield
# strings.
if @value
- Marshal.load(compressed? ? Zlib::Inflate.inflate(@value) : @value)
+ # In rails 3.1 and earlier values in entries did not marshaled without
+ # options[:compress] and if it's Numeric.
+ # But after commit a263f377978fc07515b42808ebc1f7894fafaa3a
+ # all values in entries are marshalled. And after that code below expects
+ # that all values in entries will be marshaled (and will be strings).
+ # So here we need a check for old ones.
+ begin
+ Marshal.load(compressed? ? Zlib::Inflate.inflate(@value) : @value)
+ rescue
+ compressed? ? Zlib::Inflate.inflate(@value) : @value
+ end
end
end
@@ -220,6 +220,21 @@ def test_should_read_and_write_false
assert_equal false, @cache.read('foo')
end
+ def test_should_read_cached_numeric_from_previous_rails_versions
+ @old_cache = ActiveSupport::Cache::Entry.create( 1, Time.now )
+ assert_equal( 1, @old_cache.value )
+ end
+
+ def test_should_read_cached_hash_from_previous_rails_versions
+ @old_cache = ActiveSupport::Cache::Entry.create( {}, Time.now )
+ assert_equal( {}, @old_cache.value )
+ end
+
+ def test_should_read_cached_string_from_previous_rails_versions
+ @old_cache = ActiveSupport::Cache::Entry.create( 'string', Time.now )
+ assert_equal( 'string', @old_cache.value )
+ end
+
def test_read_multi
@cache.write('foo', 'bar')
@cache.write('fu', 'baz')

0 comments on commit df37018

Please sign in to comment.