memcached_store 2.3.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdd4f8408b915953e5dac445736ee15ddb7db1208acf365fdecb5a03b389a8e8
-  data.tar.gz: 218294aa36469941f5ef0a6609d31687ead001e25c42dc1cf8b565b5e36e395c
+  metadata.gz: 51f58b245ce09f4f36a9f095684357fecc3e6ec3a7dfcfe5d37c532c94f3476a
+  data.tar.gz: b5062194ad1fc584c122bfedfc2e9b11f04e05080c702753623b1dc599042885
 SHA512:
-  metadata.gz: 774a57bfa30dd07824d9a8b4bcb394de38fea2e59a2cae280bc583dcd92d3ece84241c5bffc54162d903f0f594e7fbb50b7f54c19f56fe74744c8089af60c93d
-  data.tar.gz: b0b35daa5e372df41f17d51c41df7daa393c441447342800e213e1333bdec1b574ed0cd3f72e2523105f56fcce73b34cf65ecceb68f30ca26d2058413b611484
+  metadata.gz: 7a0023120d7e6107600871075ece41c802d076fa670ba2ad588bd0a15017544499c88a281f8ab0f6ce067f6179728af0a991013fb7ed0851305776b2cf11b853
+  data.tar.gz: 8aac93c1733e645bbc683eb3d8e6e2099ef553866f0fc9a7278bb4e008190e09df783963bca99c72d00152ecf0bf94eee29582146f5e2c411d587697a5062158

data/lib/active_support/cache/memcached_store.rb

@@ -1,5 +1,6 @@
 # file havily based out off https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/cache/mem_cache_store.rb
 require 'digest/md5'
+require 'delegate'
 
 module ActiveSupport
   module Cache
@@ -66,7 +67,13 @@ module ActiveSupport
         @swallow_exceptions = true
         @swallow_exceptions = options.delete(:swallow_exceptions) if options.key?(:swallow_exceptions)
 
-        super(options)
+        if options.key?(:coder)
+          raise ArgumentError, "ActiveSupport::Cache::MemcachedStore doesn't support custom coders"
+        end
+
+        # We don't use a coder, so we set it to nil so Active Support don't think we're using
+        # a deprecated one.
+        super(options.merge(coder: nil))
 
         if addresses.first.is_a?(Memcached)
           @connection = addresses.first
@@ -127,18 +134,27 @@ module ActiveSupport
       def cas(name, options = nil)
         options = merged_options(options)
         key = normalize_key(name, options)
+        payload = nil
 
-        handle_exceptions(return_value_on_error: false) do
+        success = handle_exceptions(return_value_on_error: false) do
           instrument(:cas, name, options) do
             @connection.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)
+              payload = serialize_entry(Entry.new(value, **options), options)
             end
           end
           true
         end
+
+        if success
+          local_cache.write_entry(key, payload) if local_cache
+        else
+          local_cache.delete_entry(key) if local_cache
+        end
+
+        success
       end
 
       def cas_multi(*names, **options)
@@ -147,9 +163,11 @@ module ActiveSupport
         options = merged_options(options)
         keys_to_names = Hash[names.map { |name| [normalize_key(name, options), name] }]
 
+        sent_payloads = nil
+
         handle_exceptions(return_value_on_error: false) do
           instrument(:cas_multi, names, options) do
-            @connection.cas(keys_to_names.keys, expiration(options)) do |raw_values|
+            written_payloads = @connection.cas(keys_to_names.keys, expiration(options)) do |raw_values|
               values = {}
 
               raw_values.each do |key, raw_value|
@@ -165,8 +183,19 @@ module ActiveSupport
                 [normalize_key(name, options), serialize_entry(Entry.new(value, **options), options)]
               end
 
-              Hash[serialized_values]
+              sent_payloads = Hash[serialized_values]
             end
+
+            if local_cache && sent_payloads
+              sent_payloads.each_key do |key|
+                if written_payloads.key?(key)
+                  local_cache.write_entry(key, written_payloads[key])
+                else
+                  local_cache.delete_entry(key)
+                end
+              end
+            end
+
             true
           end
         end
@@ -215,21 +244,21 @@ module ActiveSupport
       private
 
       if private_method_defined?(:read_serialized_entry)
-        class LocalStore < Strategy::LocalCache::LocalStore
+        class DupLocalStore < DelegateClass(Strategy::LocalCache::LocalStore)
           def write_entry(_key, entry)
             if entry.is_a?(Entry)
-              entry.dup_value! 
+              entry.dup_value!
             end
             super
           end
 
           def fetch_entry(key)
-            entry = @data.fetch(key) do
+            entry = super do
               new_entry = yield
               if entry.is_a?(Entry)
                 new_entry.dup_value!
               end
-              @data[key] = new_entry
+              new_entry
             end
             entry = entry.dup
 
@@ -241,12 +270,17 @@ module ActiveSupport
           end
         end
 
-        module LocalCacheDup
-          def with_local_cache
-            use_temporary_local_cache(LocalStore.new) { yield }
+        module DupLocalCache
+          private
+
+          def local_cache
+            if local_cache = super
+              DupLocalStore.new(local_cache)
+            end
           end
         end
-        prepend LocalCacheDup
+
+        prepend DupLocalCache
 
         def read_entry(key, **options) # :nodoc:
           deserialize_entry(read_serialized_entry(key, **options))

data/lib/memcached_store/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memcached_store
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.2
 platform: ruby
 authors:
 - Camilo Lopez
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-26 00:00:00.000000000 Z
+date: 2023-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.20
+rubygems_version: 3.4.16
 signing_key: 
 specification_version: 4
 summary: Plugin-able Memcached adapters to add features (compression, safety)