sidekiq-expiring-jobs 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb92ddcc1f401edb1b9f9462e599c9800ec8ea9550bc7568f16aab9bbf88ae88
-  data.tar.gz: 9f2e2483ec683668a512f7580d93de0dac245ee7a1179c81b36e1da21d711532
+  metadata.gz: 881ada6ecc27a5b6a80fb5f95153d924cb4a8d89eeb95d066756ca038aedfd7c
+  data.tar.gz: 2fcea2ff6040393dcc73adb27e94bab7ef612b817cfe21bc1a94ef32ce64e50e
 SHA512:
-  metadata.gz: a01c577b380b0f4a4d5cb02660bcca4d82cb33995c7f6042b99c9a28a9aa5185e15f2d6a5408e837843b37c0df9fd304efa52c870e2aa793811ff53597af6367
-  data.tar.gz: c30d348d3d9bba82c26bf482e58572e05f06fb6a578a1a902d3b31d21ecbf82e383255f510718c6f6331b46c49abf727e2f511660e09124f1d3340f28f745b9c
+  metadata.gz: 24979411d040e8da8298a30936b656478d53d94adb6df1766374dac6c529a17bf08350dea2afbf583efef119e782f56956307413c275db8f277fdf6a1f12e270
+  data.tar.gz: 299072e39583f57f9fecf25c9aade5ef18c6fce0a8c3f502181112e3aab8545c3aa97af3d909eb0c4889ceb49ba9c886d995b833b33d9ad5f314009f4bbd0d6a

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## master (unreleased)
 
+## 0.2.0 (2025-09-15)
+
+- Do not recalculate `expires_at` if already exists
+- Drop support for Ruby < 3.2 and Sidekiq < 8.0
+
+## 0.1.1 (2024-01-14)
+
+- Raise when `:expires_in` is an absolute time
+
 ## 0.1.0 (2023-04-12)
 
 - First release

data/README.md

@@ -15,8 +15,8 @@ Note: Sidekiq Pro has this feature, so please consider upgrading if you can.
 
 ## Requirements
 
-- Ruby 2.7+
-- Sidekiq 6.0+
+- Ruby 3.2+
+- Sidekiq 8.0+
 
 ## Installation
 
@@ -72,8 +72,6 @@ SidekiqExpiringJobs.expiration_callback = ->(job) {}
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing

data/lib/sidekiq_expiring_jobs/middleware.rb

@@ -4,9 +4,21 @@ module SidekiqExpiringJobs
   module Middleware
     class Client
       def call(_worker_class, job, _queue, _redis_pool)
-        if (expires_in = job.delete("expires_in"))
-          at = job["at"] || job["created_at"]
-          job["expires_at"] = at + expires_in.to_f
+        # The job is requeued, e.g. by sidekiq-throttled gem. Do not update the expiration time.
+        if job["expires_at"] && job["expires_at"] < Time.now.to_f
+          Sidekiq.logger.info("[SidekiqExpiringJobs] Expired #{job['class']} job (jid=#{job['jid']}) is skipped")
+          SidekiqExpiringJobs.expiration_callback&.call(job)
+
+          return false
+        end
+
+        if (expires_in = job.delete("expires_in")) && job["expires_at"].nil?
+          expires_in = expires_in.to_f
+          raise ArgumentError, ":expires_in must be a relative time, not absolute time" if expires_in > 1_000_000_000
+
+          # created_at is stored in milliseconds starting from sidekiq 8.0.
+          at = job["at"] || (job["created_at"] / 1000.0)
+          job["expires_at"] = at + expires_in
         end
         yield
       end
@@ -14,13 +26,9 @@ module SidekiqExpiringJobs
 
     class Server
       def call(_worker, job, _queue)
-        if (expires_at = job["expires_at"])
-          if expires_at >= Time.now.to_f
-            yield
-          else
-            Sidekiq.logger.info("[SidekiqExpiringJobs] Expired #{job['class']} job (jid=#{job['jid']}) is skipped")
-            SidekiqExpiringJobs.expiration_callback&.call(job)
-          end
+        if job["expires_at"] && job["expires_at"] < Time.now.to_f
+          Sidekiq.logger.info("[SidekiqExpiringJobs] Expired #{job['class']} job (jid=#{job['jid']}) is skipped")
+          SidekiqExpiringJobs.expiration_callback&.call(job)
         else
           yield
         end

data/lib/sidekiq_expiring_jobs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqExpiringJobs
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-expiring-jobs
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - fatkodima
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-12 00:00:00.000000000 Z
+date: 2025-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
 description: |
   Support for Sidekiq jobs which expire after a certain length of time.
   Jobs that are set to expire can run as long as they want, but an expiring job
@@ -56,14 +56,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.7
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Expiring jobs support for Sidekiq.