sidekiq-limit_fetch 4.3.2 → 4.4.1

data/spec/sidekiq/limit_fetch/global/monitor_spec.rb

@@ -1,22 +1,24 @@
+# frozen_string_literal: true
+
 RSpec.describe Sidekiq::LimitFetch::Global::Monitor do
   let(:monitor) { described_class.start! ttl, timeout }
   let(:ttl) { 1 }
   let(:queue) { Sidekiq::Queue[name] }
   let(:name) { 'default' }
+  let(:timeout) { 0.5 }
 
-  before { monitor }
   after { monitor.kill }
 
   context 'old locks' do
-    let(:timeout) { 0.5 }
+    before { monitor }
 
     it 'should remove invalidated old locks' do
       2.times { queue.acquire }
-      sleep 2*ttl
+      sleep ttl * 2
       expect(queue.probed).to eq 2
 
       allow(described_class).to receive(:update_heartbeat)
-      sleep 2*ttl
+      sleep ttl * 2
       expect(queue.probed).to eq 0
     end
 
@@ -26,8 +28,87 @@ RSpec.describe Sidekiq::LimitFetch::Global::Monitor do
       Sidekiq.redis do |it|
         it.del Sidekiq::LimitFetch::Global::Monitor::PROCESS_SET
       end
-      sleep 2*ttl
+      sleep ttl * 2
       expect(queue.probed).to eq 0
     end
   end
+
+  context 'dynamic queue' do
+    let(:limits) do
+      {
+        'queue1' => 3,
+        'queue2' => 3
+      }
+    end
+    let(:queues) { %w[queue1 queue2] }
+    let(:queue) { Sidekiq::LimitFetch::Queues }
+
+    let(:config) { Sidekiq::Config.new(options) }
+    let(:capsule) do
+      config.capsule('default') do |cap|
+        cap.concurrency = 1
+        cap.queues = config[:queues]
+      end
+    end
+
+    let(:capsule_or_options) do
+      Sidekiq::LimitFetch.post_7? ? capsule : options
+    end
+
+    context 'without excluded queue' do
+      let(:options) do
+        {
+          limits: limits,
+          queues: queues,
+          dynamic: true
+        }
+      end
+
+      it 'should add dynamic queue' do
+        queue.start(capsule_or_options)
+        monitor
+
+        expect(queue.instance_variable_get(:@queues)).not_to include('queue3')
+
+        Sidekiq.redis do |it|
+          it.sadd 'queues', 'queue3'
+        end
+
+        sleep ttl * 2
+        expect(queue.instance_variable_get(:@queues)).to include('queue3')
+
+        Sidekiq.redis do |it|
+          it.srem 'queues', 'queue3'
+        end
+      end
+    end
+
+    context 'with excluded queue' do
+      let(:options) do
+        {
+          limits: limits,
+          queues: queues,
+          dynamic: { exclude: ['queue4'] }
+        }
+      end
+
+      it 'should exclude excluded dynamic queue' do
+        queue.start(capsule_or_options)
+        monitor
+
+        expect(queue.instance_variable_get(:@queues)).not_to include('queue4')
+
+        Sidekiq.redis do |it|
+          it.sadd 'queues', 'queue4'
+        end
+
+        sleep ttl * 2
+        expect(queue.instance_variable_get(:@queues)).not_to include('queue4')
+
+        Sidekiq.redis do |it|
+          it.srem 'queues', 'queue4'
+        end
+      end
+    end
+  end
 end

data/spec/sidekiq/limit_fetch/queues_spec.rb

@@ -1,19 +1,35 @@
+# frozen_string_literal: true
+
 RSpec.describe Sidekiq::LimitFetch::Queues do
   let(:queues)         { %w[queue1 queue2] }
-  let(:limits)         {{ 'queue1' => 3 }}
+  let(:limits)         { { 'queue1' => 3 } }
   let(:strict)         { true }
-  let(:blocking)       {}
-  let(:process_limits) {{ 'queue2' => 3 }}
+  let(:blocking)       { nil }
+  let(:process_limits) { { 'queue2' => 3 } }
 
   let(:options) do
-    { queues:   queues,
-      limits:   limits,
-      strict:   strict,
+    { queues: queues,
+      limits: limits,
+      strict: strict,
       blocking: blocking,
       process_limits: process_limits }
   end
 
-  before { subject.start options }
+  let(:config) { Sidekiq::Config.new(options) }
+  let(:capsule) do
+    config.capsule('default') do |cap|
+      cap.concurrency = 1
+      cap.queues = config[:queues]
+    end
+  end
+
+  let(:capsule_or_options) do
+    Sidekiq::LimitFetch.post_7? ? capsule : options
+  end
+
+  before do
+    subject.start(capsule_or_options)
+  end
 
   def in_thread(&block)
     thr = Thread.new(&block)
@@ -51,36 +67,36 @@ RSpec.describe Sidekiq::LimitFetch::Queues do
   end
 
   it 'should release queues' do
-    in_thread {
+    in_thread do
       subject.acquire
       subject.release_except nil
-    }
+    end
     expect(Sidekiq::Queue['queue1'].probed).to eq 0
     expect(Sidekiq::Queue['queue2'].probed).to eq 0
   end
 
   it 'should release queues except selected' do
-    in_thread {
+    in_thread do
       subject.acquire
       subject.release_except 'queue:queue1'
-    }
+    end
     expect(Sidekiq::Queue['queue1'].probed).to eq 1
     expect(Sidekiq::Queue['queue2'].probed).to eq 0
   end
 
   it 'should release when no queues was acquired' do
-    queues.each {|name| Sidekiq::Queue[name].pause }
-    in_thread {
+    queues.each { |name| Sidekiq::Queue[name].pause }
+    in_thread do
       subject.acquire
       expect { subject.release_except nil }.not_to raise_exception
-    }
+    end
   end
 
   context 'blocking' do
-    let(:blocking) { %w(queue1) }
+    let(:blocking) { %w[queue1] }
 
     it 'should acquire blocking queues' do
-      3.times { in_thread { subject.acquire  } }
+      3.times { in_thread { subject.acquire } }
       expect(Sidekiq::Queue['queue1'].probed).to eq 3
       expect(Sidekiq::Queue['queue2'].probed).to eq 1
     end
@@ -101,11 +117,11 @@ RSpec.describe Sidekiq::LimitFetch::Queues do
     let(:strict) { false }
 
     it 'should retrieve weighted queues' do
-      expect(subject.ordered_queues).to match_array(%w(queue1 queue2))
+      expect(subject.ordered_queues).to match_array(%w[queue1 queue2])
     end
   end
 
   it 'with strict flag should retrieve strictly ordered queues' do
-    expect(subject.ordered_queues).to eq %w(queue1 queue2)
+    expect(subject.ordered_queues).to eq %w[queue1 queue2]
   end
 end

data/spec/sidekiq/limit_fetch/semaphore_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe 'semaphore' do
   let(:name) { 'default' }
   subject { Sidekiq::LimitFetch::Global::Semaphore.new name }

data/spec/sidekiq/limit_fetch_spec.rb

@@ -1,12 +1,22 @@
+# frozen_string_literal: true
+
 Thread.abort_on_exception = true
 
 RSpec.describe Sidekiq::LimitFetch do
-  let(:options) {{ queues: queues, limits: limits }}
-  let(:queues) { %w(queue1 queue1 queue2 queue2) }
-  let(:limits) {{ 'queue1' => 1, 'queue2' => 2 }}
+  let(:options) { { queues: queues, limits: limits } }
+  let(:queues) { %w[queue1 queue1 queue2 queue2] }
+  let(:limits) { { 'queue1' => 1, 'queue2' => 2 } }
+  let(:config) { Sidekiq::Config.new(options) }
+  let(:capsule) do
+    config.capsule('default') do |cap|
+      cap.concurrency = 1
+      cap.queues = config[:queues]
+    end
+  end
+  let(:capsule_or_config) { Sidekiq::LimitFetch.post_7? ? capsule : options }
 
   before do
-    subject::Queues.start options
+    subject::Queues.start(capsule_or_config)
 
     Sidekiq.redis do |it|
       it.del 'queue:queue1'

data/spec/spec_helper.rb

@@ -1,7 +1,18 @@
+# frozen_string_literal: true
+
+require 'simplecov'
+SimpleCov.start
+
 require 'sidekiq/limit_fetch'
 
-Sidekiq.logger = nil
-Sidekiq.redis = { namespace: ENV['namespace'] }
+if Sidekiq::LimitFetch.post_7?
+  Sidekiq.configure_embed do |config|
+    config.logger = nil
+  end
+else
+  Sidekiq.logger = nil
+  Sidekiq.redis = { namespace: ENV.fetch('namespace', nil) }
+end
 
 RSpec.configure do |config|
   config.order = :random
@@ -10,7 +21,7 @@ RSpec.configure do |config|
   config.before do
     Sidekiq::Queue.reset_instances!
     Sidekiq.redis do |it|
-      clean_redis = ->(queue) do
+      clean_redis = lambda do |queue|
         it.pipelined do |pipeline|
           pipeline.del "limit_fetch:limit:#{queue}"
           pipeline.del "limit_fetch:process_limit:#{queue}"
@@ -22,7 +33,7 @@ RSpec.configure do |config|
       end
 
       clean_redis.call(name) if defined?(name)
-      queues.each(&clean_redis) if defined?(queues) and queues.is_a? Array
+      queues.each(&clean_redis) if defined?(queues) && queues.is_a?(Array)
     end
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-limit_fetch
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.4.1
 platform: ruby
 authors:
 - Dean Perry
-- brainopia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-01 00:00:00.000000000 Z
+date: 2023-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -17,28 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '6'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.6.0
-  type: :runtime
+        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: 4.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.2
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -74,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -88,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -111,6 +124,7 @@ files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -130,6 +144,7 @@ files:
 - demo/config/boot.rb
 - demo/config/environment.rb
 - demo/config/environments/development.rb
+- docker-compose.dev.yml
 - gemfiles/sidekiq_6.0.gemfile
 - gemfiles/sidekiq_6.0.gemfile.lock
 - gemfiles/sidekiq_6.1.gemfile
@@ -142,6 +157,8 @@ files:
 - gemfiles/sidekiq_6.4.gemfile.lock
 - gemfiles/sidekiq_6.5.gemfile
 - gemfiles/sidekiq_6.5.gemfile.lock
+- gemfiles/sidekiq_7.0.gemfile
+- gemfiles/sidekiq_7.0.gemfile.lock
 - gemfiles/sidekiq_master.gemfile
 - gemfiles/sidekiq_master.gemfile.lock
 - lib/sidekiq-limit_fetch.rb
@@ -155,6 +172,7 @@ files:
 - lib/sidekiq/limit_fetch/queues.rb
 - lib/sidekiq/limit_fetch/unit_of_work.rb
 - sidekiq-limit_fetch.gemspec
+- spec/sidekiq/extensions/manager_spec.rb
 - spec/sidekiq/extensions/queue_spec.rb
 - spec/sidekiq/limit_fetch/global/monitor_spec.rb
 - spec/sidekiq/limit_fetch/queues_spec.rb
@@ -168,6 +186,7 @@ metadata:
   homepage_uri: https://github.com/deanpcmad/sidekiq-limit_fetch
   source_code_uri: https://github.com/deanpcmad/sidekiq-limit_fetch
   changelog_uri: https://github.com/deanpcmad/sidekiq-limit_fetch/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -176,21 +195,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.3
 signing_key: 
 specification_version: 4
 summary: Sidekiq strategy to support queue limits
-test_files:
-- spec/sidekiq/extensions/queue_spec.rb
-- spec/sidekiq/limit_fetch/global/monitor_spec.rb
-- spec/sidekiq/limit_fetch/queues_spec.rb
-- spec/sidekiq/limit_fetch/semaphore_spec.rb
-- spec/sidekiq/limit_fetch_spec.rb
-- spec/spec_helper.rb
+test_files: []