cacheflow 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e6ffed7d088f3de6a86a75e4ee7e5faf48d51c27fe490b935379f019af402a5
-  data.tar.gz: 5e9401eab9c1946eff3a97939e35143635a0c5ab919e3df37e2e4eea3e6991fa
+  metadata.gz: 83e311f4b1bb6c8bd7a57b7163409bee62be374072bf51ec1177751d1d6e1469
+  data.tar.gz: 4df0794c70e520f454d6fa7a0f1369fce78abed94e664dc86513005e60c2a159
 SHA512:
-  metadata.gz: 13452dc5badcff289a394f6eeee400a5b560475d1504c89ddaeaa60459eca2c78823bf5cfdf425395d74602c824e3901b707a0e4dfbc8745ea8d17a776777371
-  data.tar.gz: 5ac6596190d7e9d41e0db4af9931d7a16439cac9b274ffa7747bde6f9687f6add0b36d9c35dd26a5dc8e20ab7949fdd899d37cb060d3fe16d3e2b60e42b926b3
+  metadata.gz: 06cb724109dcf6061f6a3635564e8438bfe0100545232d19e99a8980a9325ffe1ee8d1d9d541a70414131c376989c984802fcd80736cf43063e13da943c1ef64
+  data.tar.gz: 9da38e3824cccee4a0cb45534d7f2ef94609e8ed4bc4ce59eb81518101688286c11d355d489f4891334d5a582d84e121415f3400476b6d4ae0809b0cda6d9278

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.6.0 (2026-04-01)
+
+- Added support for Dalli 5
+- Fixed `silence_sidekiq!` method for Sidekiq 7+
+- Dropped support for `redis` < 5
+- Dropped support for Ruby < 3.3 and Active Support < 7.2
+
 ## 0.5.0 (2025-05-05)
 
 - Dropped support for Ruby < 3.2 and Active Support < 7.1

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2017-2025 Andrew Kane
+Copyright (c) 2017-2026 Andrew Kane
 
 MIT License
 

data/README.md

@@ -2,7 +2,7 @@
 
 Colorized logging for Memcached, Redis, and Valkey
 
-Works with the Rails cache, as well as [Dalli](https://github.com/petergoldstein/dalli) and [Redis](https://github.com/redis/redis-rb) clients directly
+Works with the Rails cache, as well as [Dalli](https://github.com/petergoldstein/dalli), [Redis](https://github.com/redis/redis-rb), and [RedisClient](https://github.com/redis-rb/redis-client) clients directly
 
 [![Build Status](https://github.com/ankane/cacheflow/actions/workflows/build.yml/badge.svg)](https://github.com/ankane/cacheflow/actions)
 
@@ -26,7 +26,7 @@ Cacheflow.silence do
 end
 ```
 
-To silence logging for [Sidekiq](https://github.com/mperham/sidekiq) commands, create an initializer with:
+To silence logging for [Sidekiq](https://github.com/sidekiq/sidekiq) commands, create an initializer with:
 
 ```ruby
 Cacheflow.silence_sidekiq!
@@ -34,7 +34,7 @@ Cacheflow.silence_sidekiq!
 
 ## Data Protection
 
-If you use Cacheflow in an environment with [personal data](https://en.wikipedia.org/wiki/Personally_identifiable_information) and store that data in Memcached, Redis, or Valkey, it can end up in your app logs. To avoid this, silence logging for those calls.
+If you use Cacheflow in an environment with [personal data](https://en.wikipedia.org/wiki/Personal_data) and store that data in Memcached, Redis, or Valkey, it can end up in your app logs. To avoid this, silence logging for those calls.
 
 ## History
 

data/lib/cacheflow/memcached.rb

@@ -23,9 +23,12 @@ module Cacheflow
   end
 end
 
+if defined?(Dalli::Protocol::Meta)
+  Dalli::Protocol::Meta.prepend(Cacheflow::Memcached::Notifications)
+end
+
 if defined?(Dalli::Protocol::Binary)
   Dalli::Protocol::Binary.prepend(Cacheflow::Memcached::Notifications)
-else
-  Dalli::Server.prepend(Cacheflow::Memcached::Notifications)
 end
+
 Cacheflow::Memcached::Instrumenter.attach_to(:memcached)

data/lib/cacheflow/redis.rb

@@ -1,6 +1,5 @@
 module Cacheflow
   module Redis
-    # redis 5 / redis-client
     module ClientNotifications
       def call(command, redis_config)
         payload = {
@@ -21,18 +20,6 @@ module Cacheflow
       end
     end
 
-    # redis 4
-    module Notifications
-      def logging(commands)
-        payload = {
-          commands: commands
-        }
-        ActiveSupport::Notifications.instrument("query.redis", payload) do
-          super
-        end
-      end
-    end
-
     class Instrumenter < ActiveSupport::LogSubscriber
       def query(event)
         return if !logger.debug? || Cacheflow.silenced?
@@ -50,11 +37,5 @@ module Cacheflow
   end
 end
 
-if defined?(RedisClient)
-  RedisClient.register(Cacheflow::Redis::ClientNotifications)
-elsif defined?(Redis)
-  # redis < 5
-  Redis::Client.prepend(Cacheflow::Redis::Notifications)
-end
-
+RedisClient.register(Cacheflow::Redis::ClientNotifications)
 Cacheflow::Redis::Instrumenter.attach_to(:redis)

data/lib/cacheflow/sidekiq.rb

@@ -1,7 +1,7 @@
 module Cacheflow
   module Sidekiq
-    module ClassMethods
-      def redis(*_)
+    module InstanceMethods
+      def redis(...)
         Cacheflow.silence do
           super
         end
@@ -10,7 +10,7 @@ module Cacheflow
 
     module Client
       module InstanceMethods
-        def push(*_)
+        def push(...)
           Cacheflow.silence do
             super
           end
@@ -20,5 +20,9 @@ module Cacheflow
   end
 end
 
-::Sidekiq.singleton_class.prepend(Cacheflow::Sidekiq::ClassMethods)
+if defined?(::Sidekiq::Capsule)
+  ::Sidekiq::Capsule.prepend(Cacheflow::Sidekiq::InstanceMethods)
+end
+
+::Sidekiq::Config.prepend(Cacheflow::Sidekiq::InstanceMethods)
 ::Sidekiq::Client.prepend(Cacheflow::Sidekiq::Client::InstanceMethods)

data/lib/cacheflow/version.rb

@@ -1,3 +1,3 @@
 module Cacheflow
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/cacheflow.rb

@@ -7,7 +7,7 @@ require_relative "cacheflow/version"
 module Cacheflow
   def self.activate
     require_relative "cacheflow/memcached" if defined?(Dalli)
-    require_relative "cacheflow/redis" if defined?(Redis) || defined?(RedisClient)
+    require_relative "cacheflow/redis" if defined?(RedisClient)
   end
 
   def self.silenced?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cacheflow
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Andrew Kane
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 email: andrew@ankane.org
 executables: []
 extensions: []
@@ -48,14 +48,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Colorized logging for Memcached, Redis, and Valkey
 test_files: []