smart_cache_store 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4bdb9fe3fd3e37388a3acf6b3baf5add0cc5b54fc1a6ba0092c99c1526226b3
-  data.tar.gz: 7ff024a2499dd5df7f42bdcbe9f6422eed0e50970e2a146d3d09c35b1fdd9bc6
+  metadata.gz: 1880ca4e20a7e99d8a3241e895a9e8405f17faf2e1d28ddede62b8acde1d4c16
+  data.tar.gz: 9e7d77179cd5c0b020a583b92256b7900fe886cb054947e4e84eaead557f8833
 SHA512:
-  metadata.gz: 66f840e0521852e358d1be01c186545f0bc920ded0e4509e211111d2f9a142b7464de4fc7032ef3c1d32fc714f4f2fb80593f8eccdd7d584ef6d0bae384c571c
-  data.tar.gz: d15389db9cd657838aca3e8fd903e5a1e7a80c978aaca4ee710191acac5b8f5abf7b23a49631ac86efe2b78f6a4d16fc402f96c45d4f1832ebc8d6cf8912adf5
+  metadata.gz: 31630bf7314ebf8b6b065e885e2604b1faa9e50444d7f5aef361260a570e208fb0b412e7f942dc151c5547eb0e3bfd02344ee261b6b3af35af0d8fc43e7792c7
+  data.tar.gz: 1e0b2ce48c0c902bcf5ebaab820e0bdc84d482ee6a22c51fcb017b91e8581ed445c12ac0b0b38aca191e28296ef28c641630bafd08a7d97297038fa0e4f8b0d3

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

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 = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_cache_store
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - thomas morgan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-07 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.3.26
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Production-ready enhancements for mem_cache_store and redis_cache_store