cacheflow 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc96e1e878dacf8275f2113b546cfab2d64baa98df3187c6b828c6f5397e9d6a
-  data.tar.gz: 181f8cd6e5c6c0f1abd5a349d5ebef1892c31e609148577c6a262b1c4ba2c9f7
+  metadata.gz: '0860f01c1abf80c54762bfdf0c80c191fa2ea956144958ffe4352a6fe0ad523c'
+  data.tar.gz: 519476b589957dc270569af29f7e57334f9ac7dff2cfa8d54771f531901a0d88
 SHA512:
-  metadata.gz: f174f62627d4c487ca492cf416cefa2369f713bfaefcac323ab6d0db8eae60aa29730af6d999db188f7a41c8413a4162fe6f4ed5a63aa773d72e9bfa1c1c17be
-  data.tar.gz: 1a58a047b78cc91760e7336bd3b014d716d01c7ccc8312ef5c8a045fdeaf5ebb1647a7b97b7e8136475a624215c4ba5e5dca8e13fba13333517d878203ab25df
+  metadata.gz: 2639a41bda572120361f2f8f13e5924478aa1a410931b2256679bc97e37869fb7439c57ab48ab577f8a0f82a1fc2c705df7d198b66d8ec7e19ce8ed9b081facd
+  data.tar.gz: 368024e42b9d7a838847ba671f9ce91079bbd0ea0f879b70702dd00c2cf84df61f0ef30b32c67c54a86d397a008f508f5373e39a16360c87471f2cfb75d6fcd3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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

data/LICENSE.txt

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

data/lib/cacheflow/redis.rb

@@ -52,9 +52,8 @@ end
 
 if defined?(RedisClient)
   RedisClient.register(Cacheflow::Redis::ClientNotifications)
-end
-
-if Redis::VERSION.to_i < 5
+elsif defined?(Redis)
+  # redis < 5
   Redis::Client.prepend(Cacheflow::Redis::Notifications)
 end
 

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.3.0"
+  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) || defined?(RedisClient)
+    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.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-05 00:00:00.000000000 Z
+date: 2023-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -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:
@@ -57,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Colorized logging for Memcached and Redis