que-unique 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea8fcf7460687578d7e50d3d3535553ba829579d61fdbe081908a8d45b31284e
-  data.tar.gz: 4b822366ff0088d4670a4b6aafa70ee2a9a7a56cb5a5465c68949d80bf7337d0
+  metadata.gz: 190128804ed1f6eebb078c53eafad450dd4ac250e928035950cef22d19cd219b
+  data.tar.gz: 9ffcef6c846cd5805aca5abe1a2d569bfffdb7372e9e83670c39b0a5c851b9b5
 SHA512:
-  metadata.gz: 18f4717b0b0d33529aacf8bed1573517f95848a1df0f9fb5a354e381a52b2a8b48cad3bda63edb07f049a47f6647710d934737d79960fae60168f2c1c7bfa125
-  data.tar.gz: c039e4c58d44fae4e06a81a021202870fc0e0e2915a01fbd1945d83b46448b6c2cd186d96110ecb2a089ddbc8c2dc2d89d51169bec61dcb91ed7ba761be2a875
+  metadata.gz: a0fecc160423b939979d352b08dca730f0493a663c9815f1cdf776b37760e0345564a600c872dc084a37202b55c11dbd58a673e2f043b854db935986870d19af
+  data.tar.gz: 5da43b172697c587f6f2c66dbbb26c93887731b892a574dd30553d3b8cc91b47a452b07109fde044ab02db49b174f61422f4f5af3af1643669eccfec3789a36a

data/lib/que/unique/transaction_class_methods.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "active_support"
 require "active_record"
 require_relative "constants"
 
@@ -10,7 +11,7 @@ module Que
     module TransactionClassMethods
       def transaction(...)
         start_que_unique_handled_transaction
-        super(...)
+        super
       ensure
         end_que_unique_handled_transaction
       end

data/lib/que/unique/version.rb

@@ -2,6 +2,6 @@
 
 module Que
   module Unique
-    VERSION = "1.1.0"
+    VERSION = "1.3.0"
   end
 end

data/lib/que/unique.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/concern'
+require "active_support/concern"
 require "que"
 require_relative "unique/version"
 require_relative "unique/constants"
@@ -14,7 +14,7 @@ module Que
 
     included do
       singleton_class.class_eval do
-        def enqueue_before_unique(*args)
+        def enqueue_before_unique(*args, **kwargs)
           thread_local_hash = Thread.current[Que::Unique::THREAD_LOCAL_KEY]
           unless thread_local_hash
             raise "UniqueQueJob #{self} being scheduled outside a transaction"
@@ -22,15 +22,17 @@ module Que
 
           # Once the args are canonicalised, we convert it to a JSON string to match against.
           canonicalised_args = args.map { |arg| Que::Unique.canonicalise_que_unique_arg(arg) }
-          args_key = { self => canonicalised_args }.to_json
+          canonicalised_kwargs = Que::Unique.canonicalise_que_unique_arg(kwargs)
+          cache_key = { self => [canonicalised_args, canonicalised_kwargs] }.to_json
+
           # If this is already known then don't enqueue it again. Otherwise, add it to the last
           # element of the array.
-          if thread_local_hash.key?(args_key)
-            ::Rails.logger.debug "Que::Unique - #{self} - Already scheduled: #{args_key}"
+          if thread_local_hash.key?(cache_key)
+            ::Rails.logger.debug "Que::Unique - #{self} - Already scheduled: #{cache_key}"
           else
-            ::Rails.logger.debug "Que::Unique - #{self} - Enqueuing #{args_key}"
-            thread_local_hash[args_key] = true
-            enqueue_after_unique(*canonicalised_args)
+            ::Rails.logger.debug "Que::Unique - #{self} - Enqueuing #{cache_key}"
+            thread_local_hash[cache_key] = true
+            enqueue_after_unique(*args, **kwargs)
           end
         end
 

metadata

@@ -1,55 +1,54 @@
 --- !ruby/object:Gem::Specification
 name: que-unique
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Bamboo Engineering
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: que
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: que
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +77,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +119,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -218,7 +245,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - dev@bambooloans.com
 executables: []
@@ -237,7 +263,6 @@ metadata:
   source_code_uri: https://github.com/bambooengineering/que-unique
   changelog_uri: https://github.com/bambooengineering/que-unique/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -252,8 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: A gem that removes duplicates when multiple copies of a que job are enqueued.
 test_files: []