sidekiq-debouncer 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a48a55ff72c620ec5c777c51d93008502eee9a5a5e6ac5678936a0a937f9300
-  data.tar.gz: a3a99b8171604c90d3e3fb2ee2665e8601d2a53e22cae488d7a3018f298c734a
+  metadata.gz: e4a9a96453d838cc36e81e1fe2d68ac8269a86b17d6db437f84aec0b599267cf
+  data.tar.gz: bbd138d4b850c86ecdac14e2d9857444c92ec9811a3612e19627aee3145873e1
 SHA512:
-  metadata.gz: caf0fe8240dd387090d730f7421ed6f92897bbbb770410b7f2861f1bf898f261c8cf801519c9f974c50e9a4929fff3da5f275280bca4de4506bf17ea48fbaff4
-  data.tar.gz: 262ca59401d304f301413beda565c40f2557a2352f156ad84e9422e0ab2cf30006e7038e31bcbb67c80ecbe4a575880a3074e6ec74657c74fca4ce250f645c61
+  metadata.gz: 7d7457e8273f79dac578f78231d5ce73380259076bae636a362124b54c26acd2d4ebc487598dfad7dcb529a023e246beabcf7d24383159f0abde667caec822bc
+  data.tar.gz: 9d730f2c1f36671a550a80a222a1f363f79624b2f0f74ceefc70d7928c06a40ef556a7cb3e360088ee482755d99c610323a9699f3db5b4dfee5de284bd1d9600

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [3.2.0] - 2026-02-15
+- Support extra attributes ([#37](https://github.com/paladinsoftware/sidekiq-debouncer/pull/37))
+- Fix loading order issues ([#36](https://github.com/paladinsoftware/sidekiq-debouncer/pull/36))
+- Bump Ruby and Sidekiq versions ([#35](https://github.com/paladinsoftware/sidekiq-debouncer/pull/35))
+
 ## [3.1.0] - 2025-03-28
 - Drop support for Ruby < 3.2.0
 - Support for Sidekiq 8 ([#31](https://github.com/paladinsoftware/sidekiq-debouncer/pull/31), [#32](https://github.com/paladinsoftware/sidekiq-debouncer/pull/32))

data/README.md

@@ -99,6 +99,12 @@ Sidekiq.configure_client do |config|
 end
 ```
 
+## Middleware context
+
+When multiple jobs are debounced together, the full job hash from the **last job** is preserved. This means any context added by other middlewares (like `acts_as_tenant`, Sidekiq's `CurrentAttributes`, or custom middleware data) will be taken from the most recent job.
+
+For example, if you debounce 3 jobs with different tenant contexts, the final executed job will use the tenant from the 3rd (last) job.
+
 ## Web UI
 Add `require 'sidekiq/debouncer/web'` after `require 'sidekiq/web'`.
 

data/lib/sidekiq/debouncer/enq.rb

@@ -18,11 +18,7 @@ module Sidekiq
           while !@done && (job, score = zpopbyscore_withscore(conn, [Sidekiq::Debouncer::SET], [Time.now.to_f.to_s]))
             job_args = zpopbyscore_multi(conn, [job], [score])
 
-            final_args = job_args.map { |elem| Sidekiq.load_json(elem.split("-", 2)[1]) }
-            job_class = job.split("/")[2]
-            klass = Object.const_get(job_class)
-
-            @client.push({"args" => final_args, "class" => klass, "debounce_key" => job})
+            @client.push(JobBuilder.build(job_args, job))
 
             logger.debug { "enqueued #{Sidekiq::Debouncer::SET}: #{job}" }
           end

data/lib/sidekiq/debouncer/job.rb

@@ -3,8 +3,6 @@
 module Sidekiq
   module Debouncer
     class Job
-      include Sidekiq::JobUtil
-
       attr_reader :key, :score
 
       def initialize(key, score)
@@ -17,12 +15,11 @@ module Sidekiq
       end
 
       def args
-        @_args ||= Sidekiq.redis { |conn| conn.call("ZRANGE", key, "-inf", "+inf", "BYSCORE") }
-          .map { |elem| Sidekiq.load_json(elem.split("-", 2)[1]) }
+        item["args"]
       end
 
       def queue
-        normalized["queue"]
+        item["queue"]
       end
 
       def klass
@@ -31,10 +28,11 @@ module Sidekiq
 
       alias_method :display_class, :klass
 
-      private
-
-      def normalized
-        @_normalized ||= normalize_item({"args" => args, "class" => Object.const_get(klass), "debounce_key" => key})
+      def item
+        @_item ||= begin
+          job_args = Sidekiq.redis { |conn| conn.call("ZRANGE", key, "-inf", "+inf", "BYSCORE") }
+          JobBuilder.build(job_args, key)
+        end
       end
     end
   end

data/lib/sidekiq/debouncer/job_builder.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Sidekiq
+  module Debouncer
+    module JobBuilder
+      extend Sidekiq::JobUtil
+
+      def self.build(job_args, debounce_key)
+        base_job = nil
+        final_args = job_args.map do |elem|
+          if elem.start_with?("{")
+            base_job = Sidekiq.load_json(elem)
+            base_job["args"]
+          else
+            Sidekiq.load_json(elem.split("-", 2)[1])
+          end
+        end
+
+        if base_job
+          base_job.merge("args" => final_args, "debounce_key" => debounce_key)
+        else
+          # Old format fallback - normalize to get queue from class
+          job_class = debounce_key.split("/")[2]
+          normalize_item("args" => final_args, "class" => Object.const_get(job_class), "debounce_key" => debounce_key)
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/debouncer/middleware/client.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "securerandom"
-
 module Sidekiq
   module Debouncer
     module Middleware
@@ -42,10 +40,10 @@ module Sidekiq
 
           return job.merge("args" => [job["args"]], "debounce_key" => key) if testing?
 
-          args_stringified = "#{SecureRandom.hex(12)}-#{Sidekiq.dump_json(job["args"])}"
+          job_stringified = Sidekiq.dump_json(job)
 
           redis do |connection|
-            redis_debounce(connection, [Sidekiq::Debouncer::SET, key], [args_stringified, time, @debounce_key_ttl])
+            redis_debounce(connection, [Sidekiq::Debouncer::SET, key], [job_stringified, time, @debounce_key_ttl])
           end
 
           # prevent normal sidekiq flow

data/lib/sidekiq/debouncer/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Debouncer
-    VERSION = "3.1.0"
+    VERSION = "3.2.0"
   end
 end

data/lib/sidekiq/debouncer/views/show.html.erb

@@ -34,6 +34,14 @@
             </code>
           </td>
         </tr>
+        <% unless retry_extra_items(@job).empty? %>
+        <tr>
+          <th><%= t('Extras') %></th>
+          <td>
+            <code><%= retry_extra_items(@job).inspect %></code>
+          </td>
+        </tr>
+        <% end %>
       </tbody>
     </table>
   </div>

data/lib/sidekiq/debouncer/web_extension.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require "base64"
+require "sidekiq/api"
+require "sidekiq/debouncer/set"
 
 module Sidekiq
   module Debouncer

data/lib/sidekiq/debouncer.rb

@@ -3,10 +3,10 @@
 require "sidekiq/debouncer/version"
 require "sidekiq/debouncer/errors"
 require "sidekiq/debouncer/lua_commands"
+require "sidekiq/debouncer/job_builder"
 require "sidekiq/debouncer/middleware/client"
 require "sidekiq/debouncer/middleware/server"
 require "sidekiq/debouncer/job"
-require "sidekiq/debouncer/set"
 
 module Sidekiq
   module Debouncer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-debouncer
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Sebastian Zuchmański
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-28 00:00:00.000000000 Z
+date: 2026-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -148,6 +148,7 @@ files:
 - lib/sidekiq/debouncer/enq.rb
 - lib/sidekiq/debouncer/errors.rb
 - lib/sidekiq/debouncer/job.rb
+- lib/sidekiq/debouncer/job_builder.rb
 - lib/sidekiq/debouncer/launcher.rb
 - lib/sidekiq/debouncer/locales/en.yml
 - lib/sidekiq/debouncer/lua/debounce.lua