[DO NOT MERGE] Changes on requeue-strategy for main at the time it was submitted

.github/codecov.yml

@@ -0,0 +1,4 @@
+ignore:
+  # Requires Sidekiq-Pro
+  - lib/sidekiq/throttled/patches/super_fetch.rb
+  - spec/lib/sidekiq/throttled/patches/super_fetch_spec.rb

.github/workflows/ci.yml

@@ -8,18 +8,13 @@ on:
 
 jobs:
   test:
-    name: "rspec (ruby:${{ matrix.ruby }}"
-
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ "2.7", "3.0", "3.1", "3.2" ]
+    name: "test / ${{ matrix.ruby }} / ${{ matrix.redis }}"
 
     runs-on: ubuntu-latest
 
     services:
       redis:
-        image: redis
+        image: ${{ matrix.redis }}
         ports:
           - "6379:6379"
         options: >-
@@ -28,26 +23,52 @@ jobs:
           --health-timeout 5s
           --health-retries 5
 
+    env:
+      BUNDLE_GEMS__CONTRIBSYS__COM: ${{ secrets.BUNDLE_GEMS__CONTRIBSYS__COM }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ ruby-2.7, ruby-3.0, ruby-3.1, ruby-3.2, ruby-3.3 ]
+        redis: [ "redis:6.2", "redis:7.0", "redis:7.2" ]
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
-      - name: RSpec
-        run: scripts/ci-rspec
+      - name: Run test suites
+        run: bundle exec rake test
+
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v4
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+  # See: https://github.com/orgs/community/discussions/26822#discussioncomment-3305794
+  test-finale:
+    name: "test"
+
+    runs-on: ubuntu-latest
+    if: ${{ always() }}
+
+    needs: [test]
+
+    steps:
+      - run: test "success" = "${{ needs.test.result }}"
 
-  rubocop:
+  lint:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2"
+          ruby-version: ruby-3.2
           bundler-cache: true
 
-      - run: bundle exec rubocop
+      - run: bundle exec rake lint

.rspec

@@ -1,5 +1,2 @@
---backtrace
---color
---format=documentation
---order random
+--require simplecov
 --require spec_helper

.rubocop.yml

@@ -19,3 +19,7 @@ AllCops:
     - vendor/**/*
   NewCops: enable
   TargetRubyVersion: 2.7
+
+# Broken: https://github.com/rubocop/rubocop/issues/12113
+Bundler/DuplicatedGroup:
+  Enabled: false

.simplecov

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+SimpleCov.start do
+  gemfile = File.basename(ENV.fetch("BUNDLE_GEMFILE", "Gemfile"), ".gemfile").strip
+  gemfile = nil if gemfile.empty? || gemfile.casecmp?("gems.rb") || gemfile.casecmp?("Gemfile")
+
+  command_name ["#{RUBY_ENGINE}-#{RUBY_ENGINE_VERSION}", gemfile].compact.join("/")
+
+  enable_coverage :branch
+
+  if ENV["CI"]
+    require "simplecov-cobertura"
+    formatter SimpleCov::Formatter::CoberturaFormatter
+  else
+    formatter SimpleCov::Formatter::MultiFormatter.new([
+      SimpleCov::Formatter::SimpleFormatter,
+      SimpleCov::Formatter::HTMLFormatter
+    ])
+  end
+
+  add_filter "/demo/"
+  add_filter "/gemfiles/"
+  add_filter "/spec/"
+  add_filter "/vendor/"
+end

Appraisals

@@ -1,19 +1,43 @@
 # frozen_string_literal: true
 
-appraise "sidekiq-6.5.x" do
-  group :test do
-    gem "sidekiq", "~> 6.5.0"
-  end
-end
-
 appraise "sidekiq-7.0.x" do
   group :test do
     gem "sidekiq", "~> 7.0.0"
+
+    # Sidekiq Pro license must be set in global bundler config
+    # or in BUNDLE_GEMS__CONTRIBSYS__COM env variable
+    install_if "-> { Bundler.settings['gems.contribsys.com']&.include?(':') }" do
+      source "https://gems.contribsys.com/" do
+        gem "sidekiq-pro", "~> 7.0.0"
+      end
+    end
   end
 end
 
 appraise "sidekiq-7.1.x" do
   group :test do
     gem "sidekiq", "~> 7.1.0"
+
+    # Sidekiq Pro license must be set in global bundler config
+    # or in BUNDLE_GEMS__CONTRIBSYS__COM env variable
+    install_if "-> { Bundler.settings['gems.contribsys.com']&.include?(':') }" do
+      source "https://gems.contribsys.com/" do
+        gem "sidekiq-pro", "~> 7.1.0"
+      end
+    end
+  end
+end
+
+appraise "sidekiq-7.2.x" do
+  group :test do
+    gem "sidekiq", "~> 7.2.0"
+
+    # Sidekiq Pro license must be set in global bundler config
+    # or in BUNDLE_GEMS__CONTRIBSYS__COM env variable
+    install_if "-> { Bundler.settings['gems.contribsys.com']&.include?(':') }" do
+      source "https://gems.contribsys.com/" do
+        gem "sidekiq-pro", "~> 7.2.0"
+      end
+    end
   end
 end

CHANGES.md

@@ -8,10 +8,88 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Change default cooldown period to `1.0` (was `2.0`),
+  and cooldown threshold to `100` (was `1`)
+  [#195](https://github.com/ixti/sidekiq-throttled/pull/195).
+
+### Removed
+
+- Drop Sidekiq < 7 support
+- Remove deprecated `Sidekiq::Throttled.setup!`
+
+## [1.4.0] - 2024-04-07
+
+### Fixed
+
+- Correctly unwrap `ActiveJob` arguments:
+  [#184](https://github.com/ixti/sidekiq-throttled/pull/184),
+  [#185](https://github.com/ixti/sidekiq-throttled/pull/185).
+
+
+## [1.3.0] - 2024-01-18
+
+### Added
+
+- Add Sidekiq Pro 7.0, 7.1, and 7.2 support
+- Add Ruby 3.3 support
+
+
+## [1.2.0] - 2023-12-18
+
+### Added
+
+- Bring back Ruby-2.7.x support
+
+
+## [1.1.0] - 2023-11-21
+
+### Changed
+
+- Renamed `Sidekiq::Throttled::Middleware` to `Sidekiq::Throttled::Middlewares::Server`
+
+### Deprecated
+
+- `Sidekiq::Throttled.setup!` is now deprecated. If you need to change order of
+  the middleware, please manipulate middlewares chains directly.
+
+
+## [1.0.1] - 2023-11-20
+
+### Added
+
+- Bring back Sidekiq-6.5 support
+
+
+## [1.0.0] - 2023-11-20
+
+### Added
+
+- Add Sidekiq-7.2 support
+- Revive queues cooldown logic
+  [#163](https://github.com/ixti/sidekiq-throttled/pull/163)
+
+### Changed
+
+- (BREAKING) Jobs inherit throttling strategy from their parent class, unless
+  explicitly overriden
+
+### Fixed
+
+- Correctly finalize throttled jobs when used with ActiveJob
+  [#151](https://github.com/ixti/sidekiq-throttled/pull/151)
+
+### Removed
+
+- (BREAKING) Drop Ruby-2.7.x support
+- (BREAKING) Drop Sidekiq-6.x.x support
+- (BREAKING) Removed `Sidekiq::Throttled.configuration`
+
 
 ## [1.0.0.alpha.1] - 2023-06-08
 
-### Changes
+### Changed
 
 - Upstream `Sidekiq::BasicFetch` is now infused with throttling directly,
   thus default fetch configuration should work on both Sidekiq and Sidekiq-Pro
@@ -30,7 +108,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add Ruby 3.2 support
 
 
-### Changes
+### Changed
 
 - Switch README to Asciidoc format
 - Switch CHANGES to keepachangelog.com format
@@ -46,6 +124,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Remove queue exclusion from fetcher pon throttled job
 
 
-[unreleased]: https://github.com/ixti/sidekiq-throttled/compare/v1.0.0.alpha.1...main
+[unreleased]: https://github.com/ixti/sidekiq-throttled/compare/v1.4.0...main
+[1.4.0]: https://github.com/ixti/sidekiq-throttled/compare/v1.3.0...v1.4.0
+[1.3.0]: https://github.com/ixti/sidekiq-throttled/compare/v1.2.0...v1.3.0
+[1.2.0]: https://github.com/ixti/sidekiq-throttled/compare/v1.1.0...v1.2.0
+[1.1.0]: https://github.com/ixti/sidekiq-throttled/compare/v1.0.1...v1.1.0
+[1.0.1]: https://github.com/ixti/sidekiq-throttled/compare/v1.0.0...v1.0.1
+[1.0.0]: https://github.com/ixti/sidekiq-throttled/compare/v1.0.0.alpha.1...v1.0.0
 [1.0.0.alpha.1]: https://github.com/ixti/sidekiq-throttled/compare/v1.0.0.alpha...v1.0.0.alpha.1
 [1.0.0.alpha]: https://github.com/ixti/sidekiq-throttled/compare/v0.16.1...v1.0.0.alpha

Gemfile

@@ -15,7 +15,10 @@ group :test do
   gem "rack-test"
 
   gem "rspec"
+
   gem "simplecov"
+  gem "simplecov-cobertura"
+
   gem "timecop"
 
   gem "rubocop",              require: false