lib/active_support/cache.rb in activesupport-5.2.0.rc1 vs lib/active_support/cache.rb in activesupport-5.2.0.rc2

@@ -162,12 +162,12 @@
 
       class << self
         private
           def retrieve_pool_options(options)
             {}.tap do |pool_options|
-              pool_options[:size] = options[:pool_size] if options[:pool_size]
-              pool_options[:timeout] = options[:pool_timeout] if options[:pool_timeout]
+              pool_options[:size] = options.delete(:pool_size) if options[:pool_size]
+              pool_options[:timeout] = options.delete(:pool_timeout) if options[:pool_timeout]
             end
           end
 
           def ensure_connection_pool_added!
             require "connection_pool"
@@ -712,15 +712,13 @@
       DEFAULT_COMPRESS_LIMIT = 1.kilobyte
 
       # Creates a new cache entry for the specified value. Options supported are
       # +:compress+, +:compress_threshold+, and +:expires_in+.
       def initialize(value, options = {})
-        if should_compress?(value, options)
-          @value = compress(value)
-          @compressed = true
-        else
-          @value = value
+        @value = value
+        if should_compress?(options)
+          compress!
         end
 
         @version    = options[:version]
         @created_at = Time.now.to_f
         @expires_in = options[:expires_in]
@@ -781,30 +779,33 @@
           end
         end
       end
 
       private
-        def should_compress?(value, options)
-          if value && options.fetch(:compress, true)
+        def should_compress?(options)
+          if @value && options.fetch(:compress, true)
             compress_threshold = options.fetch(:compress_threshold, DEFAULT_COMPRESS_LIMIT)
-            serialized_value_size = (value.is_a?(String) ? value : Marshal.dump(value)).bytesize
+            serialized_value_size = (@value.is_a?(String) ? @value : marshaled_value).bytesize
 
-            return true if serialized_value_size >= compress_threshold
+            serialized_value_size >= compress_threshold
           end
-
-          false
         end
 
         def compressed?
           defined?(@compressed) ? @compressed : false
         end
 
-        def compress(value)
-          Zlib::Deflate.deflate(Marshal.dump(value))
+        def compress!
+          @value = Zlib::Deflate.deflate(marshaled_value)
+          @compressed = true
         end
 
         def uncompress(value)
           Marshal.load(Zlib::Inflate.inflate(value))
+        end
+
+        def marshaled_value
+          @marshaled_value ||= Marshal.dump(@value)
         end
     end
   end
 end