redstream 0.3.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c563156ded6459fa0a2c4fcd317d3d5a128a72fe8f0732b358672efec718a3b
-  data.tar.gz: 41c68a6d61e4287d5bffca7bd9277f55ef203d804b609b87de4b85cc7185560c
+  metadata.gz: 400e4270e920ace54c661a275cf467c7f929a554b937999175d47198b8b403eb
+  data.tar.gz: e38676096310d5fb55f63d9e49971491e7a184cfb5d633390b7085bcb3762903
 SHA512:
-  metadata.gz: 812e8cb419ea1a301e462250f20c798f92db02726b46e8eb196e169e8f6dcede85023cbecaa7b9b476d1e18e9b8902bfa68d36b49813dd4dea8f37b202fe9b5b
-  data.tar.gz: e36a3fb9130992efd3cd812ac8b1368ab7dc056cc88016208ec83cc629077650aca935bb2d556396a47cc980f428515713de3bda61fd023867970d55e470755f
+  metadata.gz: 729fee0ff31002c70c83ff5428352e0d7818d8b333259adce8aa150da8748df10daf40c03e7b2b5c28ba0ac1f48dee516b1e35e6e7201652dbba653a4e84d1a4
+  data.tar.gz: dee5156c1df03d23d5fd9aafdb57b3bf8a8e2f2c983242e4feab970415aa2851b9203f8a77cee02a534e5c2571b360ecb6a3360aae81f06d90e291a2f4591a7c

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,14 @@
 # CHANGELOG
 
+## v0.4.2
+* Fix pipelining with redis-rb 4.6.0
+
+## 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
+
 ## v0.3.0
 * Pipeline deletion of delay messages
 

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
@@ -83,13 +83,13 @@ module Redstream
       @logger.debug "Delayed #{@batch.size} messages for #{@delay.to_f} seconds on stream #{@stream_name}"
 
       Redstream.connection_pool.with do |redis|
-        redis.pipelined do
+        redis.pipelined do |pipeline|
           @batch.each do |message|
-            redis.xadd Redstream.stream_key_name(@stream_name), payload: message.fields["payload"]
+            pipeline.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

@@ -70,9 +70,9 @@ module Redstream
     def bulk_delay(records)
       res = records.each_slice(250).flat_map do |slice|
         Redstream.connection_pool.with do |redis|
-          redis.pipelined do
+          redis.pipelined do |pipeline|
             slice.each do |object|
-              redis.xadd(Redstream.stream_key_name("#{stream_name(object)}.delay"), payload: JSON.dump(object.redstream_payload))
+              pipeline.xadd(Redstream.stream_key_name("#{stream_name(object)}.delay"), { payload: JSON.dump(object.redstream_payload) })
             end
           end
         end
@@ -90,14 +90,15 @@ module Redstream
     # Writes messages to a stream in redis for immediate retrieval.
     #
     # @param records [#to_a] The object/objects that will be updated deleted
+    # @param delay_message_ids [#to_a] The delay message ids to delete
 
-    def bulk_queue(records, delay_message_ids:)
+    def bulk_queue(records, delay_message_ids: nil)
       records.each_with_index.each_slice(250) do |slice|
         Redstream.connection_pool.with do |redis|
-          redis.pipelined do
+          redis.pipelined do |pipeline|
             slice.each do |object, index|
-              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
+              pipeline.xadd(Redstream.stream_key_name(stream_name(object)), { payload: JSON.dump(object.redstream_payload) })
+              pipeline.xdel(Redstream.stream_key_name("#{stream_name(object)}.delay"), delay_message_ids[index]) if delay_message_ids
             end
           end
         end
@@ -116,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
@@ -127,12 +128,13 @@ module Redstream
     # Writes a single message to a stream in redis for immediate retrieval.
     #
     # @param object The object hat will be updated, deleted, etc.
+    # @param delay_message_id The delay message id to delete
 
-    def queue(object, delay_message_id:)
+    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.xdel(Redstream.stream_key_name("#{stream_name(object)}.delay"), delay_message_id) if delay_message_id
+        redis.pipelined do |pipeline|
+          pipeline.xadd(Redstream.stream_key_name(stream_name(object)), { payload: JSON.dump(object.redstream_payload) })
+          pipeline.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.3.0"
+  VERSION = "0.4.2"
 end

data/redstream.gemspec

@@ -33,5 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
   spec.add_dependency "connection_pool"
   spec.add_dependency "json"
-  spec.add_dependency "redis", ">= 4.1.0"
+  spec.add_dependency "redis", ">= 4.6.0"
 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/producer_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Redstream::Producer do
 
       stream_key_name = Redstream.stream_key_name("products")
 
-      expect { Redstream::Producer.new.queue(product, delay_message_id: nil) }.to change { redis.xlen(stream_key_name) }.by(1)
+      expect { Redstream::Producer.new.queue(product) }.to change { redis.xlen(stream_key_name) }.by(1)
       expect(redis.xrange(stream_key_name, "-", "+").last[1]).to eq("payload" => JSON.dump(product.redstream_payload))
     end
 
@@ -99,7 +99,7 @@ RSpec.describe Redstream::Producer do
 
       stream_key_name = Redstream.stream_key_name("products")
 
-      expect { Redstream::Producer.new.bulk_queue(Product.all, delay_message_ids: nil) }.to change { redis.xlen(stream_key_name) }.by(2)
+      expect { Redstream::Producer.new.bulk_queue(Product.all) }.to change { redis.xlen(stream_key_name) }.by(2)
 
       messages = redis.xrange(stream_key_name, "-", "+").last(2).map { |message| message[1] }
 

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.3.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Benjamin Vetter
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.6.0
 description: Using redis streams to keep your primary database in sync with secondary
   datastores
 email:
@@ -274,7 +274,7 @@ homepage: https://github.com/mrkamel/redstream
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -289,8 +289,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Using redis streams to keep your primary database in sync with secondary
   datastores