smart_cache_store 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5afc7011d21ae7f81c857be6283535b4d036eb126a2a890412c1f98fca5f914a
-  data.tar.gz: cdc421218f4a6963adbd0f7074c83cfa277d3986f29915482b45dc5ff911e8c0
+  metadata.gz: a4bdb9fe3fd3e37388a3acf6b3baf5add0cc5b54fc1a6ba0092c99c1526226b3
+  data.tar.gz: 7ff024a2499dd5df7f42bdcbe9f6422eed0e50970e2a146d3d09c35b1fdd9bc6
 SHA512:
-  metadata.gz: 70b98d97da2015b7fd4512cf40fdf89aa0b1f3de7b70193cc7db315aaca6055d2754c4dbcd0c465018f9db3866faa48387c76d47eecab9914128f956c2bad5a1
-  data.tar.gz: '08e1b0c805e7343bf4b07cadbb0703ae7d1383888175246b526f89c85f2cda95f707fae42b7c36712c7d96b4eb7c68bae1d78afb5f0adc8597a6588bb9c4bfd7'
+  metadata.gz: 66f840e0521852e358d1be01c186545f0bc920ded0e4509e211111d2f9a142b7464de4fc7032ef3c1d32fc714f4f2fb80593f8eccdd7d584ef6d0bae384c571c
+  data.tar.gz: d15389db9cd657838aca3e8fd903e5a1e7a80c978aaca4ee710191acac5b8f5abf7b23a49631ac86efe2b78f6a4d16fc402f96c45d4f1832ebc8d6cf8912adf5

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright 2021 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,12 +11,11 @@ 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
-    reconnect_attempts: 1
-    reconnect_delay:    0.2
+    reconnect_attempts: [0.2]
 
 `:url` should be a uri, like: `redis://localhost:6379/0`. For two or more uris, combine with a comma: `redis://host-a,redis://host-b`.
 
@@ -32,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.
 
@@ -67,9 +66,13 @@ In `environment/[env].rb`:
 
 
 ## Installation
-Add this line to your application's Gemfile:
+Add `smart_cache_store` plus one driver to your application's Gemfile:
 
 ```ruby
+gem 'redis' # for redis; gem v4.x or 5.x
+# OR
+gem 'dalli' # for memcache
+
 gem "smart_cache_store"
 ```
 

data/lib/active_support/cache/smart_mem_cache.rb

@@ -17,7 +17,7 @@ module ActiveSupport
       #   ActiveSupport::Cache - universal options
       #     :namespace{nil}, :compress{true}, :compress_threshold{1k}, :expires_in{0}, :race_condition_ttl{0}
       #   ActiveSupport::Cache::Store
-      #     :pool_size{5}, :pool_timeout{5}
+      #     :pool{5}, :pool_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 +28,38 @@ module ActiveSupport
           expires_in:         1.day,
           race_condition_ttl: 5.seconds,
           failover:           true,
-          pool_size:          ENV.fetch('RAILS_MAX_THREADS'){ 5 }.to_i,
+          pool:               ENV.fetch('RAILS_MAX_THREADS'){ 5 }.to_i,
         )
+        args.reverse_merge!(pool_size: args.delete(:pool)) if ActiveSupport.version < '7.1.0.a'
         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.with { |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.with { |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

@@ -15,26 +15,36 @@ module ActiveSupport
       #   ActiveSupport::Cache - universal options
       #     :namespace{nil}, :compress{true}, :compress_threshold{1k}, :expires_in{0}, :race_condition_ttl{0}
       #   ActiveSupport::Cache::Store
-      #     :pool_size{5}, :pool_timeout{5}
+      #     :pool{5}, :pool_timeout{5}
       #   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,
+          pool:               ENV.fetch('RAILS_MAX_THREADS'){ 5 }.to_i,
           connect_timeout:    2,
           read_timeout:       1,
           write_timeout:      1,
-          reconnect_attempts: 1,
-          reconnect_delay:    0.2,
         )
+        args.reverse_merge!(pool_size: args.delete(:pool)) if ActiveSupport.version < '7.1.0.a'
+        if Redis::VERSION >= '5'
+          args.reverse_merge!(
+            # when an array, contains delay for each reconnect attempt
+            reconnect_attempts: [0.2]
+          )
+        else
+          args.reverse_merge!(
+            reconnect_attempts: 1,
+            reconnect_delay:    0.2,
+          )
+        end
         args[:url] ||= ENV['REDIS_URL'] unless args.key?(:redis) || args.key?(:url)
         args[:url] = args[:url].split(',') if args[:url].is_a?(String)
         super(**args)

data/lib/smart_cache_store/version.rb

@@ -1,3 +1,3 @@
 module SmartCacheStore
-  VERSION = '0.1.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_cache_store
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - thomas morgan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-18 00:00:00.000000000 Z
+date: 2023-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,7 +24,22 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-description:
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.4
+description: Production-ready enhancements for mem_cache_store and redis_cache_store.
+  For Rails or ActiveSupport.
 email:
 - tm@iprog.com
 executables: []
@@ -60,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Production-ready enhancements for mem_cache_store and redis_cache_store