cacheflow 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6080f46e40efef7ff1bea205ff685aecd6057996c3b8dc98601883b22a323791
-  data.tar.gz: b78f678270ea70bdf0f55de264337302c39ecce2e9c62835bdd02aa8ab7b33d8
+  metadata.gz: '0860f01c1abf80c54762bfdf0c80c191fa2ea956144958ffe4352a6fe0ad523c'
+  data.tar.gz: 519476b589957dc270569af29f7e57334f9ac7dff2cfa8d54771f531901a0d88
 SHA512:
-  metadata.gz: 1bb9f8cb1232710849b248a52abe2d85a223bfd49c8bf90b5d325102b1ea35e71363c52598d727e0cd2fa6ca9a6952127ce059aba59262cc1295dea3f585863e
-  data.tar.gz: 79febce9eafa8f777f4ca4c86a166be1e17c5cef655250d4fd12bfe3ccbcbae2d9f18bddf30ac15b50296a621796f80a10709b79b28bde4837f2188b8e6a1bee
+  metadata.gz: 2639a41bda572120361f2f8f13e5924478aa1a410931b2256679bc97e37869fb7439c57ab48ab577f8a0f82a1fc2c705df7d198b66d8ec7e19ce8ed9b081facd
+  data.tar.gz: 368024e42b9d7a838847ba671f9ce91079bbd0ea0f879b70702dd00c2cf84df61f0ef30b32c67c54a86d397a008f508f5373e39a16360c87471f2cfb75d6fcd3

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.3.1 (2023-02-15)
+
+- Fixed error with `redis-client`
+
+## 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/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2017-2022 Andrew Kane
+Copyright (c) 2017-2023 Andrew Kane
 
 MIT License
 

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,11 @@ module Cacheflow
   end
 end
 
-Redis::Client.prepend(Cacheflow::Redis::Notifications)
+if defined?(RedisClient)
+  RedisClient.register(Cacheflow::Redis::ClientNotifications)
+elsif defined?(Redis)
+  # redis < 5
+  Redis::Client.prepend(Cacheflow::Redis::Notifications)
+end
+
 Cacheflow::Redis::Instrumenter.attach_to(:redis)

data/lib/cacheflow/sidekiq.rb

@@ -0,0 +1,24 @@
+module Cacheflow
+  module Sidekiq
+    module ClassMethods
+      def redis(*_)
+        Cacheflow.silence do
+          super
+        end
+      end
+    end
+
+    module Client
+      module InstanceMethods
+        def push(*_)
+          Cacheflow.silence do
+            super
+          end
+        end
+      end
+    end
+  end
+end
+
+::Sidekiq.singleton_class.prepend(Cacheflow::Sidekiq::ClassMethods)
+::Sidekiq::Client.prepend(Cacheflow::Sidekiq::Client::InstanceMethods)

data/lib/cacheflow/version.rb

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

data/lib/cacheflow.rb

@@ -2,12 +2,12 @@
 require "active_support"
 
 # modules
-require "cacheflow/version"
+require_relative "cacheflow/version"
 
 module Cacheflow
   def self.activate
-    require "cacheflow/memcached" if defined?(Dalli)
-    require "cacheflow/redis" if defined?(Redis)
+    require_relative "cacheflow/memcached" if defined?(Dalli)
+    require_relative "cacheflow/redis" if defined?(Redis) || defined?(RedisClient)
   end
 
   def self.silenced?
@@ -25,33 +25,12 @@ module Cacheflow
   end
 
   def self.silence_sidekiq!
-    ::Sidekiq.singleton_class.prepend(Cacheflow::Sidekiq::ClassMethods)
-    ::Sidekiq::Client.prepend(Cacheflow::Sidekiq::Client::InstanceMethods)
-  end
-
-  module Sidekiq
-    module ClassMethods
-      def redis(*_)
-        Cacheflow.silence do
-          super
-        end
-      end
-    end
-
-    module Client
-      module InstanceMethods
-        def push(*_)
-          Cacheflow.silence do
-            super
-          end
-        end
-      end
-    end
+    require_relative "cacheflow/sidekiq"
   end
 end
 
 if defined?(Rails)
-  require "cacheflow/railtie"
+  require_relative "cacheflow/railtie"
 else
   Cacheflow.activate
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cacheflow
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2023-02-15 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: []
@@ -37,6 +37,7 @@ files:
 - lib/cacheflow/memcached.rb
 - lib/cacheflow/railtie.rb
 - lib/cacheflow/redis.rb
+- lib/cacheflow/sidekiq.rb
 - lib/cacheflow/version.rb
 homepage: https://github.com/ankane/cacheflow
 licenses:
@@ -50,14 +51,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.4.6
 signing_key:
 specification_version: 4
 summary: Colorized logging for Memcached and Redis