redstream 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 160386bd218415c11c556b1cdfc8824ed347e7279fac67f390c07b37c7128eff
-  data.tar.gz: '087e4ecaee15bd2f9db4367f53297a72f01c8de1cc093ae25ff3d4eb8ae29b90'
+  metadata.gz: cb01602a9b0e51f896989d59b5e2b16f333c7ea0317f31c5235696bc49145013
+  data.tar.gz: 747f63e94c847be8d371e60098f9348f30531587b821ac019c873c10d51dd766
 SHA512:
-  metadata.gz: d4d0945a2d2cb4b38dd398e5368963b5c8ba63aa93bc065bcb0c78a0e6bd7d2c0a7f825dd76b7b1d0ff79b6874bf1c3d0cb8f29843977d7676d341cfa584ed5d
-  data.tar.gz: b53bc33ce21244d64307b22f98185367e7c5806aeed9e50ed2b9dd123278b19236a049042bde26870dacd99702df49966674d1c629bf73ad955ff176f3f25a7b
+  metadata.gz: 19541261544b2d32168b8e290e402b5c9dedcf54868dee1dbb556bfa5cacf41a091fbff391605a734a6c1bf5eeaf6b33127660b190245166e1340a777c5e433d
+  data.tar.gz: 74426b36ca249b2da61f436f195d6811245038835492321009d063f78226cfdc7e099a4e17fe9910588ebc3f9bc6e21bec8e600959e0e5f8c2e77425ccda7023

data/.github/workflows/test.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.5', '2.6', '2.7']
+        ruby: ['2.5', '2.6', '2.7', '3.0']
     services:
       redis:
         image: redis

data/.rubocop.yml

@@ -1,6 +1,9 @@
 AllCops:
   NewCops: enable
 
+Gemspec/RequireMFA:
+  Enabled: false
+
 Lint/AssignmentInCondition:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## v0.4.1
+* Fix keyword argument usage of redis 4.5.1 in ruby 3
+
 ## v0.4.0
 * Make delay message id params in queue methods optional
 

data/lib/redstream/delayer.rb

@@ -48,7 +48,7 @@ module Redstream
     def run_once
       @consumer.run_once do |messages|
         messages.each do |message|
-          seconds_to_sleep = message.message_id.to_f / 1_000 + @delay.to_f - Time.now.to_f
+          seconds_to_sleep = (message.message_id.to_f / 1_000) + @delay.to_f - Time.now.to_f
 
           if seconds_to_sleep > 0
             if @batch.size > 0
@@ -85,11 +85,11 @@ module Redstream
       Redstream.connection_pool.with do |redis|
         redis.pipelined do
           @batch.each do |message|
-            redis.xadd Redstream.stream_key_name(@stream_name), payload: message.fields["payload"]
+            redis.xadd(Redstream.stream_key_name(@stream_name), { payload: message.fields["payload"] })
           end
         end
 
-        redis.xdel Redstream.stream_key_name("#{@stream_name}.delay"), @batch.map(&:message_id)
+        redis.xdel(Redstream.stream_key_name("#{@stream_name}.delay"), @batch.map(&:message_id))
       end
 
       @batch = []

data/lib/redstream/producer.rb

@@ -72,7 +72,7 @@ module Redstream
         Redstream.connection_pool.with do |redis|
           redis.pipelined do
             slice.each do |object|
-              redis.xadd(Redstream.stream_key_name("#{stream_name(object)}.delay"), payload: JSON.dump(object.redstream_payload))
+              redis.xadd(Redstream.stream_key_name("#{stream_name(object)}.delay"), { payload: JSON.dump(object.redstream_payload) })
             end
           end
         end
@@ -97,7 +97,7 @@ module Redstream
         Redstream.connection_pool.with do |redis|
           redis.pipelined do
             slice.each do |object, index|
-              redis.xadd(Redstream.stream_key_name(stream_name(object)), payload: JSON.dump(object.redstream_payload))
+              redis.xadd(Redstream.stream_key_name(stream_name(object)), { payload: JSON.dump(object.redstream_payload) })
               redis.xdel(Redstream.stream_key_name("#{stream_name(object)}.delay"), delay_message_ids[index]) if delay_message_ids
             end
           end
@@ -117,7 +117,7 @@ module Redstream
 
     def delay(object)
       Redstream.connection_pool.with do |redis|
-        res = redis.xadd(Redstream.stream_key_name("#{stream_name(object)}.delay"), payload: JSON.dump(object.redstream_payload))
+        res = redis.xadd(Redstream.stream_key_name("#{stream_name(object)}.delay"), { payload: JSON.dump(object.redstream_payload) })
         redis.wait(@wait, 0) if @wait
         res
       end
@@ -133,7 +133,7 @@ module Redstream
     def queue(object, delay_message_id: nil)
       Redstream.connection_pool.with do |redis|
         redis.pipelined do
-          redis.xadd(Redstream.stream_key_name(stream_name(object)), payload: JSON.dump(object.redstream_payload))
+          redis.xadd(Redstream.stream_key_name(stream_name(object)), { payload: JSON.dump(object.redstream_payload) })
           redis.xdel(Redstream.stream_key_name("#{stream_name(object)}.delay"), delay_message_id) if delay_message_id
         end
       end

data/lib/redstream/version.rb

@@ -1,3 +1,3 @@
 module Redstream
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/redstream/delayer_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path("../spec_helper", __dir__)
 RSpec.describe Redstream::Delayer do
   describe "#run_once" do
     it "copies expired messages to their target streams" do
-      redis.xadd Redstream.stream_key_name("target.delay"), payload: JSON.dump(value: "message")
+      redis.xadd(Redstream.stream_key_name("target.delay"), { payload: JSON.dump(value: "message") })
 
       expect(redis.xlen(Redstream.stream_key_name("target"))).to eq(0)
 
@@ -14,9 +14,9 @@ RSpec.describe Redstream::Delayer do
     end
 
     it "delivers and commit before falling asleep" do
-      redis.xadd Redstream.stream_key_name("target.delay"), payload: JSON.dump(value: "message")
+      redis.xadd(Redstream.stream_key_name("target.delay"), { payload: JSON.dump(value: "message") })
       sleep 3
-      redis.xadd Redstream.stream_key_name("target.delay"), payload: JSON.dump(value: "message")
+      redis.xadd(Redstream.stream_key_name("target.delay"), { payload: JSON.dump(value: "message") })
 
       thread = Thread.new do
         Redstream::Delayer.new(stream_name: "target", delay: 1).run_once
@@ -33,7 +33,7 @@ RSpec.describe Redstream::Delayer do
     end
 
     it "does not copy not yet expired messages" do
-      redis.xadd Redstream.stream_key_name("target.delay"), payload: JSON.dump(value: "message")
+      redis.xadd(Redstream.stream_key_name("target.delay"), { payload: JSON.dump(value: "message") })
 
       thread = Thread.new do
         Redstream::Delayer.new(stream_name: "target", delay: 2).run_once

data/spec/redstream/trimmer_spec.rb

@@ -4,11 +4,11 @@ RSpec.describe Redstream::Trimmer do
   describe "#run_once" do
     it "trims a stream to the minimum committed id" do
       ids = Array.new(4) do |i|
-        redis.xadd Redstream.stream_key_name("default"), payload: JSON.dump(value: "message#{i}")
+        redis.xadd(Redstream.stream_key_name("default"), { payload: JSON.dump(value: "message#{i}") })
       end
 
-      redis.set Redstream.offset_key_name(stream_name: "default", consumer_name: "consumer1"), ids[1]
-      redis.set Redstream.offset_key_name(stream_name: "default", consumer_name: "consumer2"), ids[2]
+      redis.set(Redstream.offset_key_name(stream_name: "default", consumer_name: "consumer1"), ids[1])
+      redis.set(Redstream.offset_key_name(stream_name: "default", consumer_name: "consumer2"), ids[2])
 
       trimmer = Redstream::Trimmer.new(
         interval: 5,

data/spec/redstream_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe Redstream do
     it "returns the stream's size" do
       expect(Redstream.stream_size("products")).to eq(0)
 
-      redis.xadd("redstream:stream:products", key: "value")
+      redis.xadd("redstream:stream:products", { key: "value" })
 
       expect(Redstream.stream_size("products")).to eq(1)
     end
@@ -44,8 +44,8 @@ RSpec.describe Redstream do
     it "returns the stream's max id" do
       expect(Redstream.max_stream_id("products")).to be_nil
 
-      _id1 = redis.xadd("redstream:stream:products", key: "value")
-      id2 = redis.xadd("redstream:stream:products", key: "value")
+      _id1 = redis.xadd("redstream:stream:products", { key: "value" })
+      id2 = redis.xadd("redstream:stream:products", { key: "value" })
 
       expect(Redstream.max_stream_id("products")).to eq(id2)
     end
@@ -55,8 +55,8 @@ RSpec.describe Redstream do
     it "returns the consumer's max id" do
       expect(Redstream.max_consumer_id(stream_name: "products", consumer_name: "consumer")).to be_nil
 
-      _id1 = redis.xadd("redstream:stream:products", key: "value")
-      id2 = redis.xadd("redstream:stream:products", key: "value")
+      _id1 = redis.xadd("redstream:stream:products", { key: "value" })
+      id2 = redis.xadd("redstream:stream:products", { key: "value" })
 
       Redstream::Consumer.new(name: "consumer", stream_name: "products").run_once do |messages|
         # nothing

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redstream
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -289,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Using redis streams to keep your primary database in sync with secondary