memcached_store 2.0.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 11b2d36add426b80ef8570fd72cdf247d0ebdf28
-  data.tar.gz: ee4e959a7cad3844bdbd18eba3c274ba70a840f2
+SHA256:
+  metadata.gz: 9e7243c82d777973585ebe50de354665846e66aed6e03e3464bc076037b291e0
+  data.tar.gz: fd1698923aa5ace4e2ec6ecfbcfc02d04111bd92ba06c3ee85c961440a2d535a
 SHA512:
-  metadata.gz: e795749ad3162e9dffc249edfdef2408b5abff431942913ea690a3c13322957c9553cd2e997f4555a6f04422b9ed52d338b8a230c97b3e74dbaf8f203bd90df9
-  data.tar.gz: 168f47809b0d3d74a61c1a7d82a021f6242ca1c2387d94f5a25f35c6ba70ad772a3ba6ca4ea632b1a59e08550e6ea82c9778961efe2f3f3937befca934fe9481
+  metadata.gz: 3bf90bd2fb5cc5a339dfe0d25c36a35494141ed091759015bfaac4fa913333dc5979220e0f44cb654d974e86aed295287d19e78824c42340af5a0b71b5aa00f2
+  data.tar.gz: d004c8b93109d62d7faec3484c5227d2819b5beaffb67d695f680beb2a7e458484d34f1efef4f2730a442ad1bdfa0eff261b363d65954dee35e2f8da096e2b29

data/lib/active_support/cache/memcached_store.rb

@@ -58,6 +58,8 @@ module ActiveSupport
 
       attr_accessor :read_only, :swallow_exceptions
 
+      prepend(Strategy::LocalCache)
+
       def initialize(*addresses, **options)
         addresses = addresses.flatten
         options[:codec] ||= Codec.new
@@ -67,17 +69,28 @@ module ActiveSupport
         super(options)
 
         if addresses.first.is_a?(Memcached)
-          @data = addresses.first
+          @connection = addresses.first
           raise "Memcached::Rails is no longer supported, "\
-                "use a Memcached instance instead" if @data.is_a?(Memcached::Rails)
+                "use a Memcached instance instead" if @connection.is_a?(Memcached::Rails)
         else
           mem_cache_options = options.dup
           servers = mem_cache_options.delete(:servers)
           UNIVERSAL_OPTIONS.each { |name| mem_cache_options.delete(name) }
-          @data = Memcached.new([*addresses, *servers], mem_cache_options)
+          @connection = Memcached.new([*addresses, *servers], mem_cache_options)
         end
+      end
+
+      def append(name, value, options = nil)
+        return true if read_only
+        options = merged_options(options)
+        normalized_key = normalize_key(name, options)
 
-        extend Strategy::LocalCache
+        handle_exceptions(return_value_on_error: nil, on_miss: false, miss_exceptions: [Memcached::NotStored]) do
+          instrument(:append, name) do
+            @connection.append(normalized_key, value)
+          end
+          true
+        end
       end
 
       def write(*)
@@ -100,7 +113,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)
+            if raw_values = @connection.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?
@@ -117,11 +130,11 @@ module ActiveSupport
 
         handle_exceptions(return_value_on_error: false) do
           instrument(:cas, name, options) do
-            @data.cas(key, expiration(options)) do |raw_value|
+            @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)
+              serialize_entry(Entry.new(value, **options), options)
             end
           end
           true
@@ -136,7 +149,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)) do |raw_values|
+            @connection.cas(keys_to_names.keys, expiration(options)) do |raw_values|
               values = {}
 
               raw_values.each do |key, raw_value|
@@ -149,7 +162,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)]
+                [normalize_key(name, options), serialize_entry(Entry.new(value, **options), options)]
               end
 
               Hash[serialized_values]
@@ -163,7 +176,7 @@ module ActiveSupport
         options = merged_options(options)
         handle_exceptions(return_value_on_error: nil) do
           instrument(:increment, name, amount: amount) do
-            @data.incr(normalize_key(name, options), amount)
+            @connection.incr(normalize_key(name, options), amount)
           end
         end
       end
@@ -172,20 +185,20 @@ module ActiveSupport
         options = merged_options(options)
         handle_exceptions(return_value_on_error: nil) do
           instrument(:decrement, name, amount: amount) do
-            @data.decr(normalize_key(name, options), amount)
+            @connection.decr(normalize_key(name, options), amount)
           end
         end
       end
 
       def clear(options = nil)
         ActiveSupport::Notifications.instrument("cache_clear.active_support", options || {}) do
-          @data.flush
+          @connection.flush
         end
       end
 
       def stats
         ActiveSupport::Notifications.instrument("cache_stats.active_support") do
-          @data.stats
+          @connection.stats
         end
       end
 
@@ -195,7 +208,7 @@ module ActiveSupport
 
       def reset #:nodoc:
         handle_exceptions(return_value_on_error: false) do
-          @data.reset
+          @connection.reset
         end
       end
 
@@ -203,7 +216,7 @@ module ActiveSupport
 
       def read_entry(key, _options) # :nodoc:
         handle_exceptions(return_value_on_error: nil) do
-          deserialize_entry(@data.get(escape_key(key)))
+          deserialize_entry(@connection.get(escape_key(key)))
         end
       end
 
@@ -213,7 +226,7 @@ module ActiveSupport
         expires_in = expiration(options)
         value = serialize_entry(entry, options)
         handle_exceptions(return_value_on_error: false) do
-          @data.send(method, escape_key(key), value, expires_in)
+          @connection.send(method, escape_key(key), value, expires_in)
           true
         end
       end
@@ -221,7 +234,7 @@ module ActiveSupport
       def delete_entry(key, _options) # :nodoc:
         return true if read_only
         handle_exceptions(return_value_on_error: false, on_miss: true) do
-          @data.delete(escape_key(key))
+          @connection.delete(escape_key(key))
           true
         end
       end
@@ -271,16 +284,15 @@ module ActiveSupport
 
       def expiration(options)
         expires_in = options[:expires_in].to_i
-        if expires_in > 0 && !options[:raw]
-          # Set the memcache expire a few minutes in the future to support race condition ttls on read
-          expires_in += 5.minutes.to_i
+        if expires_in > 0 && options[:race_condition_ttl] && !options[:raw]
+          expires_in += options[:race_condition_ttl].to_i
         end
         expires_in
       end
 
-      def handle_exceptions(return_value_on_error:, on_miss: return_value_on_error)
+      def handle_exceptions(return_value_on_error:, on_miss: return_value_on_error, miss_exceptions: [])
         yield
-      rescue Memcached::NotFound, Memcached::ConnectionDataExists
+      rescue Memcached::NotFound, Memcached::ConnectionDataExists, *miss_exceptions
         on_miss
       rescue Memcached::Error => e
         log_warning(e)

data/lib/memcached_store/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memcached_store
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Camilo Lopez
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -33,14 +33,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -55,6 +55,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Plugin-able Memcached adapters to add features (compression, safety)
 email:
 - camilo@camilolopez.com
@@ -75,7 +103,8 @@ files:
 homepage: https://github.com/Shopify/memcached_store/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -91,8 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.2.17
 signing_key: 
 specification_version: 4
 summary: Plugin-able Memcached adapters to add features (compression, safety)