sidekiq-bus 0.9.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1f2be4d5e020e0a15769b9b1afcf3f7ed36d1d6b
-  data.tar.gz: 9f1d638cf9f47eb1afa87bb21b8141d2baa27f10
+SHA256:
+  metadata.gz: 348236e181a0dfa48615334f28f2f9cc866a44fa93d63377c7780190f47f9e82
+  data.tar.gz: db608296c196894b6e793dc5a6b7a5ad41426307ea2e0cf592b75b9cc580e7f4
 SHA512:
-  metadata.gz: 1f9783a99bf3c8b0c6fb2df111362d77507d8d245112ec66707e82ee4c172bb78cc28f5e32026adbbb3ca4e1c0f11fc15c27f67cbd79d32545e40b1bb48a424b
-  data.tar.gz: 66b88100b6068b47ce2f28080eeb4eca7ce5ef669cef9bd71cf195893c43c88a976ccf4040cf0e08d14a45031f4195725079e6da29f1cc5e14a6b03eec3dfb1f
+  metadata.gz: 865909c8db64b272978af02dcceb551f5f8c5c552ef1cd9e140876bdff8dc4a149385433bebcabe55ecc911a9ef6cd895b31b4d024366b5dee0691ed57bfb6d5
+  data.tar.gz: cb8ca09af0f508755e71f28f3bc7ec212f5380677de55e8c92ea7d6393cc7526103a9a72cd72f274d46da8a9409a0e7772a4a4eec782150eaaa1428f7ad5cfc0

data/.rbenv-version

@@ -1 +1 @@
-2.3.4
+3.2.6

data/.ruby-version

@@ -1 +1 @@
-2.3.4
+3.2.6

data/CHANGELOG.md

@@ -6,6 +6,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.1.0] - 2025-05-13
+
+### Changed
+- [Development] Target supported Ruby version 3.2.6
+
+### Fixed
+- Modifies allowed Sidekiq versions to allow Sidekiq 6 upgrade. 1.0.0 made the requisite code changes but did not modify the gemspec properly.
+
+## [1.0.0] - 2025-05-13
+
+### Changed
+- [BREAKING] Updated sidekiq-scheduler to 4.0.3. This adds support for Redis 5 and Sidekiq 6, but removes support for Redis < 4.2 and Sidekiq < 4.X. The dropped versions are long out of support; please use this release to facilitate an update.
+
 ## [0.9.0] - 2019-12-03
 
 ### Added

data/lib/sidekiq_bus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqBus
-  VERSION = '0.9.0'
+  VERSION = '1.1.0'
 end

data/sidekiq-bus.gemspec

@@ -17,8 +17,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency('queue-bus', ['>= 0.7', '< 1'])
-  s.add_dependency('sidekiq', ['>= 3.0.0', '~> 5.0'])
-  s.add_dependency('sidekiq-scheduler', '~> 3.0')
+  s.add_dependency('sidekiq', ['>= 3.0.0', '< 7.0'])
+  s.add_dependency('rack', "< 3.0") # Sidekiq 6 was sunset before Rack 3.0 and does not support it
+  s.add_dependency('sidekiq-scheduler', ['>= 3.0', '< 5.0'])
 
   s.add_development_dependency("rspec")
   s.add_development_dependency("fakeredis")

data/spec/adapter/integration_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'celluloid' if Sidekiq::VERSION < '4'
 require 'sidekiq/scheduled'
 
 describe 'Sidekiq Integration' do
@@ -88,22 +87,17 @@ describe 'Sidekiq Integration' do
       val = QueueBus.redis { |redis| redis.lpop('queue:bus_incoming') }
       expect(val).to eq(nil) # nothing really added
 
-      if Sidekiq::VERSION < '4'
-        Sidekiq::Scheduled::Poller.new.poll
-      else
-        Sidekiq::Scheduled::Poller.new.enqueue
-      end
+      # NOTE: this is silently invoking a monkey patch in spec_helper
+      # since the Poller invokes a Lua script that FakeRedis does not
+      # natively support.
+      Sidekiq::Scheduled::Poller.new(Sidekiq).enqueue
 
       val = QueueBus.redis { |redis| redis.lpop('queue:bus_incoming') }
       expect(val).to eq(nil) # nothing added yet
 
       # process scheduler in future
       Timecop.freeze(worktime) do
-        if Sidekiq::VERSION < '4'
-          Sidekiq::Scheduled::Poller.new.poll
-        else
-          Sidekiq::Scheduled::Poller.new.enqueue
-        end
+        Sidekiq::Scheduled::Poller.new(Sidekiq).enqueue
 
         val = QueueBus.redis { |redis| redis.lpop('queue:bus_incoming') }
         hash = JSON.parse(val)

data/spec/sidekiq_bus_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 RSpec.describe SidekiqBus do
   describe '.generate_weighted_queues' do
-    subject { SidekiqBus.generate_weighted_queues(args) }
+    subject { SidekiqBus.generate_weighted_queues(**args) }
 
     let(:args) { {} }
 

data/spec/spec_helper.rb

@@ -53,6 +53,39 @@ module QueueBus
   end
 end
 
+class Redis
+  module Connection
+    class Memory
+      def script(*args)
+        case args[1]
+        when Sidekiq::Scheduled::Enq::LUA_ZPOPBYSCORE
+          QueueBus.redis do |redis|
+            now = Time.now.to_f
+
+            # Process both 'schedule' and 'retry' sets
+            %w[schedule retry].each do |set_name|
+              # Get jobs that are ready to be processed (score <= now)
+              jobs = redis.zrangebyscore(set_name, '-inf', now)
+
+              jobs.each do |job_json|
+                # Remove from scheduled set
+                redis.zrem(set_name, job_json)
+
+                # Parse and re-enqueue the job
+                job_data = JSON.parse(job_json)
+                queue_name = job_data['queue'] || 'default'
+                redis.lpush("queue:#{queue_name}", job_json)
+              end
+            end
+          end
+        else
+          raise "NOSCRIPT - FakeRedis gem does not include Lua support. Please see spec/spec_helper.rb for more information."
+        end
+      end
+    end
+  end
+end
+
 def test_sub(event_name, queue = 'default')
   matcher = { 'bus_event_type' => event_name }
   QueueBus::Subscription.new(queue, event_name, '::QueueBus::Rider', matcher, nil)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-bus
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Brian Leonard
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: queue-bus
@@ -37,9 +36,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,23 +46,43 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sidekiq-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -211,7 +230,6 @@ files:
 homepage: https://github.com/queue-bus/sidekiq-bus
 licenses: []
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -226,9 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A simple event bus on top of Sidekiq
 test_files: