redstream 0.4.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e25cd9c9c13d7fe93e81207a7608599e37c72a39425b54108c7178b3e97917f3
-  data.tar.gz: 5a5179bf6de8ef24effa908595a32bbcccd9c5c717988ce25a0f38aa128b6cab
+  metadata.gz: 20db64a5cecd9accc59e117b19ecd608236d0dfae1c177c47aff0079335ead7d
+  data.tar.gz: 34f383997e4e15a1ce03c83650445b20683b00a6adefcae01248525087fa90a9
 SHA512:
-  metadata.gz: adee0c463fb89d9f112b3bc374c25fcb7fe60819f18952133df3afe789bcbabca5fcc184d144b5dff8db747098b2c8953cb440be474d6dd1df4ed004fd1e6467
-  data.tar.gz: 430b4df8d3095e9375320f9fbfa83aa24615bf2d6b19c2deba663fb69db3806a664dddd83c3f98f5f26b28c8de603f69d8ed926943043be905771d16595dc10e
+  metadata.gz: 911800fad8f34ce373e3edd884ce45c1804bd82ea2c0d0ae14b69fbc2f8e998aa19210db6ddb65c14ffb1af9daf03164269f8da4a913364eaf8c3f471e88f013
+  data.tar.gz: 3e3b9b0651c4a6d8d4f570df68d8e2ea982a3109450cf62b7f7fc02ebe7b05d3652a136016ea800e2a66ccb0059a59d2a6b703b6804803093c8030c1ac2cbc31

data/.github/workflows/test.yml

@@ -5,10 +5,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.5', '2.6', '2.7', '3.0']
+        ruby: ['2.7', '3.0', '3.2']
         redis:
           - redis:5.0
           - redis:6.0
+          - redis:7.0
     services:
       redis:
         image: ${{ matrix.redis }}
@@ -16,7 +17,7 @@ jobs:
           - 6379:6379
     steps:
     - uses: actions/checkout@v1
-    - uses: actions/setup-ruby@v1
+    - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
     - uses: actions/cache@v1
@@ -25,7 +26,6 @@ jobs:
         path: vendor/bundler
         key: ${{ hashFiles('Gemfile.lock') }}-${{ matrix.ruby }}
     - run: |
-        gem install bundler
         bundle install --path=vendor/bundler
         bundle exec rspec
         bundle exec rubocop

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## v0.6.0
+* Allow sharding records into multiple streams
+
+## v0.5.0
+* No longer delete delay messages
+
 ## v0.4.4
 * Remove deletion of delay messages after queues messages are sent from `.bulk`
 

data/Gemfile

@@ -1,3 +1,15 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem "activerecord"
+gem "bundler"
+gem "concurrent-ruby"
+gem "database_cleaner"
+gem "factory_bot"
+gem "rake"
+gem "rspec"
+gem "rspec-instafail"
+gem "rubocop"
+gem "sqlite3"
+gem "timecop"

data/README.md

@@ -97,9 +97,7 @@ any errors occurring in between `after_save` and `after_commit` result in
 inconsistencies between your primary and secondary datastore. By using these
 kinds of "delay" messages triggered by `after_save` and fetched after e.g. 5
 minutes, errors occurring in between `after_save` and `after_commit` can be
-fixed when the delay message get processed. Please note that redstream deletes
-delay messages after the messages for immediate retrieval have been
-successfully sent, such that messages will not be processed twice, usually.
+fixed when the delay message get processed.
 
 Any messages are fetched in batches, such that e.g. elasticsearch can be
 updated using its bulk API. For instance, depending on which elasticsearch ruby
@@ -233,6 +231,33 @@ array of records to `Redstream::Producer#bulk`, like shown above. If you pass
 an `ActiveRecord::Relation`, the `#bulk` method will convert it to an array,
 i.e. load the whole result set into memory.
 
+## Sharding
+
+When you want to attach multiple consumers to a single stream, you maybe want
+to add sharding. This can be accomplished by specifying a dynamic stream name
+where you compute the shard key by hashing the primary key.
+
+```ruby
+class Product < ActiveRecord::Base
+  include Redstream::Model
+
+  NUM_SHARDS = 4
+
+  def self.redstream_name(shard)
+    "products-#{shard}"
+  end
+
+  def redstream_name
+    self.class.redstream_name(Digest::SHA1.hexdigest(id.to_s)[0, 4].to_i(16) % NUM_SHARDS)
+  end
+end
+```
+
+The sharding via hashing the primary key is neccessary, because we want each
+change of a specific object to end up in the same stream. Otherwise the order
+of changes for a specific object gets mixed up. Subsequently, you can add
+consumers, etc for each individual stream name.
+
 ## Namespacing
 
 In case you are using a shared redis, where multiple appications read/write

data/lib/redstream/consumer.rb

@@ -90,7 +90,7 @@ module Redstream
         commit offset
       end
 
-      sleep(5) unless got_lock
+      @lock.wait(5) unless got_lock
     rescue StandardError => e
       @logger.error e
 

data/lib/redstream/lock.rb

@@ -21,6 +21,21 @@ module Redstream
   #   end
 
   class Lock
+    class Signal
+      def initialize
+        @mutex = Mutex.new
+        @condition_variable = ConditionVariable.new
+      end
+
+      def wait(timeout)
+        @mutex.synchronize { @condition_variable.wait(@mutex, timeout) }
+      end
+
+      def signal
+        @condition_variable.signal
+      end
+    end
+
     def initialize(name:)
       @name = name
       @id = SecureRandom.hex
@@ -28,33 +43,45 @@ module Redstream
 
     def acquire(&block)
       got_lock = get_lock
-      keep_lock(&block) if got_lock
+
+      if got_lock
+        keep_lock(&block)
+        release_lock
+      end
+
       got_lock
     end
 
+    def wait(timeout)
+      @wait_redis ||= Redstream.connection_pool.with(&:dup)
+      @wait_redis.brpop("#{Redstream.lock_key_name(@name)}.notify", timeout: timeout)
+    end
+
     private
 
     def keep_lock(&block)
-      stop = false
-      mutex = Mutex.new
+      stopped = false
+      signal = Signal.new
 
-      Thread.new do
-        until mutex.synchronize { stop }
-          Redstream.connection_pool.with { |redis| redis.expire(Redstream.lock_key_name(@name), 5) }
+      thread = Thread.new do
+        until stopped
+          Redstream.connection_pool.with do |redis|
+            redis.expire(Redstream.lock_key_name(@name), 5)
+          end
 
-          sleep 3
+          signal.wait(3)
         end
       end
 
       block.call
     ensure
-      mutex.synchronize do
-        stop = true
-      end
+      stopped = true
+      signal&.signal
+      thread&.join
     end
 
     def get_lock
-      @get_lock_script = <<~GET_LOCK_SCRIPT
+      @get_lock_script = <<~SCRIPT
         local lock_key_name, id = ARGV[1], ARGV[2]
 
         local cur = redis.call('get', lock_key_name)
@@ -70,9 +97,30 @@ module Redstream
         end
 
         return false
-      GET_LOCK_SCRIPT
+      SCRIPT
+
+      Redstream.connection_pool.with do |redis|
+        redis.eval(@get_lock_script, argv: [Redstream.lock_key_name(@name), @id])
+      end
+    end
+
+    def release_lock
+      @release_lock_script = <<~SCRIPT
+        local lock_key_name, id = ARGV[1], ARGV[2]
 
-      Redstream.connection_pool.with { |redis| redis.eval(@get_lock_script, argv: [Redstream.lock_key_name(@name), @id]) }
+        local cur = redis.call('get', lock_key_name)
+
+        if cur and cur == id then
+          redis.call('del', lock_key_name)
+        end
+
+        redis.call('del', lock_key_name .. '.notify')
+        redis.call('rpush', lock_key_name .. '.notify', '1')
+      SCRIPT
+
+      Redstream.connection_pool.with do |redis|
+        redis.eval(@release_lock_script, argv: [Redstream.lock_key_name(@name), @id])
+      end
     end
   end
 end

data/lib/redstream/model.rb

@@ -12,8 +12,6 @@ module Redstream
   #   end
 
   module Model
-    IVAR_DELAY_MESSAGE_ID = :@__redstream_delay_message_id__
-
     def self.included(base)
       base.extend(ClassMethods)
     end
@@ -31,20 +29,16 @@ module Redstream
       #   responsible for writing to a redis stream
 
       def redstream_callbacks(producer: Producer.new)
-        after_save    { |object| instance_variable_set(IVAR_DELAY_MESSAGE_ID, producer.delay(object)) if object.saved_changes.present? }
-        after_touch   { |object| instance_variable_set(IVAR_DELAY_MESSAGE_ID, producer.delay(object)) }
-        after_destroy { |object| instance_variable_set(IVAR_DELAY_MESSAGE_ID, producer.delay(object)) }
+        after_save    { |object| producer.delay(object) if object.saved_changes.present? }
+        after_touch   { |object| producer.delay(object) }
+        after_destroy { |object| producer.delay(object) }
 
         after_commit(on: [:create, :update]) do |object|
-          if object.saved_changes.present?
-            producer.queue(object, delay_message_id: instance_variable_get(IVAR_DELAY_MESSAGE_ID))
-            instance_variable_set(IVAR_DELAY_MESSAGE_ID, nil)
-          end
+          producer.queue(object) if object.saved_changes.present?
         end
 
         after_commit(on: :destroy) do |object|
-          producer.queue(object, delay_message_id: instance_variable_get(IVAR_DELAY_MESSAGE_ID))
-          instance_variable_set(IVAR_DELAY_MESSAGE_ID, nil)
+          producer.queue(object)
         end
       end
 
@@ -64,5 +58,28 @@ module Redstream
     def redstream_payload
       { id: id }
     end
+
+    # Override to customize the stream name. By default, the stream name
+    # is determined by the class name. If you override the instance method,
+    # please also override the class method.
+    #
+    # @example Sharding
+    #   class Product
+    #     include Redstream::Model
+    #
+    #     NUM_SHARDS = 4
+    #
+    #     def redstream_name
+    #       self.class.redstream_name(Digest::SHA1.hexdigest(id.to_s)[0, 4].to_i(16) % NUM_SHARDS)
+    #     end
+    #
+    #     def self.redstream_name(shard)
+    #       "products-#{shard}
+    #     end
+    #   end
+
+    def redstream_name
+      self.class.redstream_name
+    end
   end
 end

data/lib/redstream/producer.rb

@@ -31,7 +31,6 @@ module Redstream
 
     def initialize(wait: false)
       @wait = wait
-      @stream_name_cache = {}
 
       super()
     end
@@ -72,7 +71,7 @@ module Redstream
         Redstream.connection_pool.with do |redis|
           redis.pipelined do |pipeline|
             slice.each do |object|
-              pipeline.xadd(Redstream.stream_key_name("#{stream_name(object)}.delay"), { payload: JSON.dump(object.redstream_payload) })
+              pipeline.xadd(Redstream.stream_key_name("#{object.redstream_name}.delay"), { payload: JSON.dump(object.redstream_payload) })
             end
           end
         end
@@ -96,7 +95,7 @@ module Redstream
         Redstream.connection_pool.with do |redis|
           redis.pipelined do |pipeline|
             slice.each do |object|
-              pipeline.xadd(Redstream.stream_key_name(stream_name(object)), { payload: JSON.dump(object.redstream_payload) })
+              pipeline.xadd(Redstream.stream_key_name(object.redstream_name), { payload: JSON.dump(object.redstream_payload) })
             end
           end
         end
@@ -115,7 +114,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("#{object.redstream_name}.delay"), { payload: JSON.dump(object.redstream_payload) })
         redis.wait(@wait, 0) if @wait
         res
       end
@@ -126,25 +125,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: nil)
+    def queue(object)
       Redstream.connection_pool.with do |redis|
-        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
+        redis.xadd(Redstream.stream_key_name(object.redstream_name), { payload: JSON.dump(object.redstream_payload) })
       end
 
       true
     end
-
-    private
-
-    def stream_name(object)
-      synchronize do
-        @stream_name_cache[object.class] ||= object.class.redstream_name
-      end
-    end
   end
 end

data/lib/redstream/version.rb

@@ -1,3 +1,3 @@
 module Redstream
-  VERSION = "0.4.4"
+  VERSION = "0.6.0"
 end

data/redstream.gemspec

@@ -16,19 +16,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "activerecord"
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "concurrent-ruby"
-  spec.add_development_dependency "database_cleaner"
-  spec.add_development_dependency "factory_bot"
-  spec.add_development_dependency "mocha"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rspec-instafail"
-  spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "timecop"
-
   spec.add_dependency "activesupport"
   spec.add_dependency "connection_pool"
   spec.add_dependency "json"

data/spec/redstream/consumer_spec.rb

@@ -86,5 +86,44 @@ RSpec.describe Redstream::Consumer do
 
       expect(redis.get(Redstream.offset_key_name(stream_name: "products", consumer_name: "consumer"))).to eq(all_messages.last[0])
     end
+
+    it "does not starve" do
+      product = create(:product)
+      stopped = false
+      results = Concurrent::Array.new
+
+      thread1 = Thread.new do
+        until stopped
+          Redstream::Consumer.new(name: "consumer", stream_name: "products").run_once do
+            results.push("thread1")
+
+            product.touch
+
+            sleep 0.1
+          end
+        end
+      end
+
+      thread2 = Thread.new do
+        until stopped
+          Redstream::Consumer.new(name: "consumer", stream_name: "products").run_once do
+            results.push("thread2")
+
+            product.touch
+
+            sleep 0.1
+          end
+        end
+      end
+
+      sleep 6
+
+      stopped = true
+      [thread1, thread2].each(&:join)
+
+      expect(results.size).to be > 10
+      expect(results.count("thread1").to_f / results.size).to be > 0.2
+      expect(results.count("thread2").to_f / results.size).to be > 0.2
+    end
   end
 end

data/spec/redstream/lock_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe Redstream::Lock do
         end
       end
 
-      sleep 6
+      sleep 5
 
       threads << Thread.new do
         Redstream::Lock.new(name: "lock").acquire do
@@ -62,5 +62,87 @@ RSpec.describe Redstream::Lock do
       expect(calls).to eq(2)
       expect(lock_results).to eq([1, 1])
     end
+
+    it "releases the lock and notifies" do
+      lock = Redstream::Lock.new(name: "lock")
+
+      expect(redis.llen("#{Redstream.lock_key_name("lock")}.notify")).to eq(0)
+
+      lock.acquire do
+        # nothing
+      end
+
+      expect(redis.exists?(Redstream.lock_key_name("lock"))).to eq(false)
+      expect(redis.llen("#{Redstream.lock_key_name("lock")}.notify")).to eq(1)
+    end
+
+    it "does not release the lock when the lock is already taken again" do
+      lock = Redstream::Lock.new(name: "lock")
+
+      lock.acquire do
+        redis.set(Redstream.lock_key_name("lock"), "other")
+      end
+
+      expect(redis.get(Redstream.lock_key_name("lock"))).to eq("other")
+    end
+
+    it "acquires the lock as soon as it gets released" do
+      time = nil
+
+      thread = Thread.new do
+        Redstream::Lock.new(name: "lock").acquire do
+          time = Time.now.to_f
+
+          sleep 2
+        end
+      end
+
+      sleep 1
+
+      lock = Redstream::Lock.new(name: "lock")
+      lock.wait(10) until lock.acquire { "nothing" }
+
+      thread.join
+
+      expect(Time.now.to_f - time).to be < 3
+    end
+  end
+
+  describe "#wait" do
+    it "blocks for the specified time max" do
+      stopped = false
+
+      thread = Thread.new do
+        Redstream::Lock.new(name: "lock").acquire do
+          sleep 0.1 until stopped
+        end
+      end
+
+      time = Time.now.to_f
+
+      Redstream::Lock.new(name: "lock").wait(2)
+
+      expect(Time.now.to_f - time).to be < 3
+
+      stopped = true
+
+      thread.join
+    end
+
+    it "wakes up when the lock gets released" do
+      thread = Thread.new do
+        Redstream::Lock.new(name: "lock").acquire do
+          sleep 2
+        end
+      end
+
+      time = Time.now.to_f
+
+      Redstream::Lock.new(name: "lock").wait(10)
+
+      expect(Time.now.to_f - time).to be < 3
+
+      thread.join
+    end
   end
 end

data/spec/redstream/model_spec.rb

@@ -8,12 +8,6 @@ RSpec.describe Redstream::Model do
       end
     end
 
-    it "assigns the delay message id" do
-      Product.transaction do
-        expect(create(:product).instance_variable_get(Redstream::Model::IVAR_DELAY_MESSAGE_ID)).to be_present
-      end
-    end
-
     it "adds the correct payload for the delay message" do
       Product.transaction do
         product = create(:product)
@@ -26,13 +20,6 @@ RSpec.describe Redstream::Model do
       expect { create(:product) }.to change { redis.xlen(Redstream.stream_key_name("products")) }
     end
 
-    it "deletes the delay message on commit" do
-      product = create(:product)
-
-      expect(redis.xlen(Redstream.stream_key_name("products.delay"))).to eq(0)
-      expect(product.instance_variable_get(Redstream::Model::IVAR_DELAY_MESSAGE_ID)).to be_nil
-    end
-
     it "does not add a delay message after_save if there are no changes" do
       product = create(:product)
 
@@ -55,16 +42,6 @@ RSpec.describe Redstream::Model do
       end
     end
 
-    it "assigns the delay message id" do
-      product = create(:product)
-
-      Product.transaction do
-        product.touch
-
-        expect(product.instance_variable_get(Redstream::Model::IVAR_DELAY_MESSAGE_ID)).to be_present
-      end
-    end
-
     it "sets the correct payload for the delay message" do
       product = create(:product)
 
@@ -80,14 +57,6 @@ RSpec.describe Redstream::Model do
 
       expect { product.touch }.to change { redis.xlen(Redstream.stream_key_name("products")) }
     end
-
-    it "deletes the delay message after touch on commit" do
-      product = create(:product)
-      product.touch
-
-      expect(redis.xlen(Redstream.stream_key_name("products.delay"))).to eq(0)
-      expect(product.instance_variable_get(Redstream::Model::IVAR_DELAY_MESSAGE_ID)).to be_nil
-    end
   end
 
   describe "after_destroy" do
@@ -99,16 +68,6 @@ RSpec.describe Redstream::Model do
       end
     end
 
-    it "assigns the delay message id" do
-      product = create(:product)
-
-      Product.transaction do
-        product.destroy
-
-        expect(product.instance_variable_get(Redstream::Model::IVAR_DELAY_MESSAGE_ID)).to be_present
-      end
-    end
-
     it "sets the correct payload for the delay message" do
       product = create(:product)
 
@@ -124,13 +83,5 @@ RSpec.describe Redstream::Model do
 
       expect { product.destroy }.to change { redis.xlen(Redstream.stream_key_name("products")) }.by(1)
     end
-
-    it "deletes the delay message after destroy on commit" do
-      product = create(:product)
-      product.destroy
-
-      expect(redis.xlen(Redstream.stream_key_name("products.delay"))).to eq(0)
-      expect(product.instance_variable_get(Redstream::Model::IVAR_DELAY_MESSAGE_ID)).to be_nil
-    end
   end
 end

data/spec/redstream/producer_spec.rb

@@ -11,15 +11,15 @@ RSpec.describe Redstream::Producer do
       expect(redis.xrange(stream_key_name, "-", "+").last[1]).to eq("payload" => JSON.dump(product.redstream_payload))
     end
 
-    it "deletes the delay message when given" do
+    it "uses a custom stream name when specified" do
       product = create(:product)
 
-      producer = Redstream::Producer.new
+      allow(product).to receive(:redstream_name).and_return("stream-name")
 
-      id = producer.delay(product)
-      producer.queue(product, delay_message_id: id)
+      stream_key_name = Redstream.stream_key_name("stream-name")
 
-      expect(redis.xlen(Redstream.stream_key_name("products.delay"))).to eq(0)
+      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
   end
 
@@ -33,7 +33,18 @@ RSpec.describe Redstream::Producer do
       expect(redis.xrange(stream_key_name, "-", "+").last[1]).to eq("payload" => JSON.dump(product.redstream_payload))
     end
 
-    it "resepects wait" do
+    it "uses a custom stream name when specified" do
+      product = create(:product)
+
+      allow(product).to receive(:redstream_name).and_return("stream-name")
+
+      stream_key_name = Redstream.stream_key_name("stream-name.delay")
+
+      expect { Redstream::Producer.new.delay(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
+
+    it "respects wait" do
       product = create(:product)
 
       stream_key_name = Redstream.stream_key_name("products.delay")
@@ -48,9 +59,11 @@ RSpec.describe Redstream::Producer do
 
       stream_key_name = Redstream.stream_key_name("products")
 
-      expect(redis.xlen("#{stream_key_name}.delay")).to eq(0)
+      expect(redis.xlen("#{stream_key_name}.delay")).to eq(2)
 
       Redstream::Producer.new.bulk(Product.all) do
+        expect(redis.xlen("#{stream_key_name}.delay")).to eq(4)
+
         messages = redis.xrange("#{stream_key_name}.delay", "-", "+").last(2).map { |message| message[1] }
 
         expect(messages).to eq([
@@ -60,6 +73,24 @@ RSpec.describe Redstream::Producer do
       end
     end
 
+    it "uses a custom stream name when specified" do
+      allow_any_instance_of(Product).to receive(:redstream_name).and_return("stream-name")
+
+      create_list(:product, 2)
+
+      stream_key_name = Redstream.stream_key_name("stream-name")
+
+      expect(redis.xlen(stream_key_name)).to eq(2)
+      expect(redis.xlen("#{stream_key_name}.delay")).to eq(2)
+
+      Redstream::Producer.new.bulk(Product.all) do
+        # nothing
+      end
+
+      expect(redis.xlen(stream_key_name)).to eq(4)
+      expect(redis.xlen("#{stream_key_name}.delay")).to eq(4)
+    end
+
     it "adds bulk queue messages for scopes" do
       products = create_list(:product, 2)
 
@@ -95,6 +126,16 @@ RSpec.describe Redstream::Producer do
         { "payload" => JSON.dump(products[1].redstream_payload) }
       ])
     end
+
+    it "uses a custom stream nameadds bulk queue messages for scopes" do
+      allow_any_instance_of(Product).to receive(:redstream_name).and_return("stream-name")
+
+      create_list(:product, 2)
+
+      stream_key_name = Redstream.stream_key_name("stream-name")
+
+      expect { Redstream::Producer.new.bulk_queue(Product.all) }.to change { redis.xlen(stream_key_name) }.by(2)
+    end
   end
 
   describe "#bulk_delay" do
@@ -113,6 +154,16 @@ RSpec.describe Redstream::Producer do
       ])
     end
 
+    it "uses a custom stream name when specified" do
+      allow_any_instance_of(Product).to receive(:redstream_name).and_return("stream-name")
+
+      create_list(:product, 2)
+
+      stream_key_name = Redstream.stream_key_name("stream-name.delay")
+
+      expect { Redstream::Producer.new.bulk_delay(Product.all) }.to change { redis.xlen(stream_key_name) }.by(2)
+    end
+
     it "should respect wait for delay" do
       create(:product)
 

data/spec/redstream/trimmer_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe Redstream::Trimmer do
 
     it "sleeps for the specified time if there's nothing to trim" do
       trimmer = Redstream::Trimmer.new(interval: 1, stream_name: "default", consumer_names: ["unknown_consumer"])
-      trimmer.expects(:sleep).with(1).returns(true)
+      allow(trimmer).to receive(:sleep).with(1).and_return(true)
       trimmer.run_once
     end
   end

data/spec/spec_helper.rb

@@ -4,13 +4,8 @@ require "factory_bot"
 require "database_cleaner"
 require "timecop"
 require "concurrent"
-require "mocha"
 require "rspec/instafail"
 
-RSpec.configure do |config|
-  config.mock_with :mocha
-end
-
 ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: "/tmp/redstream.sqlite3")
 
 ActiveRecord::Base.connection.execute "DROP TABLE IF EXISTS products"

metadata

@@ -1,183 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: redstream
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-12 00:00:00.000000000 Z
+date: 2024-09-21 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: factory_bot
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-instafail
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement