freekiqs 5.0.0 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 44594d919a76aa86c249eb5fe88a9af8f95ba253
-  data.tar.gz: b788548a59466399a3e58ed192cd4344b6d37df4
+SHA256:
+  metadata.gz: 64914c0a481a3e2337d05eec0d6f094e523c6c77aef42b4d44f7a8ed4cc24d9f
+  data.tar.gz: 97a56d9f74649236d2dd2f640a0bcd34ce7c54ca01386d96b62c932629113fe8
 SHA512:
-  metadata.gz: fbeab3d19cea8a86adf9e8a47e9cfab8e3739da4d53157fe82418bd838550736c77a414e81b505ccb7dba7663292058bc63b133fabebc2f4048dda0f8ed79f41
-  data.tar.gz: f0e33f9fc4851bfbfb1f4ff1b6f09cdc14dd4ba282e413b8c8e3c69366a4006f63af5edc63eda77b970660d9baa91d17da57468b06f9c5820a625bdb68ebdff0
+  metadata.gz: 43d753115648d1d004f34cea277e27b3fe8d1ab013485b069f88a8c68949ba4ee964f88e6e6d10b43b1829f86c0de5e924dcdd7b10bd4899e3c5ce5407669cb2
+  data.tar.gz: 06751ee75a308d1be8e72aa8487ceeb0ab7a3f58620268cef095b4503033b551fd3d67e020df0acb91f89ec17577c79dace1d26c6d492e000cf9a4048f2eb4cc

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,13 @@
+### Why is this change necessary?
+
+
+### How does this change address the issue?
+
+
+### What side effects does this change have?
+
+
+### General TODOs
+- [ ] Test in at least one app to make sure that there are no breaking changes 
+- [ ] Notify consuming apps of breaking changes 
+- [ ] Ensure the updates is backwards compatible

data/.github/workflows/test.yml

@@ -0,0 +1,29 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["3.2", "3.3", "3.4", "4.0"]
+        gemfile: [sidekiq_7, sidekiq_8]
+    continue-on-error: ${{ endsWith(matrix.ruby, 'head') }}
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake

data/.gitignore

@@ -1,8 +1,11 @@
 tmp
-gemfiles/*.lock
-Gemfile.lock
 .ruby-version
 pkg
 /.bundle
-/.vagrant
 /ubuntu-*-console.log
+/vendor
+gemfiles/.bundle
+gemfiles/vendor
+dump.rdb
+.direnv
+.envrc

data/Appraisals

@@ -0,0 +1,7 @@
+appraise "sidekiq-7" do
+  gem "sidekiq", ">= 7.0.0", "< 8.0.0"
+end
+
+appraise "sidekiq-8" do
+  gem "sidekiq", ">= 8.0.0", "< 9.0.0"
+end

data/CHANGELOG.md

@@ -0,0 +1,46 @@
+# Changelog
+
+## [Unreleased]
+
+## [6.6.0] - 2026-08-10
+
+* Support Sidekiq 8 (#19)
+* Introduce the appraisal gem so the suite runs against multiple Sidekiq versions (#18)
+* Test against Sidekiq 7 (#10)
+* Test against Ruby 3.2, 3.3 and 3.4 (#17), dropping support for Ruby 3.1 (#15)
+* Test using Sidekiq's fake testing mode (#12)
+* Change logger setup (#9)
+* Move CI from CircleCI to GitHub Actions (#11)
+* Check in `Gemfile.lock` (#16)
+* Migrate from `shell.nix` to `flake.nix`, upgrading to nixpkgs 26.05 and ruby 4.0
+* Add ruby 4.0 to the CI matrix
+* Update dependent gems and drop stale entries from the lockfile's platform list
+* Drop the unused `Vagrantfile`
+
+## [6.5.0] - 2022-10-11
+
+* Support Sidekiq 6.5 and higher (#7)
+* Rails 5 compatibility (#6)
+
+## [5.0.0] - 2017-08-03
+
+* Update to work with Sidekiq v5+
+
+## [4.1.0] - 2016-06-24
+
+* Add a `freekiq_for` option, letting specific errors be defined as the only errors that will
+  freekiq (#5)
+
+## [4.0.0] - 2016-06-21
+
+* Allow Sidekiq v4
+* Switch `sidekiq_options` to use the getter, `get_sidekiq_options` (#3)
+
+## [0.2.0] - 2016-01-26
+
+* Add an optional callback for each freekiq (#1)
+* Relax the version dependency for rspec
+
+## [0.1.0] - 2016-01-26
+
+* Initial release

data/Gemfile.lock

@@ -0,0 +1,56 @@
+PATH
+  remote: .
+  specs:
+    freekiqs (6.6.0)
+      sidekiq (>= 6.5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    connection_pool (3.0.2)
+    diff-lcs (1.6.2)
+    json (2.21.2)
+    logger (1.7.0)
+    rack (3.2.6)
+    rake (13.4.2)
+    redis-client (0.30.1)
+      connection_pool
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.8)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    sidekiq (8.1.6)
+      connection_pool (>= 3.0.0)
+      json (>= 2.16.0)
+      logger (>= 1.7.0)
+      rack (>= 3.2.0)
+      redis-client (>= 0.29.0)
+    thor (1.5.0)
+
+PLATFORMS
+  aarch64-linux
+  arm64-darwin
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  appraisal
+  freekiqs!
+  rake
+  rspec (~> 3.6, >= 3.6.0)
+
+BUNDLED WITH
+  4.0.10

data/Procfile

@@ -0,0 +1 @@
+redis: redis-server development/redis/redis.conf --bind $HOST

data/README.md

@@ -5,6 +5,21 @@ by failed jobs and wrapping them with a `FreekiqException` exception class
 that can be filtered by monitoring tools such as New Relic and
 Rollbar.
 
+#### Implementation Details
+
+This relies on Sidekiq's built-in retry handling. Specifically, its
+`retry_count` value. When a job first fails, its `retry_count` value
+is nil (because it hasn't actually been retried yet). That exception,
+along with subsequent exceptions from retries, are caught and wrapped
+with the `FreekiqException` exception.
+Cases where Freekiqs does NOT wrap the exception:
+ - The `retry` option is false
+ - The `freekiqs` option is not set on the worker nor globally
+ - The `freekiqs` option is not set on worker and set to `false` globally
+ - The `freekiqs` option is set to `false` on the worker
+ - The job threw an exception that is not a StandardError (nor a subclass)
+ - The number of thrown exceptions is more than specified freekiqs
+
 Configuration example (in config/initializers/sidekiq.rb):
 ``` ruby
   Sidekiq.configure_server do |config|
@@ -101,26 +116,4 @@ If MyWorker throws a SubMyError or MyError, it will get freekiq'd.
 Version 5 of this gem only works with Sidekiq 5 and higher. If you are using
 an older version of Sidekiq, you'll need to use version [4.1.0](https://github.com/BookBub/freekiqs/tree/v4.1.0).
 
-## Overview
-
-Up to the configured number of "freekiqs", catch exceptions thrown
-from job and wrap them with the `FreekiqException` exception (which is a
-`RuntimeError`). That exception type can be ignored by monitoring
-tools. If job fails more times than configured "freekiqs", thrown
-exception will not be wrapped. That should result in normal operation
-and the exception showing up in monitoring tools.
-
-#### Implementation Details
-
-This relies on Sidekiq's built-in retry handling. Specifically, its
-`retry_count` value. When a job first fails, its `retry_count` value
-is nil (because it hasn't actually been retried yet). That exception,
-along with subsequent exceptions from retries, are caught and wrapped
-with the `FreekiqException` exception.
-Cases where Freekiqs does NOT wrap the exception:
- - The `retry` option is false
- - The `freekiqs` option is not set on the worker nor globally
- - The `freekiqs` option is not set on worker and set to `false` globally
- - The `freekiqs` option is set to `false` on the worker
- - The job threw an exception that is not a StandardError (nor a subclass)
- - The number of thrown exceptions is more than specified freekiqs
+Version 6.5.0 of this gem works with Sidekiq 6.5 and higher. Last tested with Sidekiq 8.1.3.

data/development/redis/redis.conf

@@ -0,0 +1,49 @@
+protected-mode yes
+port 6379
+tcp-backlog 511
+timeout 0
+tcp-keepalive 300
+daemonize no
+supervised no
+pidfile development/redis/redis_6379.pid
+loglevel warning
+logfile ""
+databases 16
+save 900 1
+save 300 10
+save 60 10000
+stop-writes-on-bgsave-error yes
+rdbcompression yes
+rdbchecksum yes
+dbfilename dump.rdb
+dir development/redis
+slave-serve-stale-data yes
+slave-read-only yes
+repl-diskless-sync no
+repl-diskless-sync-delay 5
+repl-disable-tcp-nodelay no
+slave-priority 100
+appendonly no
+appendfilename "appendonly.aof"
+appendfsync no
+no-appendfsync-on-rewrite no
+auto-aof-rewrite-percentage 100
+auto-aof-rewrite-min-size 64mb
+aof-load-truncated yes
+lua-time-limit 5000
+latency-monitor-threshold 0
+notify-keyspace-events ""
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
+list-max-ziplist-size -2
+list-compress-depth 0
+set-max-intset-entries 512
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
+hll-sparse-max-bytes 3000
+activerehashing yes
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
+hz 10
+aof-rewrite-incremental-fsync yes

data/flake.lock

@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1786313170,
+        "narHash": "sha256-9BG7OgUWdu0ONDO5X2q6+K4bsuBITkX/3W4nNJu1Ito=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "fcb8fcd6bf2d0adecae5bd491afaaaf8311b758d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-26.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

data/flake.nix

@@ -0,0 +1,34 @@
+{
+  description = "Sidekiq middleware extending RetryJobs to allow silent errors";
+
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
+
+  outputs = { self, nixpkgs }:
+    let
+      supportedSystems = [ "aarch64-darwin" "aarch64-linux" "x86_64-linux" ];
+      forAllSystems = f:
+        nixpkgs.lib.genAttrs supportedSystems (system: f nixpkgs.legacyPackages.${system});
+      host = "127.0.0.24";
+    in
+    {
+      devShells = forAllSystems (pkgs: {
+        default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            git
+            cacert
+            ruby_4_0
+
+            # Services
+            overmind
+            redis
+          ] ++ lib.optionals stdenv.isLinux [
+            glibcLocales
+          ];
+
+          HOST = host;
+          REDIS_URL = "redis://${host}:6379/1";
+          BUNDLE_PATH = "vendor/bundle";
+        };
+      });
+    };
+}

data/freekiqs.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name                  = 'freekiqs'
-  gem.version               = '5.0.0'
+  gem.version               = '6.6.0'
   gem.authors               = ['Rob Lewis']
   gem.email                 = ['rob@bookbub.com']
   gem.summary               = 'Sidekiq middleware extending RetryJobs to allow silient errors.'
@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths         = ['lib']
   gem.required_ruby_version = '>= 2.2.2'
 
-  gem.add_dependency             'sidekiq', '>= 5.0.0'
+  gem.add_dependency             'sidekiq', '>= 6.5.0'
   gem.add_development_dependency 'rspec', '>= 3.6.0'
+  gem.add_development_dependency "appraisal"
 end

data/gemfiles/sidekiq_7.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "sidekiq", ">= 7.0.0", "< 8.0.0"
+
+group :test do
+  gem "rspec", "~> 3.6"
+end
+
+gemspec path: "../"

data/gemfiles/sidekiq_7.gemfile.lock

@@ -0,0 +1,57 @@
+PATH
+  remote: ..
+  specs:
+    freekiqs (6.6.0)
+      sidekiq (>= 6.5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    base64 (0.3.0)
+    connection_pool (2.5.5)
+    diff-lcs (1.6.2)
+    logger (1.7.0)
+    rack (3.2.6)
+    rake (13.4.2)
+    redis-client (0.30.1)
+      connection_pool
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.8)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    sidekiq (7.3.10)
+      base64
+      connection_pool (>= 2.3.0, < 3)
+      logger
+      rack (>= 2.2.4, < 3.3)
+      redis-client (>= 0.23.0, < 1)
+    thor (1.5.0)
+
+PLATFORMS
+  aarch64-linux
+  arm64-darwin
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  appraisal
+  freekiqs!
+  rake
+  rspec (~> 3.6)
+  sidekiq (>= 7.0.0, < 8.0.0)
+
+BUNDLED WITH
+  4.0.10

data/gemfiles/sidekiq_8.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "sidekiq", ">= 8.0.0", "< 9.0.0"
+
+group :test do
+  gem "rspec", "~> 3.6"
+end
+
+gemspec path: "../"

data/gemfiles/sidekiq_8.gemfile.lock

@@ -0,0 +1,57 @@
+PATH
+  remote: ..
+  specs:
+    freekiqs (6.6.0)
+      sidekiq (>= 6.5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    connection_pool (3.0.2)
+    diff-lcs (1.6.2)
+    json (2.21.2)
+    logger (1.7.0)
+    rack (3.2.6)
+    rake (13.4.2)
+    redis-client (0.30.1)
+      connection_pool
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.8)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    sidekiq (8.1.6)
+      connection_pool (>= 3.0.0)
+      json (>= 2.16.0)
+      logger (>= 1.7.0)
+      rack (>= 3.2.0)
+      redis-client (>= 0.29.0)
+    thor (1.5.0)
+
+PLATFORMS
+  aarch64-linux
+  arm64-darwin
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  appraisal
+  freekiqs!
+  rake
+  rspec (~> 3.6)
+  sidekiq (>= 8.0.0, < 9.0.0)
+
+BUNDLED WITH
+  4.0.10

data/lib/sidekiq/middleware/server/freekiqs.rb

@@ -1,5 +1,5 @@
 require 'sidekiq'
-require 'sidekiq/util'
+require 'sidekiq/middleware/modules'
 
 module Sidekiq
   class FreekiqException < RuntimeError; end
@@ -7,7 +7,7 @@ module Sidekiq
   module Middleware
     module Server
       class Freekiqs
-        include Sidekiq::Util
+        include Sidekiq::ServerMiddleware
         @@callback = nil
 
         def initialize(opts={})
@@ -25,12 +25,12 @@ module Sidekiq
               begin
                 @@callback.call(worker, msg, queue) if @@callback
               rescue => callback_exception
-                Sidekiq.logger.info { "Freekiq callback failed for #{msg['class']} job #{msg['jid']}" }
+                logger.info { "Freekiq callback failed for #{msg['class']} job #{msg['jid']}" }
               ensure
                 raise FreekiqException, ex.message
               end
             else
-              Sidekiq.logger.info { "Out of freekiqs for #{msg['class']} job #{msg['jid']}" }
+              logger.info { "Out of freekiqs for #{msg['class']} job #{msg['jid']}" }
             end
           end
           raise ex

data/spec/freekiqs_spec.rb

@@ -1,28 +1,49 @@
-require 'sidekiq/processor'
+require 'sidekiq'
+require 'sidekiq/testing'
 
 RSpec.describe Sidekiq::Middleware::Server::Freekiqs do
   class NonArgumentError < StandardError; end
 
-  def build_job_hash(worker_class, args=[])
-    {'class' => worker_class, 'args' => args}
-  end
-
-  def fetch_retry_job
-    retry_set = Sidekiq::RetrySet.new
-    retry_job = retry_set.first
-    retry_set.clear
-    retry_job
+  module Sidekiq
+    module Middleware
+      module Server
+        class FakeTestModeEnqueueFailuresForRetry
+          def call(job_instance, job_payload, queue)
+            begin
+              yield
+            rescue => ex
+              if job_payload["retry"]
+                if job_payload["retry_count"]
+                  job_payload["retry_count"] += 1
+                else
+                  job_payload["retry_count"] = 0
+                end
+
+                max_retries = Sidekiq.default_configuration[:max_retries] || 25
+                raise if job_payload["retry_count"] >= max_retries
+
+                job_payload["queue"] = "retry"
+                job_payload["exception_class"] = ex.class
+
+                Sidekiq::Client.push(job_payload)
+              else
+                raise
+              end
+            end
+          end
+        end
+      end
+    end
   end
 
-  def process_job(job_hash)
-    mgr = instance_double('Manager', options: {:queues => ['default']})
-    processor = ::Sidekiq::Processor.new(mgr)
-    job_msg = Sidekiq.dump_json(job_hash)
-    processor.process(Sidekiq::BasicFetch::UnitOfWork.new('queue:default', job_msg))
+  before do
+    Sidekiq::Worker.clear_all
+    Sidekiq::Testing.fake!
   end
 
   def initialize_middleware(middleware_opts={})
-    Sidekiq.server_middleware do |chain|
+    Sidekiq::Testing.server_middleware do |chain|
+      chain.add Sidekiq::Middleware::Server::FakeTestModeEnqueueFailuresForRetry
       chain.add Sidekiq::Middleware::Server::Freekiqs, middleware_opts
     end
   end
@@ -40,72 +61,52 @@ RSpec.describe Sidekiq::Middleware::Server::Freekiqs do
     Object.const_set(worker_class_name, klass)
   end
 
-  def cleanup_redis
-    Sidekiq.redis {|c| c.flushdb }
-  end
-
   shared_examples_for 'it should have 2 freekiqs for an ArgumentError' do
     it 'throws Freekiq exception for specified number of freekiqs' do
-      args ||= []
-      expect {
-        process_job(build_job_hash(worker_class, args))
-      }.to raise_error(Sidekiq::FreekiqException, 'Oops')
-      expect(Sidekiq::RetrySet.new.size).to eq(1)
-      retry_job = fetch_retry_job
-      expect(retry_job['retry_count']).to eq(0)
-      expect(retry_job['error_class']).to eq('Sidekiq::FreekiqException')
-      expect(retry_job['error_message']).to eq('Oops')
-
-      expect {
-        process_job(retry_job.item)
-      }.to raise_error(Sidekiq::FreekiqException, 'Oops')
-      expect(Sidekiq::RetrySet.new.size).to eq(1)
-      retry_job = fetch_retry_job
-      expect(retry_job['retry_count']).to eq(1)
-      expect(retry_job['error_class']).to eq('Sidekiq::FreekiqException')
-      expect(retry_job['error_message']).to eq('Oops')
-
-      expect {
-        process_job(retry_job.item)
-      }.to raise_error(ArgumentError, 'Oops')
-      expect(Sidekiq::RetrySet.new.size).to eq(1)
-      retry_job = fetch_retry_job
-      expect(retry_job['retry_count']).to eq(2)
-      expect(retry_job['error_class']).to eq('ArgumentError')
-      expect(retry_job['error_message']).to eq('Oops')
+      worker_class.perform_async
+      worker_class.perform_one
+      expect(worker_class.jobs).to match_array(
+        a_hash_including(
+          "queue" => "retry",
+          "retry_count" => 0,
+          "exception_class" => "Sidekiq::FreekiqException",
+        ),
+      )
+
+      worker_class.perform_one
+      expect(worker_class.jobs).to match_array(
+        a_hash_including(
+          "queue" => "retry",
+          "retry_count" => 1,
+          "exception_class" => "Sidekiq::FreekiqException",
+        ),
+      )
+
+      worker_class.perform_one
+      expect(worker_class.jobs).to match_array(
+        a_hash_including(
+          "queue" => "retry",
+          "retry_count" => 2,
+          "exception_class" => "ArgumentError",
+        ),
+      )
     end
   end
 
   shared_examples_for 'it should have 0 freekiqs for an ArgumentError' do
     it 'raises the original error' do
-      args ||= []
-      expect {
-        process_job(build_job_hash(worker_class, args))
-      }.to raise_error(ArgumentError, 'Oops')
-      expect(Sidekiq::RetrySet.new.size).to eq(1)
-      retry_job = fetch_retry_job
-      expect(retry_job['retry_count']).to eq(0)
-      expect(retry_job['error_class']).to eq('ArgumentError')
-      expect(retry_job['error_message']).to eq('Oops')
-    end
-  end
-
-  shared_examples_for 'it should only raise exception for an ArgumentError' do
-    it 'raises the original error' do
-      args ||= []
-      expect {
-        process_job(build_job_hash(worker_class, args))
-      }.to raise_error(ArgumentError, 'Oops')
-      expect(Sidekiq::RetrySet.new.size).to eq(0)
-      # Note: Sidekiq doesn't send job to morgue when retries are diabled
-      expect(Sidekiq::DeadSet.new.size).to eq(0)
+      worker_class.perform_async
+      worker_class.perform_one
+      expect(worker_class.jobs).to match_array(
+        a_hash_including(
+          "queue" => "retry",
+          "retry_count" => 0,
+          "exception_class" => "ArgumentError",
+        ),
+      )
     end
   end
 
-  before(:each) do
-    cleanup_redis
-  end
-
   context 'with default middleware config' do
     before(:each) do
       initialize_middleware
@@ -160,8 +161,13 @@ RSpec.describe Sidekiq::Middleware::Server::Freekiqs do
     end
 
     describe 'with 2 freekiqs in the worker and retries disabled' do
-      it_behaves_like 'it should only raise exception for an ArgumentError' do
-        let!(:worker_class) { initialize_worker_class(freekiqs: 2, retry: false) }
+      let!(:worker_class) { initialize_worker_class(freekiqs: 2, retry: false) }
+
+      it 'raises the original error' do
+        worker_class.perform_async
+        expect { worker_class.perform_one }.to raise_error(ArgumentError, 'Oops')
+
+        expect(worker_class.jobs.size).to eq 0
       end
     end
   end
@@ -232,17 +238,34 @@ RSpec.describe Sidekiq::Middleware::Server::Freekiqs do
     called = false
     initialize_middleware(callback: ->(worker, msg, queue){called = true})
 
-    expect {
-      process_job(build_job_hash(initialize_worker_class(freekiqs: 2)))
-    }.to raise_error(Sidekiq::FreekiqException, 'Oops')
+    worker_class = initialize_worker_class(freekiqs: 2)
+    worker_class.perform_async
+    worker_class.perform_one
+
+    expect(worker_class.jobs).to match_array(
+      a_hash_including(
+        "queue" => "retry",
+        "retry_count" => 0,
+        "exception_class" => "Sidekiq::FreekiqException",
+      ),
+    )
+
     expect(called).to eq(true)
   end
 
   it 'should still raise FreekiqException if the callback fails' do
     initialize_middleware(callback: ->(worker, msg, queue){raise 'callback error'})
 
-    expect {
-      process_job(build_job_hash(initialize_worker_class(freekiqs: 2)))
-    }.to raise_error(Sidekiq::FreekiqException, 'Oops')
+    worker_class = initialize_worker_class(freekiqs: 2)
+    worker_class.perform_async
+    worker_class.perform_one
+
+    expect(worker_class.jobs).to match_array(
+      a_hash_including(
+        "queue" => "retry",
+        "retry_count" => 0,
+        "exception_class" => "Sidekiq::FreekiqException",
+      ),
+    )
   end
 end

data/spec/spec_helper.rb

@@ -2,7 +2,9 @@ require 'freekiqs'
 
 $TESTING = true
 
-Sidekiq::Logging.logger = nil
+Sidekiq.configure_server do |config|
+  config.logger = nil
+end
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: freekiqs
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.6.0
 platform: ruby
 authors:
 - Rob Lewis
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +37,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.6.0
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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'
 description: Sidekiq middleware extending RetryJobs to allow configuring how many
   exceptions a job can throw and be wrapped by a silenceable exception.
 email:
@@ -46,15 +59,26 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
+- Appraisals
+- CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - MIT-LICENSE
+- Procfile
 - README.md
 - Rakefile
-- Vagrantfile
-- circle.yml
+- development/redis/redis.conf
+- flake.lock
+- flake.nix
 - freekiqs.gemspec
+- gemfiles/sidekiq_7.gemfile
+- gemfiles/sidekiq_7.gemfile.lock
+- gemfiles/sidekiq_8.gemfile
+- gemfiles/sidekiq_8.gemfile.lock
 - lib/freekiqs.rb
 - lib/sidekiq/middleware/server/freekiqs.rb
 - spec/freekiqs_spec.rb
@@ -63,7 +87,6 @@ homepage: https://github.com/BookBub/freekiqs
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -78,9 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Sidekiq middleware extending RetryJobs to allow silient errors.
 test_files:

data/Vagrantfile

@@ -1,31 +0,0 @@
-Vagrant.configure(2) do |config|
-  config.vm.box = 'ubuntu/xenial64'
-
-  config.vm.network :private_network, ip: '192.168.33.69'
-  config.vm.network :forwarded_port, host: 2202, guest: 22, id: 'ssh', auto_correct: true
-
-  config.vm.synced_folder '.', '/vagrant', type: 'nfs'
-
-  config.vm.provider :virtualbox do |vb|
-    vb.name = 'freekiqs'
-    vb.memory = 2048
-    vb.cpus = 2
-  end
-
-  config.vm.provision :shell, inline: <<-SCRIPT
-    apt-get update
-    apt-get upgrade
-    apt-get install -y git gnupg2 redis-server
-  SCRIPT
-
-  config.vm.provision :shell, privileged: false, inline: <<-SCRIPT
-    gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
-    curl -sSL https://get.rvm.io | bash -s stable --quiet-curl --with-gems=bundler
-    source "$HOME/.rvm/scripts/rvm"
-    rvm --quiet-curl install 2.3.4
-    rvm use 2.3.4 --default
-    cd /vagrant
-    bundle install --full-index -j4
-    echo 'cd /vagrant' >> ~/.bash_profile
-  SCRIPT
-end

data/circle.yml

@@ -1,5 +0,0 @@
-machine:
-  ruby:
-    version: 2.3.4
-  services:
-    - redis