sidekiq-undertaker 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6cd46224be393f0a6c8fa5fd45a4e09e32bb43d02b236d10d4bf020a0925576
-  data.tar.gz: 82347d2923ee1e9b81c6ac1aa881c2d1011b439d4a9531a7684814c7fc4ca278
+  metadata.gz: b83cd4a266136182c00e82e85f9173d9c8b53722302ea8bc6b440706b31b12f2
+  data.tar.gz: 478bb085a406e62c4f9b6eb2b4cd8e465b39dafaffa1a827c17669ffca488c83
 SHA512:
-  metadata.gz: f2f8ecf4113b5c094925bbcc1f938e87a84050381c66c4b05e17f9bac7318a67411e94ba53f7a72001ff68f5e924d8e42a9e0f95331d8906f1af39de51635b20
-  data.tar.gz: 3f6253dc261ce23278e89f2bd3e553d28b8dce618727867c4410eb7bec0fc6b3ea07412ff7cc8141149307df88ba3f14e1e172aecea584db542f62703db8993a
+  metadata.gz: fe769f3ef5497ae2848dcd3bd858495152b813a72970cd6b311b1655c7d65e025e64cd2e88a808f4f23cced4ee2d4cc19cc7daf598df119a4127d5cbd276de16
+  data.tar.gz: bad9876a8e994490b9461f443cd93b02da7363dc9c2b1b7a6ea936741c3d4865b99b58e7328a34cdae8d66224d52bedb02affeefbe9737ba23f1825d3bc8dc46

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: monthly
+  open-pull-requests-limit: 10
+  versioning-strategy: increase

data/.github/workflows/ruby-build.yml

@@ -0,0 +1,51 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby-Build
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    services:
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # SEE: https://github.com/ruby/setup-ruby#supported-versions
+        ruby-version:
+          - 'ruby'
+          - '3.1'
+          - '2.7'
+          - 'jruby'
+          - 'jruby-9.3.2.0'
+          - 'jruby-9.2.20.0'
+          - 'truffleruby'
+          - 'truffleruby+graalvm'
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rspec spec

data/.rspec

@@ -0,0 +1,2 @@
+--color
+-r ./spec/spec_helper.rb

data/.travis.yml

@@ -1,12 +1,12 @@
 language: ruby
 cache: bundler
 rvm:
-  # - 3.0.0 # Not yet supported by all dependencies
-  - 2.7.2
-  - 2.6.6
+  - 3.0.1
+  - 2.7.3
+  - 2.6.7
   - 2.5.8
   - jruby # latest
-  - jruby-9.2.14.0
+  - jruby-9.2.17.0
   #
   # 1. https://github.com/oracle/truffleruby/issues/1398
   # 2. Nokogiri build fails
@@ -23,11 +23,11 @@ env:
 
 matrix:
   exclude:
-    - rvm: 3.0.0
+    - rvm: 3.0.1
       env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
-    - rvm: 2.7.2
+    - rvm: 2.7.3
       env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
-    - rvm: 2.6.6
+    - rvm: 2.6.7
       env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
     - rvm: 2.5.8
       env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"

data/lib/sidekiq/undertaker/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Undertaker
-    VERSION = "1.0.2"
+    VERSION = "1.1.0"
   end
 end

data/renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "config:base"
+  ]
+}

data/sidekiq-undertaker.gemspec

@@ -19,10 +19,11 @@ Gem::Specification.new do |spec|
 
   spec.homepage      = "https://github.com/ThomasKoppensteiner/sidekiq-undertaker"
   spec.metadata      = {
-    "homepage_uri"     => "https://github.com/ThomasKoppensteiner/sidekiq-undertaker",
-    "source_code_uri"  => "https://github.com/ThomasKoppensteiner/sidekiq-undertaker",
-    "bug_tracker_uri"  => "https://github.com/ThomasKoppensteiner/sidekiq-undertaker/issues",
-    "build_status_uri" => "https://travis-ci.org/ThomasKoppensteiner/sidekiq-undertaker"
+    "homepage_uri"          => "https://github.com/ThomasKoppensteiner/sidekiq-undertaker",
+    "source_code_uri"       => "https://github.com/ThomasKoppensteiner/sidekiq-undertaker",
+    "bug_tracker_uri"       => "https://github.com/ThomasKoppensteiner/sidekiq-undertaker/issues",
+    "build_status_uri"      => "https://travis-ci.org/ThomasKoppensteiner/sidekiq-undertaker",
+    "rubygems_mfa_required" => "true"
   }
 
   spec.required_ruby_version = ">= 2.5.0"
@@ -35,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", ">= 1.17", "<3"
   spec.add_development_dependency "rake", "~> 13.0"
 
-  spec.add_development_dependency "approvals", "~> 0.0.24"
+  spec.add_development_dependency "approvals", "~> 0.0.25"
   spec.add_development_dependency "mock_redis", "~> 0.19"
   spec.add_development_dependency "pry", "~> 0.12"
   spec.add_development_dependency "rack-test", "~> 1.1"
@@ -53,5 +54,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sinatra", "~> 2.0"
   spec.add_development_dependency "timecop", "~> 0.9"
 
-  spec.add_runtime_dependency "sidekiq", ">= 5.2", "< 7"
+  spec.add_runtime_dependency "sidekiq", ">= 6.2.2", "< 6.3"
 end

data/spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_filter_page_is_called/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt

@@ -12,6 +12,7 @@
     <link href="/sidekiq/stylesheets/application-dark.css" media="screen and (prefers-color-scheme: dark)" rel="stylesheet" type="text/css" />
     
 
+    <link rel="apple-touch-icon" href="/sidekiq/images/apple-touch-icon.png">
     <link rel="shortcut icon" type="image/ico" href="/sidekiq/images/favicon.ico" />
     <script type="text/javascript" src="/sidekiq/javascripts/application.js"></script>
     <meta name="google" content="notranslate" />

data/spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_job_classbucket_page_is_called/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt

@@ -12,6 +12,7 @@
     <link href="/sidekiq/stylesheets/application-dark.css" media="screen and (prefers-color-scheme: dark)" rel="stylesheet" type="text/css" />
     
 
+    <link rel="apple-touch-icon" href="/sidekiq/images/apple-touch-icon.png">
     <link rel="shortcut icon" type="image/ico" href="/sidekiq/images/favicon.ico" />
     <script type="text/javascript" src="/sidekiq/javascripts/application.js"></script>
     <meta name="google" content="notranslate" />

data/spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_job_classbucket_page_is_polled/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt

@@ -12,6 +12,7 @@
     <link href="/sidekiq/stylesheets/application-dark.css" media="screen and (prefers-color-scheme: dark)" rel="stylesheet" type="text/css" />
     
 
+    <link rel="apple-touch-icon" href="/sidekiq/images/apple-touch-icon.png">
     <link rel="shortcut icon" type="image/ico" href="/sidekiq/images/favicon.ico" />
     <script type="text/javascript" src="/sidekiq/javascripts/application.js"></script>
     <meta name="google" content="notranslate" />

data/spec/fixtures/approvals/sidekiq_undertaker_webextension/show_morgue/when_job_classerrorbucket_is_called/with_all_failures_and_errors/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt

@@ -12,6 +12,7 @@
     <link href="/sidekiq/stylesheets/application-dark.css" media="screen and (prefers-color-scheme: dark)" rel="stylesheet" type="text/css" />
     
 
+    <link rel="apple-touch-icon" href="/sidekiq/images/apple-touch-icon.png">
     <link rel="shortcut icon" type="image/ico" href="/sidekiq/images/favicon.ico" />
     <script type="text/javascript" src="/sidekiq/javascripts/application.js"></script>
     <meta name="google" content="notranslate" />
@@ -174,7 +175,7 @@
 
 
     <form action="/sidekiq/undertaker/morgue" method="post">
-      <input type='hidden' name='authenticity_token' value=''/>
+      <input type='hidden' name='authenticity_token' value='stubbed-csrf-token'/>
       <table class="table table-striped table-bordered table-white">
         <thead>
           <tr>
@@ -281,12 +282,12 @@
     </form>
 
     <form action="/sidekiq/undertaker/morgue/all/all/total_dead/delete" method="post">
-      <input type='hidden' name='authenticity_token' value=''/>
+      <input type='hidden' name='authenticity_token' value='stubbed-csrf-token'/>
       <input class="btn btn-danger btn-xs pull-right" type="submit" name="delete" value="Bury All" data-confirm="Are you sure?" />
     </form>
 
     <form action="/sidekiq/undertaker/morgue/all/all/total_dead/retry" method="post">
-      <input type='hidden' name='authenticity_token' value=''/>
+      <input type='hidden' name='authenticity_token' value='stubbed-csrf-token'/>
       <input class="btn btn-danger btn-xs pull-right" type="submit" name="retry" value="Revive All" data-confirm="Are you sure?" />
     </form>
 

data/spec/fixtures/approvals/sidekiq_undertaker_webextension/show_morgue/when_job_classerrorbucket_is_called/with_specific_job_class_and_a_specific_error/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt

@@ -12,6 +12,7 @@
     <link href="/sidekiq/stylesheets/application-dark.css" media="screen and (prefers-color-scheme: dark)" rel="stylesheet" type="text/css" />
     
 
+    <link rel="apple-touch-icon" href="/sidekiq/images/apple-touch-icon.png">
     <link rel="shortcut icon" type="image/ico" href="/sidekiq/images/favicon.ico" />
     <script type="text/javascript" src="/sidekiq/javascripts/application.js"></script>
     <meta name="google" content="notranslate" />
@@ -174,7 +175,7 @@
 
 
     <form action="/sidekiq/undertaker/morgue" method="post">
-      <input type='hidden' name='authenticity_token' value=''/>
+      <input type='hidden' name='authenticity_token' value='stubbed-csrf-token'/>
       <table class="table table-striped table-bordered table-white">
         <thead>
           <tr>
@@ -239,12 +240,12 @@
     </form>
 
     <form action="/sidekiq/undertaker/morgue/HardWorker/RuntimeError/1_hour/delete" method="post">
-      <input type='hidden' name='authenticity_token' value=''/>
+      <input type='hidden' name='authenticity_token' value='stubbed-csrf-token'/>
       <input class="btn btn-danger btn-xs pull-right" type="submit" name="delete" value="Bury All" data-confirm="Are you sure?" />
     </form>
 
     <form action="/sidekiq/undertaker/morgue/HardWorker/RuntimeError/1_hour/retry" method="post">
-      <input type='hidden' name='authenticity_token' value=''/>
+      <input type='hidden' name='authenticity_token' value='stubbed-csrf-token'/>
       <input class="btn btn-danger btn-xs pull-right" type="submit" name="retry" value="Revive All" data-confirm="Are you sure?" />
     </form>
 

data/spec/fixtures/approvals/sidekiq_undertaker_webextension/show_morgue/when_job_classerrorbucket_is_called/with_specific_job_class_and_a_specific_error/with_pagination/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt

@@ -12,6 +12,7 @@
     <link href="/sidekiq/stylesheets/application-dark.css" media="screen and (prefers-color-scheme: dark)" rel="stylesheet" type="text/css" />
     
 
+    <link rel="apple-touch-icon" href="/sidekiq/images/apple-touch-icon.png">
     <link rel="shortcut icon" type="image/ico" href="/sidekiq/images/favicon.ico" />
     <script type="text/javascript" src="/sidekiq/javascripts/application.js"></script>
     <meta name="google" content="notranslate" />
@@ -192,7 +193,7 @@
 
 
     <form action="/sidekiq/undertaker/morgue" method="post">
-      <input type='hidden' name='authenticity_token' value=''/>
+      <input type='hidden' name='authenticity_token' value='stubbed-csrf-token'/>
       <table class="table table-striped table-bordered table-white">
         <thead>
           <tr>
@@ -1265,12 +1266,12 @@
     </form>
 
     <form action="/sidekiq/undertaker/morgue/HardWorker/RuntimeError/1_hour/delete" method="post">
-      <input type='hidden' name='authenticity_token' value=''/>
+      <input type='hidden' name='authenticity_token' value='stubbed-csrf-token'/>
       <input class="btn btn-danger btn-xs pull-right" type="submit" name="delete" value="Bury All" data-confirm="Are you sure?" />
     </form>
 
     <form action="/sidekiq/undertaker/morgue/HardWorker/RuntimeError/1_hour/retry" method="post">
-      <input type='hidden' name='authenticity_token' value=''/>
+      <input type='hidden' name='authenticity_token' value='stubbed-csrf-token'/>
       <input class="btn btn-danger btn-xs pull-right" type="submit" name="retry" value="Revive All" data-confirm="Are you sure?" />
     </form>
 

data/spec/sidekiq/undertaker/job_distributor_spec.rb

@@ -6,28 +6,28 @@ module Sidekiq
   module Undertaker
     describe JobDistributor do
       let(:job1) do
-        instance_double(Sidekiq::Job, item: {
+        instance_double(Sidekiq::JobRecord, item: {
                           "class"       => "A",
                           "failed_at"   => 1,
                           "error_class" => "E1"
                         })
       end
       let(:job2) do
-        instance_double(Sidekiq::Job, item: {
+        instance_double(Sidekiq::JobRecord, item: {
                           "class"       => "A",
                           "failed_at"   => 1,
                           "error_class" => "E1"
                         })
       end
       let(:job3) do
-        instance_double(Sidekiq::Job, item: {
+        instance_double(Sidekiq::JobRecord, item: {
                           "class"       => "B",
                           "failed_at"   => 1,
                           "error_class" => "E1"
                         })
       end
       let(:job4) do
-        instance_double(Sidekiq::Job, item: {
+        instance_double(Sidekiq::JobRecord, item: {
                           "class"       => "B",
                           "failed_at"   => 1,
                           "error_class" => "E2"

data/spec/sidekiq/undertaker/job_filter_spec.rb

@@ -7,7 +7,7 @@ module Sidekiq
     describe JobFilter do
       describe ".filter_dead_jobs" do
         let(:job1) do
-          instance_double(Sidekiq::Job, item: {
+          instance_double(Sidekiq::JobRecord, item: {
                             "class"       => "HardWorkTask",
                             "failed_at"   => Time.now.to_i - 5 * 60,
                             "error_class" => "NoMethodError"
@@ -15,7 +15,7 @@ module Sidekiq
         end
 
         let(:job2) do
-          instance_double(Sidekiq::Job, item: {
+          instance_double(Sidekiq::JobRecord, item: {
                             "class"       => "HardWorkTask",
                             "failed_at"   => Time.now.to_i - 2 * 60 * 60,
                             "error_class" => "RandomError"
@@ -23,7 +23,7 @@ module Sidekiq
         end
 
         let(:job3) do
-          instance_double(Sidekiq::Job, item: {
+          instance_double(Sidekiq::JobRecord, item: {
                             "class"       => "LazyWorkTask",
                             "failed_at"   => Time.now.to_i - 2 * 60 * 60,
                             "error_class" => "NoMethodError"

data/spec/sidekiq/undertaker/web_extension_spec.rb

@@ -13,7 +13,13 @@ module Sidekiq
     describe WebExtension, type: :controller do
       include Rack::Test::Methods
 
-      let(:app) { Sidekiq::Web }
+      let(:app) do
+        Sidekiq::Web.new.tap do |app|
+          # In order to use the Web UI of Sidekiq `6.2` a session is required
+          # SEE: https://github.com/mperham/sidekiq/blob/master/Changes.md#620
+          app.use Rack::Session::Cookie, secret: "A-Test-Web-Session-Secret"
+        end
+      end
       let(:job_refs) { [] }
 
       let(:jid1) { "4416aa76eb8cf03f56a49220" }
@@ -43,8 +49,9 @@ module Sidekiq
         job_refs.push add_dead("jid" => jid4, "class" => "HardWorker1", "error_class" => "NoMethodError")
 
         allow_any_instance_of(Sidekiq::WebAction).to receive(:root_path).and_return("/sidekiq/")
+
+        allow_any_instance_of(::Sidekiq::Web::CsrfProtection).to receive(:valid_token?).and_return(true)
       end
-      # rubocop:enable RSpec/AnyInstance
 
       after { Timecop.return }
 
@@ -69,6 +76,10 @@ module Sidekiq
       end
 
       describe "show filter" do
+        before do
+          allow_any_instance_of(Sidekiq::Web::CsrfProtection).to receive(:mask_token).and_return("stubbed-csrf-token")
+        end
+
         # /undertaker/filter
         context "when filter page is called" do
           subject { get "/undertaker/filter" }
@@ -92,6 +103,10 @@ module Sidekiq
       end
 
       describe "show morgue" do
+        before do
+          allow_any_instance_of(Sidekiq::Web::CsrfProtection).to receive(:mask_token).and_return("stubbed-csrf-token")
+        end
+
         # /undertaker/morgue/:job_class/:error_class/:bucket_name
         context "when job-class/error/bucket is called" do
           context "with specific job-class and a specific error" do
@@ -117,6 +132,7 @@ module Sidekiq
           end
         end
       end
+      # rubocop:enable RSpec/AnyInstance
 
       describe "delete" do
         context "when job-class, error and bucket are given" do

data/spec/spec_helper.rb

@@ -36,15 +36,14 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
+  config.approvals_default_format = :txt
+
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = "random"
-
-  RSpec.configure do |con|
-    con.approvals_default_format = :txt
-  end
+  Kernel.srand config.seed
 
   config.before do
     ::Sidekiq.redis(&:flushdb)
@@ -56,7 +55,7 @@ def apply_custom_excludes(data)
 end
 
 def build_job(item)
-  Sidekiq::Job.new(item)
+  Sidekiq::JobRecord.new(item)
 end
 
 def job_to_sorted_entry(job, score: Time.now.utc.to_i, set: Sidekiq::SortedSet.new("test-jobs"))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-undertaker
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Thomas Koppensteiner
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.24
+        version: 0.0.25
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.24
+        version: 0.0.25
 - !ruby/object:Gem::Dependency
   name: mock_redis
   requirement: !ruby/object:Gem::Requirement
@@ -288,20 +288,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 6.2.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '6.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 6.2.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '6.3'
 description: |2
       Sidekiq::Undertaker is a plugin for Sidekiq.
       It allows exploring, reviving (retrying) or burying (deleting) dead jobs.
@@ -313,7 +313,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/dependabot.yml"
+- ".github/workflows/ruby-build.yml"
 - ".gitignore"
+- ".rspec"
 - ".rubocop.yml"
 - ".rubocop_codeclimate.yml"
 - ".rubocop_todo.yml"
@@ -334,6 +337,7 @@ files:
 - lib/sidekiq/undertaker/version.rb
 - lib/sidekiq/undertaker/web_extension.rb
 - lib/sidekiq/undertaker/web_extension/api_helpers.rb
+- renovate.json
 - sidekiq-undertaker.gemspec
 - spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_filter_page_is_called/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt
 - spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_job_classbucket_page_is_called/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt
@@ -359,6 +363,7 @@ metadata:
   source_code_uri: https://github.com/ThomasKoppensteiner/sidekiq-undertaker
   bug_tracker_uri: https://github.com/ThomasKoppensteiner/sidekiq-undertaker/issues
   build_status_uri: https://travis-ci.org/ThomasKoppensteiner/sidekiq-undertaker
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths: