smart_cache_store 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4bdb9fe3fd3e37388a3acf6b3baf5add0cc5b54fc1a6ba0092c99c1526226b3
-  data.tar.gz: 7ff024a2499dd5df7f42bdcbe9f6422eed0e50970e2a146d3d09c35b1fdd9bc6
+  metadata.gz: ed085fd68dc9527609bc2cf5cc538b40e902638155b202e485dac2db92f5c27b
+  data.tar.gz: b2281c651f5fbfd6f9c3c4feaaeafd7246075a1f001fe9a6d69ccc0af5aebc2a
 SHA512:
-  metadata.gz: 66f840e0521852e358d1be01c186545f0bc920ded0e4509e211111d2f9a142b7464de4fc7032ef3c1d32fc714f4f2fb80593f8eccdd7d584ef6d0bae384c571c
-  data.tar.gz: d15389db9cd657838aca3e8fd903e5a1e7a80c978aaca4ee710191acac5b8f5abf7b23a49631ac86efe2b78f6a4d16fc402f96c45d4f1832ebc8d6cf8912adf5
+  metadata.gz: 403228a667e55a3eecf3f619df9d6e30d26be0da899323396429d33d58e9adf6ddc6f90dc7b9afd6100d3dc9543031be72266c72e3b18a45b6fb59ccdd70c9ad
+  data.tar.gz: 0c6a0c160ffbec240e190ac032f27dd6dbb7ad7924e0c9b031693c962af98dc17727fe4787cd2825b73ae1464611d72479554ef14bc386345f75f23ce899b307

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{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,9 +29,13 @@ module ActiveSupport
           expires_in:         1.day,
           race_condition_ttl: 5.seconds,
           failover:           true,
-          pool:               ENV.fetch('RAILS_MAX_THREADS'){ 5 }.to_i,
         )
-        args.reverse_merge!(pool_size: args.delete(:pool)) if ActiveSupport.version < '7.1.0.a'
+        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
@@ -46,7 +51,7 @@ module ActiveSupport
           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) }
+              @data.with { |c| c.incr(normalize_key(name, options), amount, options[:expires_in], amount) }
             end
           end
         end
@@ -55,7 +60,7 @@ module ActiveSupport
           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) }
+              @data.with { |c| c.decr(normalize_key(name, options), amount, options[:expires_in], 0) }
             end
           end
         end

data/lib/active_support/cache/smart_redis_cache.rb

@@ -13,9 +13,12 @@ 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{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}
@@ -28,12 +31,16 @@ module ActiveSupport
           namespace:          ENV['REDIS_NAMESPACE'],
           expires_in:         1.day,
           race_condition_ttl: 5.seconds,
-          pool:               ENV.fetch('RAILS_MAX_THREADS'){ 5 }.to_i,
           connect_timeout:    2,
           read_timeout:       1,
           write_timeout:      1,
         )
-        args.reverse_merge!(pool_size: args.delete(:pool)) if ActiveSupport.version < '7.1.0.a'
+        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.3.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_cache_store
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - thomas morgan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-07 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Production-ready enhancements for mem_cache_store and redis_cache_store