cacheflow 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6080f46e40efef7ff1bea205ff685aecd6057996c3b8dc98601883b22a323791
-  data.tar.gz: b78f678270ea70bdf0f55de264337302c39ecce2e9c62835bdd02aa8ab7b33d8
+  metadata.gz: dc96e1e878dacf8275f2113b546cfab2d64baa98df3187c6b828c6f5397e9d6a
+  data.tar.gz: 181f8cd6e5c6c0f1abd5a349d5ebef1892c31e609148577c6a262b1c4ba2c9f7
 SHA512:
-  metadata.gz: 1bb9f8cb1232710849b248a52abe2d85a223bfd49c8bf90b5d325102b1ea35e71363c52598d727e0cd2fa6ca9a6952127ce059aba59262cc1295dea3f585863e
-  data.tar.gz: 79febce9eafa8f777f4ca4c86a166be1e17c5cef655250d4fd12bfe3ccbcbae2d9f18bddf30ac15b50296a621796f80a10709b79b28bde4837f2188b8e6a1bee
+  metadata.gz: f174f62627d4c487ca492cf416cefa2369f713bfaefcac323ab6d0db8eae60aa29730af6d999db188f7a41c8413a4162fe6f4ed5a63aa773d72e9bfa1c1c17be
+  data.tar.gz: 1a58a047b78cc91760e7336bd3b014d716d01c7ccc8312ef5c8a045fdeaf5ebb1647a7b97b7e8136475a624215c4ba5e5dca8e13fba13333517d878203ab25df

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.0 (2022-09-05)
+
+- Added support for `redis` 5 and `redis-client` gems
+- Dropped support for Ruby < 2.7 and Active Support < 6
+
 ## 0.2.1 (2022-01-12)
 
 - Fixed deprecation warning with Dalli 3

data/README.md

@@ -2,8 +2,6 @@
 
 Colorized logging for Memcached and Redis
 
-![Screenshot](https://gist.githubusercontent.com/ankane/64d630db934c5222587794232a690864/raw/880b70fdbd2d11ccc8475f4616397184918852e8/console.png)
-
 Works with the Rails cache, as well as [Dalli](https://github.com/petergoldstein/dalli) and [Redis](https://github.com/redis/redis-rb) clients directly
 
 [![Build Status](https://github.com/ankane/cacheflow/workflows/build/badge.svg?branch=master)](https://github.com/ankane/cacheflow/actions)

data/lib/cacheflow/redis.rb

@@ -1,5 +1,27 @@
 module Cacheflow
   module Redis
+    # redis 5 / redis-client
+    module ClientNotifications
+      def call(command, redis_config)
+        payload = {
+          commands: [command]
+        }
+        ActiveSupport::Notifications.instrument("query.redis", payload) do
+          super
+        end
+      end
+
+      def call_pipelined(commands, redis_config)
+        payload = {
+          commands: commands
+        }
+        ActiveSupport::Notifications.instrument("query.redis", payload) do
+          super
+        end
+      end
+    end
+
+    # redis 4
     module Notifications
       def logging(commands)
         payload = {
@@ -28,5 +50,12 @@ module Cacheflow
   end
 end
 
-Redis::Client.prepend(Cacheflow::Redis::Notifications)
+if defined?(RedisClient)
+  RedisClient.register(Cacheflow::Redis::ClientNotifications)
+end
+
+if Redis::VERSION.to_i < 5
+  Redis::Client.prepend(Cacheflow::Redis::Notifications)
+end
+
 Cacheflow::Redis::Instrumenter.attach_to(:redis)

data/lib/cacheflow/version.rb

@@ -1,3 +1,3 @@
 module Cacheflow
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/cacheflow.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cacheflow
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-09-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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6'
 description:
 email: andrew@ankane.org
 executables: []
@@ -50,14 +50,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Colorized logging for Memcached and Redis