resque-retry 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e59965fb9d40a6d3f680291e5cbdec8edf04946ad50749175e984062a52e9d1c
-  data.tar.gz: c7962de9928657b3b4b2745efbb5e403a512f44a1b0cd5db5701aee87302dffa
+  metadata.gz: '0970fd3a1de751413b1122777bebd85f90087a5603c0777300dd833016c33ad2'
+  data.tar.gz: e13c360264e4e4575ad86decd44308b68240609e2fd5647b9ea95374312560a6
 SHA512:
-  metadata.gz: 41c214710cdfb36737e8ed9cc598f625df4020e29a056f235fd8aa636cec7f2e220f63afbfa29090b944444cee0f938b66d676b23496671b65f7f1051f08b8e4
-  data.tar.gz: c78705b7a1a87c9b92c8eb6c9b72070dfb51f52dcab7b3cdc55e2a0a89940f34a1ef98255f11986a43011c6a56abeeee0d2f96493b41ee921ad90dab178ce76b
+  metadata.gz: b46ceb1bb420cc1ca9a9fe4b259ed61f15b555d27dc1886bf2eaa05545269f19338347771b1ad64ee7b28c3e2efb6610b0cba742c3a301a272e05a54bd151fbd
+  data.tar.gz: ca029fa9212487b7666f819fbc9085f7096b55e79286a9bc0090e4c8ae77e6da3f561f740b54092c2635f2775b499fe6798c309ef3c2d0fd5068bb1d262300f6

data/.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
           - 6379:6379
     strategy:
       matrix:
-        ruby-version: ['3.1', '3.0', '2.7']
+        ruby-version: ['4.0', '3.4', '3.3', '3.2']
 
     steps:
       - uses: actions/checkout@v2

data/HISTORY.md

@@ -1,3 +1,14 @@
+# 1.9.0 (2026-01-23)
+
+* Allow Resque 3.X versions
+* Add Ruby 3.2, 3.3, 3.4, and 4.0 to the test matrix
+* Remove Ruby 2.7, 3.0, and 3.1 from the test matrix (EOL)
+* Update development dependencies (`minitest`, `rack-test`, `mocha`, `rake`)
+
+# 1.8.1 (2023-06-25)
+
+* Prevent crashing due to `nil` keys on newer _Redis_ client
+
 # 1.8.0 (2023-04-15)
 
 * Address `retry_key_exists?` issue that was originally reported /

data/lib/resque-retry/server.rb

@@ -49,12 +49,21 @@ module ResqueRetry
 
       # gets the number of retry attempts for a job.
       def retry_attempts_for_job(job)
-        Resque.redis.get(retry_key_for_job(job))
+        retry_key = retry_key_for_job(job)
+        if retry_key
+          Resque.redis.get(retry_key)
+        else
+          nil
+        end
       end
 
       # gets the failure details hash for a job.
       def retry_failure_details(retry_key)
-        Resque.decode(Resque.redis.get("failure-#{retry_key}"))
+        if retry_key
+          Resque.decode(Resque.redis.get("failure-#{retry_key}"))
+        else
+          nil
+        end
       end
 
       # reads a 'local' template file.

data/lib/resque-retry/version.rb

@@ -1,3 +1,3 @@
 module ResqueRetry
-  VERSION = '1.8.0'
+  VERSION = '1.9.0'
 end

data/resque-retry.gemspec

@@ -4,6 +4,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'resque-retry/version'
 
 Gem::Specification.new do |s|
+  s.required_ruby_version = '>= 3.2'
+
   s.name = 'resque-retry'
   s.version = ResqueRetry::VERSION
   s.date = Time.now.strftime('%Y-%m-%d')
@@ -28,14 +30,14 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split($/)
   s.require_paths = %w[lib]
 
-  s.add_dependency('resque', '>= 1.25', '< 3.0')
+  s.add_dependency('resque', '>= 1.25', '< 4.0')
   s.add_dependency('resque-scheduler', '>= 4.0', '<6.0')
 
-  s.add_development_dependency('rake', '~> 10.3')
-  s.add_development_dependency('minitest', '~> 5.5')
-  s.add_development_dependency('rack-test', '~> 0.6')
+  s.add_development_dependency('rake', '>= 10.3', '< 14')
+  s.add_development_dependency('minitest', '~> 6.0')
+  s.add_development_dependency('rack-test', '~> 2.0')
   s.add_development_dependency('yard', '~> 0.8')
   s.add_development_dependency('json', '~> 2.0')
   s.add_development_dependency('simplecov', '~> 0.9')
-  s.add_development_dependency('mocha', '~> 1.1')
+  s.add_development_dependency('mocha', '~> 3.0')
 end

data/test/resque_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class ResqueTest < Minitest::Test
   def test_resque_version
     major, minor, _ = resque_version.split('.')
-    assert [1, 2].include?(major.to_i), 'major version does not match'
+    assert [1, 2, 3].include?(major.to_i), 'major version does not match'
 
     if major.to_i == 1
       assert_operator minor.to_i, :>=, 25, 'minor version is too low'

data/test/server_helpers_test.rb

@@ -19,4 +19,17 @@ class ServerHelpersTest < Minitest::Test
     job = Resque.delayed_timestamp_peek(timestamp, 0, 1).first
     assert_equal '0', @helpers.retry_attempts_for_job(job), 'should have 0 retry attempt'
   end
+
+  def test_retry_key_for_job_empty
+    Resque.enqueue(DelayedJobNoRetryKey)
+    perform_next_job(@worker)
+
+    timestamp = Resque.delayed_queue_peek(0, 1).first
+    job = Resque.delayed_timestamp_peek(timestamp, 0, 1).first
+    retry_key = @helpers.retry_key_for_job(job)
+
+    assert_nil retry_key, 'should be nil as the class does not respond to redis_retry_key'
+    assert_nil @helpers.retry_attempts_for_job(job), 'should have nil retry attempts as the key does not exist'
+    assert_nil @helpers.retry_failure_details(retry_key), 'should have nil failure details as the key does not exist'
+  end
 end

data/test/server_test.rb

@@ -1,10 +1,11 @@
 require 'test_helper'
+require 'rack/test'
 require 'resque-retry/server'
 
 ENV['RACK_ENV'] = ENV['RAILS_ENV']
 
 # Testing the Resque web interface additions.
-class ServerTest < MiniTest::Test
+class ServerTest < Minitest::Test
   include Rack::Test::Methods
 
   def setup
@@ -17,6 +18,10 @@ class ServerTest < MiniTest::Test
     Resque::Server
   end
 
+  def default_host
+    'localhost'
+  end
+
   # make sure the world looks okay first =)
   def test_were_able_to_access_normal_resque_web_overview
     get '/overview'

data/test/test_helper.rb

@@ -16,8 +16,7 @@ require 'rubygems'
 require 'timeout'
 require 'minitest/autorun'
 require 'minitest/pride'
-require 'rack/test'
-require 'mocha/setup'
+require 'mocha/minitest'
 
 require 'resque-retry'
 require dir + '/test_jobs'

data/test/test_jobs.rb

@@ -198,6 +198,10 @@ class LimitThreeJobDelay1Hour < LimitThreeJob
   @retry_delay = 3600
 end
 
+class DelayedJobNoRetryKey
+  @queue = :testing
+end
+
 class FailFiveTimesJob < RetryDefaultsJob
   @queue = :testing
   @retry_limit = 6

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: resque-retry
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Luke Antins
 - Ryan Carver
 - Jonathan W. Zaleski
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-15 00:00:00.000000000 Z
+date: 2026-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -21,7 +20,7 @@ dependencies:
         version: '1.25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +30,7 @@ dependencies:
         version: '1.25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: resque-scheduler
   requirement: !ruby/object:Gem::Requirement
@@ -56,44 +55,50 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +147,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.0'
 description: |2
     resque-retry provides retry, delay and exponential backoff support for
     resque jobs.
@@ -214,7 +219,6 @@ homepage: http://github.com/lantins/resque-retry
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -222,15 +226,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A resque plugin; provides retry, delay and exponential backoff support for
   resque jobs.