memcached_store 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa72b41fd6b6cb58a042294012e8f736c3b5ef62
-  data.tar.gz: e053cc731f76cb2bc909e36f7f004002b2fd7e38
+  metadata.gz: 604df981c587ff19ef1bd833c79f95d0716051bd
+  data.tar.gz: cd75d95d121d1969b8ffe73d858b9699a51a3000
 SHA512:
-  metadata.gz: 2045826e00f5d2c2d988eed051036713348bafcd7867bf06b1f6760decea9719e62a0cfc332ee82f3e3ef84f2eecb65ab7eba373f1e969f5592cfa53eb12a034
-  data.tar.gz: c36fde971c9abc498626b8662cb87977369e85c3818efbbb5bf23bf0ec0bf51e9a17e338dce98661c41b7fdb2abbf7fc6a1a271bea0cb0a8fd177e8f9e5dccf7
+  metadata.gz: 82bec692dca6c4e55e809ab7a413681e8d3737cc3a59a9cd20c8b505a1506eb6f7a1e3d0e6bb0c91a6da5b0e1c3e9f330692f04e729a6213fcec9a5375ff8adf
+  data.tar.gz: ba4c196fb7bbdc0cbae3e03568ef0d2dfea8577a5f66a7ecaa1c4afc52116f4f63ef3d0d2bc848e7bffd1eb735ad031ca00cbf504d94dc3d232caa669f632c37

data/lib/active_support/cache/memcached_snappy_store.rb

@@ -12,6 +12,16 @@ module ActiveSupport
     class MemcachedSnappyStore < MemcachedStore
       class UnsupportedOperation < StandardError; end
 
+      module SnappyCompressor
+        def self.compress(source)
+          Snappy.deflate(source)
+        end
+
+        def self.decompress(source)
+          Snappy.inflate(source)
+        end
+      end
+
       def increment(*)
         raise UnsupportedOperation, "increment is not supported by: #{self.class.name}"
       end
@@ -25,21 +35,10 @@ module ActiveSupport
         false
       end
 
-      private
-
-      def serialize_entry(entry, options)
-        value = options[:raw] ? entry.value.to_s : Marshal.dump(entry)
-        [Snappy.deflate(value), true]
-      end
-
-      def deserialize_entry(compressed_value)
-        if compressed_value
-          super(Snappy.inflate(compressed_value))
-        end
-      end
-
-      def cas_raw?(_options)
-        true
+      def initialize(*addresses, **options)
+        options[:codec] ||= ActiveSupport::Cache::MemcachedStore::Codec.new(compressor: SnappyCompressor)
+        options[:compress] = false
+        super(*addresses, **options)
       end
     end
   end

data/lib/active_support/cache/memcached_store.rb

@@ -13,11 +13,54 @@ module ActiveSupport
     class MemcachedStore < Store
       ESCAPE_KEY_CHARS = /[\x00-\x20%\x7F-\xFF]/n
 
+      class Codec
+        # use dalli compatible flags
+        SERIALIZED_FLAG = 0x1
+        COMPRESSED_FLAG = 0x2
+
+        # Older versions of this gem would use 0 for the flags whether or not
+        # the value was marshal dumped. By setting this flag, we can tell if
+        # it were set with an older version for backwards compatible decoding.
+        RAW_FLAG = 0x10
+
+        def initialize(serializer: Marshal, compressor: nil)
+          @serializer = serializer
+          @compressor = compressor
+        end
+
+        def encode(_key, value, flags)
+          unless value.is_a?(String)
+            flags |= SERIALIZED_FLAG
+            value = @serializer.dump(value)
+          end
+          if @compressor
+            flags |= COMPRESSED_FLAG
+            value = @compressor.compress(value)
+          end
+          flags |= RAW_FLAG if flags == 0
+          [value, flags]
+        end
+
+        def decode(_key, value, flags)
+          if (flags & COMPRESSED_FLAG) != 0
+            value = @compressor.decompress(value)
+          end
+
+          if (flags & SERIALIZED_FLAG) != 0
+            @serializer.load(value)
+          elsif flags == 0 # legacy cache value
+            @serializer.load(value) rescue value
+          else
+            value
+          end
+        end
+      end
+
       attr_accessor :read_only, :swallow_exceptions
 
-      def initialize(*addresses)
+      def initialize(*addresses, **options)
         addresses = addresses.flatten
-        options = addresses.extract_options!
+        options[:codec] ||= Codec.new
         @swallow_exceptions = true
         @swallow_exceptions = options.delete(:swallow_exceptions) if options.key?(:swallow_exceptions)
 
@@ -57,7 +100,7 @@ module ActiveSupport
 
         handle_exceptions(return_value_on_error: {}) do
           instrument(:read_multi, names, options) do
-            if raw_values = @data.get(keys_to_names.keys, false)
+            if raw_values = @data.get(keys_to_names.keys)
               raw_values.each do |key, value|
                 entry = deserialize_entry(value)
                 values[keys_to_names[key]] = entry.value unless entry.expired?
@@ -74,19 +117,18 @@ module ActiveSupport
 
         handle_exceptions(return_value_on_error: false) do
           instrument(:cas, name, options) do
-            @data.cas(key, expiration(options), !cas_raw?(options)) do |raw_value|
+            @data.cas(key, expiration(options)) do |raw_value|
               entry = deserialize_entry(raw_value)
               value = yield entry.value
               break true if read_only
-              serialize_entry(Entry.new(value, options), options).first
+              serialize_entry(Entry.new(value, options), options)
             end
           end
           true
         end
       end
 
-      def cas_multi(*names)
-        options = names.extract_options!
+      def cas_multi(*names, **options)
         return if names.empty?
 
         options = merged_options(options)
@@ -94,7 +136,7 @@ module ActiveSupport
 
         handle_exceptions(return_value_on_error: false) do
           instrument(:cas_multi, names, options) do
-            @data.cas(keys_to_names.keys, expiration(options), !cas_raw?(options)) do |raw_values|
+            @data.cas(keys_to_names.keys, expiration(options)) do |raw_values|
               values = {}
 
               raw_values.each do |key, raw_value|
@@ -107,7 +149,7 @@ module ActiveSupport
               break true if read_only
 
               serialized_values = values.map do |name, value|
-                [normalize_key(name, options), serialize_entry(Entry.new(value, options), options).first]
+                [normalize_key(name, options), serialize_entry(Entry.new(value, options), options)]
               end
 
               Hash[serialized_values]
@@ -161,7 +203,7 @@ module ActiveSupport
 
       def read_entry(key, _options) # :nodoc:
         handle_exceptions(return_value_on_error: nil) do
-          deserialize_entry(@data.get(escape_key(key), false))
+          deserialize_entry(@data.get(escape_key(key)))
         end
       end
 
@@ -169,9 +211,9 @@ module ActiveSupport
         return true if read_only
         method = options && options[:unless_exist] ? :add : :set
         expires_in = expiration(options)
-        value, raw = serialize_entry(entry, options)
+        value = serialize_entry(entry, options)
         handle_exceptions(return_value_on_error: false) do
-          @data.send(method, escape_key(key), value, expires_in, !raw)
+          @data.send(method, escape_key(key), value, expires_in)
           true
         end
       end
@@ -213,24 +255,18 @@ module ActiveSupport
         end
       end
 
-      def deserialize_entry(raw_value)
-        if raw_value
-          entry = begin
-                      Marshal.load(raw_value)
-                    rescue
-                      raw_value
-                    end
-          entry.is_a?(Entry) ? entry : Entry.new(entry)
+      def deserialize_entry(value)
+        if value
+          value.is_a?(Entry) ? value : Entry.new(value, compresss: false)
         end
       end
 
       def serialize_entry(entry, options)
-        entry = entry.value.to_s if options[:raw]
-        [entry, options[:raw]]
-      end
-
-      def cas_raw?(options)
-        options[:raw]
+        if options[:raw]
+          entry.value.to_s
+        else
+          entry
+        end
       end
 
       def expiration(options)

data/lib/memcached_store/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module MemcachedStore
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memcached_store
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Camilo Lopez
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-23 00:00:00.000000000 Z
+date: 2018-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport