sidekiq-unique-jobs 6.0.24 → 6.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8ea40e3f79410d8c203d4df254cb6b9b756123b6aacaf15843843c4bd4337c5
-  data.tar.gz: 353ea6c92b0d945ad6571e0c20039c9df7093b74404d05a6e9633447e58827f9
+  metadata.gz: 4e4a5def96ece2946f797bd00a323909114bd2fb17e14a79cd3ad2f34548e0a4
+  data.tar.gz: ffd9cc5bebb767009f11440c743b927886cd73d6e02e3c582755788253f0f548
 SHA512:
-  metadata.gz: 9c8c527b0a495bcd33672bf02afafadfe0b737394e2e357ca9d40d011ab5e5aaf6c927ae9c67e0bb7b4d2ebbfd43b485fa10e2fec97e3d0523371c3e06f8f1c7
-  data.tar.gz: ba00d25b2f3c6dc5d40cb472de73417c83e4c9c75005cd3339d80e86bb00964f34d8a0ea485e50af2406db025889e901610bc382af00588f82297d0fb16c9d97
+  metadata.gz: 8efa25768ba6136cc9b438044e16292d04a98d0c9e9cdd59dea592659c79858442d5cd21706907280815635de44592823e9f56806916fbd4b98302deb9913c84
+  data.tar.gz: c936ecdad96bbbf4ac20ad59ac8bff328862a09726aeb6a328e5b725de774010873441e9ec8e8517dcb7611d058a41b50715a01ad6386904dbb01de0c86628aa

data/lib/sidekiq_unique_jobs/constants.rb

@@ -7,6 +7,7 @@
 #
 module SidekiqUniqueJobs
   ARGS_KEY                  ||= "args"
+  APARTMENT                 ||= "apartment"
   AT_KEY                    ||= "at"
   CLASS_KEY                 ||= "class"
   JAVA                      ||= "java"

data/lib/sidekiq_unique_jobs/middleware.rb

@@ -20,16 +20,24 @@ module SidekiqUniqueJobs
       configure_client_middleware
     end
 
-    def configure_server_middleware
+    def configure_server_middleware # rubocop:disable Metrics/MethodLength
       Sidekiq.configure_server do |config|
         config.client_middleware do |chain|
           require "sidekiq_unique_jobs/client/middleware"
-          chain.add SidekiqUniqueJobs::Client::Middleware
+          if defined?(Apartment::Sidekiq::Middleware::Client)
+            chain.insert_after Apartment::Sidekiq::Middleware::Client, SidekiqUniqueJobs::Client::Middleware
+          else
+            chain.add SidekiqUniqueJobs::Client::Middleware
+          end
         end
 
         config.server_middleware do |chain|
           require "sidekiq_unique_jobs/server/middleware"
-          chain.add SidekiqUniqueJobs::Server::Middleware
+          if defined?(Apartment::Sidekiq::Middleware::Server)
+            chain.insert_after Apartment::Sidekiq::Middleware::Server, SidekiqUniqueJobs::Server::Middleware
+          else
+            chain.add SidekiqUniqueJobs::Server::Middleware
+          end
         end
       end
     end
@@ -38,7 +46,11 @@ module SidekiqUniqueJobs
       Sidekiq.configure_client do |config|
         config.client_middleware do |chain|
           require "sidekiq_unique_jobs/client/middleware"
-          chain.add SidekiqUniqueJobs::Client::Middleware
+          if defined?(Apartment::Sidekiq::Middleware::Client)
+            chain.insert_after Apartment::Sidekiq::Middleware::Client, SidekiqUniqueJobs::Client::Middleware
+          else
+            chain.add SidekiqUniqueJobs::Client::Middleware
+          end
         end
       end
     end

data/lib/sidekiq_unique_jobs/unique_args.rb

@@ -61,7 +61,7 @@ module SidekiqUniqueJobs
     # Filter a hash to use for digest
     # @return [Hash] to use for digest
     def digestable_hash
-      @item.slice(CLASS_KEY, QUEUE_KEY, UNIQUE_ARGS_KEY).tap do |hash|
+      @item.slice(CLASS_KEY, QUEUE_KEY, UNIQUE_ARGS_KEY, APARTMENT).tap do |hash|
         hash.delete(QUEUE_KEY) if unique_across_queues?
         hash.delete(CLASS_KEY) if unique_across_workers?
       end

data/lib/sidekiq_unique_jobs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqUniqueJobs
-  VERSION = "6.0.24"
+  VERSION = "6.0.25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 6.0.24
+  version: 6.0.25
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-27 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -317,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Sidekiq middleware that prevents duplicates jobs