barrage 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f1e0b5da1bcf39c6afcd692da7a90d3784bd791a83d2553c62b23c522de5e71
-  data.tar.gz: 97c3f16796ab212ad5421d758fdf2773f040befde8170cf5682fa1607b84c84f
+  metadata.gz: 9f4e3f94545667fc55e7efb109d64c1e87f6a382d8ec7ced5f4076c7813f1ea7
+  data.tar.gz: e4e99afca1bf2b0c234349db437dc42fa439199ebce178053e86c9b512dd68bb
 SHA512:
-  metadata.gz: 8c0189dfdd3286230938d122dee87d56d7d41fdf2526115ba87f34c1bbe3ed276e37efe485e8cb8f18dad253bc0b9452f0997db08e5400c5ad690a42da267fe8
-  data.tar.gz: 2dff301124982ccec6670d36b53e1e2c48e9108c37eb80a559f85e6a371eccf89a682fcd5ff22485d23fbde51e9529914491f10cc5cf05b20244ecdb042c8e7f
+  metadata.gz: 6a538c813035749f2732aa3f445d24636af10980f99ebb6e3072de8a59b2ca194cdd58123e8704e85f78dd62eedefe073717fc324c8e5dbe53352ac536da2cda
+  data.tar.gz: f91dd3eed5970c31b19c42c24739aa396c0766349d25c090a8ee378e7914d2f4cab2ebf20f973376af191212ed250e6c61b772d6731f4b707cc8907d9ed22e87

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.2.0
+
+  * Compatible with Redis 5.0
+
 ## 0.1.1
 
   * Fix redis client disconnect

data/barrage.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport"
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 3.5.0"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "guard-rspec"

data/lib/barrage/generators/redis_worker_id.rb

@@ -50,6 +50,19 @@ class Barrage
 
           if redis.is_a?(Redis) and redis.connected?
             redis.del("barrage:worker:#{worker_id}") if real_ttl > Time.now.to_i
+
+            close_redis_connection(redis)
+          end
+        end
+
+        private
+
+        def close_redis_connection(redis)
+          redis_version = Gem.loaded_specs["redis"]&.version
+
+          if redis_version && redis_version >= Gem::Version.new("5.0.0")
+            redis._client.close
+          else
             redis._client.disconnect
           end
         end
@@ -63,7 +76,7 @@ class Barrage
         end
         new_worker_id = redis.evalsha(
           script_sha,
-          argv: [2 ** length, rand(2 ** length), @worker_id, ttl, RACE_CONDITION_TTL]
+          argv: [2 ** length, rand(2 ** length), (@worker_id || 0), ttl, RACE_CONDITION_TTL]
         )
         new_worker_id or raise StandardError, "Renew redis worker id failed"
         return new_worker_id.to_i

data/lib/barrage/version.rb

@@ -1,3 +1,3 @@
 class Barrage
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/barrage/generators/redis_worker_id_spec.rb

@@ -30,7 +30,7 @@ describe Barrage::Generators::RedisWorkerId do
     it { is_expected.to be < 2 ** length }
 
     context "on many instances" do
-      subject { 64.times.map { described_class.new(options) } }
+      subject { 3.times.map { described_class.new(options) } }
       let(:length) { 8 }
 
       it "should generate unique numbers" do
@@ -47,9 +47,6 @@ describe Barrage::Generators::RedisWorkerId do
   describe "#Finalizer" do
     subject { described_class::Finalizer.new(data).call(*args) }
 
-    before do
-      redis._client.connect
-    end
     let(:now) { Time.now.to_i }
     let(:ttl) { 300 }
     let(:redis) { Redis.new }
@@ -58,9 +55,26 @@ describe Barrage::Generators::RedisWorkerId do
     let(:data) { [redis, worker_ttl, real_ttl] }
     let(:args) { {} }
 
-    it "redis client disconnect" do
-      subject
-      expect(redis.connected?).to eq false
+    if Gem.loaded_specs["redis"]&.version >= Gem::Version.new("5.0.0")
+      before do
+        redis._client.send(:raw_connection)
+      end
+
+      it "redis client disconnect" do
+        subject
+
+        expect(redis.connected?).to be_nil
+      end
+    else
+      before do
+        redis._client.connect
+      end
+
+      it "redis client disconnect" do
+        subject
+
+        expect(redis.connected?).to eq false
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barrage
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - gussan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-24 00:00:00.000000000 Z
+date: 2022-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Distributed id generator