Merge 97bd826 into 2a3d237

enova · Sep 6, 2023 · 6dea5d7 · 6dea5d7
2 parents 2a3d237 + 97bd826
commit 6dea5d7
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,13 +12,13 @@ jobs:
     strategy:
       matrix:
         ruby-version: ['3.1', '2.7']
-        sidekiq-version: ['4', '5', '6.0', '6.1', '6.x']
+        sidekiq-version: ['4', '5', '6.0', '6.1', '6.x', '7.x']
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Set up Ruby ${{ matrix.ruby-version }}
-        uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
 

diff --git a/gemfiles/sidekiq_7.x.gemfile b/gemfiles/sidekiq_7.x.gemfile
@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem 'sidekiq', '~> 7.0.0'
+
+gemspec path: '../'
diff --git a/lib/sidekiq-rate-limiter/server.rb b/lib/sidekiq-rate-limiter/server.rb
@@ -7,6 +7,8 @@
     Sidekiq.options[:fetch] = Sidekiq::RateLimiter::Fetch
   elsif (Sidekiq::VERSION < '6.5.0') # Sidekiq config was redesigned in https://github.com/mperham/sidekiq/pull/5340
     Sidekiq.options[:fetch] = Sidekiq::RateLimiter::Fetch.new(Sidekiq.options)
+  elsif (Sidekiq::VERSION >= '7.0')
+    config[:fetch_class] = Sidekiq::RateLimiter::Fetch
   else
     Sidekiq[:fetch] = Sidekiq::RateLimiter::Fetch.new(Sidekiq)
   end

diff --git a/sidekiq-rate-limiter.gemspec b/sidekiq-rate-limiter.gemspec
@@ -26,6 +26,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "simplecov"
   s.add_development_dependency "simplecov-lcov", '~> 0.8.0'
 
-  s.add_dependency "sidekiq", ">= 4.0", "< 7.0"
+  s.add_dependency "sidekiq", ">= 4.0", "< 8.0"
   s.add_dependency "redis_rate_limiter"
 end
diff --git a/spec/sidekiq-rate-limiter/fetch_spec.rb b/spec/sidekiq-rate-limiter/fetch_spec.rb
@@ -30,6 +30,10 @@ def perform(arg1, arg2); end
   let(:options) do
     if Sidekiq::VERSION =~ /^(4|5|6\.[0-4])/
       { queues: [queue, another_queue, another_queue] }
+    elsif Sidekiq::VERSION.start_with?('7.')
+      config = Sidekiq.default_configuration
+      config.queues = [queue, another_queue, another_queue]
+      config.default_capsule
     else
       Sidekiq.tap { |s| s[:queues] = [queue, another_queue, another_queue] }
     end
@@ -59,7 +63,12 @@ def perform(arg1, arg2); end
       timeout = _timeout
     end
 
-    fetch = described_class.new options.merge!(:strict => true)
+    if !Sidekiq::VERSION.start_with?('7.')
+      options.merge!(strict: true)
+    end
+
+    fetch = described_class.new(options)
+
     expect(fetch.queues_cmd).to eql(["queue:#{queue}", "queue:#{another_queue}", timeout])
   end