smart_cache_store 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3255f6928a9b8e6a102b210749f0b31dea04654f583f4679832019d84f6f490a
-  data.tar.gz: 03bee6a696eb0cfbcb5a1517818888ea866dc65b33a54a6b7c95cdad7efe2e9c
+  metadata.gz: 1880ca4e20a7e99d8a3241e895a9e8405f17faf2e1d28ddede62b8acde1d4c16
+  data.tar.gz: 9e7d77179cd5c0b020a583b92256b7900fe886cb054947e4e84eaead557f8833
 SHA512:
-  metadata.gz: 3922f820e7b655a38a8ec5e688c8c18fab6a66ae499e9d01edc14fb1f9cb3c5d424456ffb2a0bcf89aaf4e4d1462fe63672baeb800902662ceecc1338853b275
-  data.tar.gz: 87579ff4140abe65b6f2f402e720f43ffda8137333821410b10ea1aab0ce11e34e55eb3a5802376f3f2238e19b9bce30b7e26072c4a35fa2411df81433a862d9
+  metadata.gz: 31630bf7314ebf8b6b065e885e2604b1faa9e50444d7f5aef361260a570e208fb0b412e7f942dc151c5547eb0e3bfd02344ee261b6b3af35af0d8fc43e7792c7
+  data.tar.gz: 1e0b2ce48c0c902bcf5ebaab820e0bdc84d482ee6a22c51fcb017b91e8581ed445c12ac0b0b38aca191e28296ef28c641630bafd08a7d97297038fa0e4f8b0d3

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright 2021-2022 thomas morgan
+Copyright 2021-2023 thomas morgan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -11,7 +11,7 @@ Set by default:
     namespace:          ENV['REDIS_NAMESPACE']
     expires_in:         1.day
     race_condition_ttl: 5.seconds
-    pool_size:          ENV['RAILS_MAX_THREADS'] || 5
+    pool:               ENV['RAILS_MAX_THREADS'] || 5
     connect_timeout:    2
     read_timeout:       1
     write_timeout:      1
@@ -31,7 +31,7 @@ Set by default:
     expires_in:         1.day
     race_condition_ttl: 5.seconds
     failover:           true
-    pool_size:          ENV['RAILS_MAX_THREADS'] || 5
+    pool:               ENV['RAILS_MAX_THREADS'] || 5
 
 MemCacheStore's legacy initializer with `*addresses` as the first parameter, and the RedisCacheStore compatible `:url` are supported.
 

data/lib/active_support/cache/smart_mem_cache.rb

@@ -15,9 +15,10 @@ module ActiveSupport
 
       # known options:
       #   ActiveSupport::Cache - universal options
-      #     :namespace{nil}, :compress{true}, :compress_threshold{1k}, :expires_in{0}, :race_condition_ttl{0}
+      #     :namespace{nil}, :compress{true}, :compress_threshold{1k}, :coder, :expires_in{0}
+      #     :race_condition_ttl{0}, :skip_nil{false}
       #   ActiveSupport::Cache::Store
-      #     :pool_size{5}, :pool_timeout{5}
+      #     pool: {:size{5}, :timeout{5}}
       #   Dalli::Client
       #     :failover{true}, :serializer{Marshall}, :compressor{zlib}, :cache_nils{false}
       #     :namespace{nil}, :expires_in{0}, :compress{false} (separate from AS::C's same options above)
@@ -28,34 +29,42 @@ module ActiveSupport
           expires_in:         1.day,
           race_condition_ttl: 5.seconds,
           failover:           true,
-          pool_size:          ENV.fetch('RAILS_MAX_THREADS'){ 5 }.to_i,
         )
+        if ActiveSupport.version >= '7.1.0.a'
+          args[:pool] ||= {}
+          args[:pool][:size] ||= Integer(ENV.fetch('RAILS_MAX_THREADS'){ 5 })
+        else
+          args[:pool_size] ||= Integer(ENV.fetch('RAILS_MAX_THREADS'){ 5 })
+        end
         addresses.push Array(args.delete(:url)) if addresses.empty? && args.key?(:url)
         super(*addresses, args)
       end
 
 
-      # MemCacheStore#increment docs say it will init any invalid value to 0.
-      # In reality, it will only increment a pre-existing, raw value. everything else returns nil or an error.
-      # This fixes init of missing value on both increment() and decrement().
-      # Preexisting, invalid values still return errors.
+      if ActiveSupport.version < '7.1.0.a'
+        # MemCacheStore#increment docs say it will init any invalid value to 0.
+        # In reality, it will only increment a pre-existing, raw value. everything else returns nil or an error.
+        # This fixes init of missing value on both increment() and decrement().
+        # Preexisting, invalid values still return errors.
 
-      def increment(name, amount = 1, options = nil)
-        options = merged_options(options)
-        instrument(:increment, name, amount: amount) do
-          rescue_error_with nil do
-            @data.then { |c| c.incr(normalize_key(name, options), amount, options[:expires_in], amount) }
+        def increment(name, amount = 1, options = nil)
+          options = merged_options(options)
+          instrument(:increment, name, amount: amount) do
+            rescue_error_with nil do
+              @data.then { |c| c.incr(normalize_key(name, options), amount, options[:expires_in], amount) }
+            end
           end
         end
-      end
 
-      def decrement(name, amount = 1, options = nil)
-        options = merged_options(options)
-        instrument(:decrement, name, amount: amount) do
-          rescue_error_with nil do
-            @data.then { |c| c.decr(normalize_key(name, options), amount, options[:expires_in], 0) }
+        def decrement(name, amount = 1, options = nil)
+          options = merged_options(options)
+          instrument(:decrement, name, amount: amount) do
+            rescue_error_with nil do
+              @data.then { |c| c.decr(normalize_key(name, options), amount, options[:expires_in], 0) }
+            end
           end
         end
+
       end
 
     end

data/lib/active_support/cache/smart_redis_cache.rb

@@ -13,26 +13,34 @@ module ActiveSupport
 
       # known options:
       #   ActiveSupport::Cache - universal options
-      #     :namespace{nil}, :compress{true}, :compress_threshold{1k}, :expires_in{0}, :race_condition_ttl{0}
+      #     :namespace{nil}, :compress{true}, :compress_threshold{1k}, :coder, :expires_in{0}
+      #     :race_condition_ttl{0}, :skip_nil{false}
       #   ActiveSupport::Cache::Store
-      #     :pool_size{5}, :pool_timeout{5}
+      #     pool: {:size{5}, :timeout{5}}
+      #   ActiveSupport::Cache::RedisCacheStore
+      #     :error_handler
       #   Redis
       #     :host, :port, :db, :username, :password, :url, :path
       #     ssl_params: {:ca_file, :cert, :key}
       #     :sentinels, :role
-      #     :cluster, :replica
+      #     :replica
       #     :timeout (sets next 3), :connect_timeout, :read_timeout, :write_timeout
-      #     :reconnect_attempts, :reconnect_delay, :reconnect_delay_max
+      #     :reconnect_attempts
       def initialize(**args)
         args.reverse_merge!(
           namespace:          ENV['REDIS_NAMESPACE'],
           expires_in:         1.day,
           race_condition_ttl: 5.seconds,
-          pool_size:          ENV.fetch('RAILS_MAX_THREADS'){ 5 }.to_i,
           connect_timeout:    2,
           read_timeout:       1,
           write_timeout:      1,
         )
+        if ActiveSupport.version >= '7.1.0.a'
+          args[:pool] ||= {}
+          args[:pool][:size] ||= Integer(ENV.fetch('RAILS_MAX_THREADS'){ 5 })
+        else
+          args[:pool_size] ||= Integer(ENV.fetch('RAILS_MAX_THREADS'){ 5 })
+        end
         if Redis::VERSION >= '5'
           args.reverse_merge!(
             # when an array, contains delay for each reconnect attempt

data/lib/smart_cache_store/version.rb

@@ -1,3 +1,3 @@
 module SmartCacheStore
-  VERSION = '0.2.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_cache_store
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - thomas morgan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-06 00:00:00.000000000 Z
+date: 2023-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Production-ready enhancements for mem_cache_store and redis_cache_store