active_job_resque_solo 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f52c7144041b333b7202f5401c36f9e38ff34be5
-  data.tar.gz: 445c8d4b8352f82eb591240ff0bc8113996a3041
+  metadata.gz: 7f7a625183f939325da58db5c523dd6f0af00582
+  data.tar.gz: 000a2f1a139b0b19a2936d313e4da15d80baf9ad
 SHA512:
-  metadata.gz: 0d1dae5d8415e5137db768b7784b202d5b66d1b429e86e52cf342d34ec80d54dc6b0b93d57634f0f53d9afdb26f4d52469ac7ad0304fc149077b9bb5d1941ff1
-  data.tar.gz: 59b730d1aa86090baf7c85e8ca719b6befdd4f026739760d1d8931084d23a9f296c07d5e801bee890d76ee71ea4241008a79bffa49de869f2002e3ad0ffd7542
+  metadata.gz: 6b71ffc31e5a473eb226fe578cdb5c9970728d90e95f595e1076cf14605a0b765247bcd7c33066f0db92d46c336c668b09eb9cb665dea43a10a6ee92460d2bc2
+  data.tar.gz: 40f9efe8a2e915abf5f62e230edbd0d84015b646afaff523ca200eff50aeaf507ec64c63e6606670c5b493e07081f9e292d942f5d5553cef16b7b6e76d872731

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.3.5
+
+Adds `solo_any_args` directive that will only allow one instance of a job class in the queue regardless of any arguments.
+
 # 0.3.4
 
 * Fix bug that could prevent enqueing with slowly performing locks.

data/README.md

@@ -42,6 +42,7 @@ You can control which named arguments are used to determine uniqueness in the qu
 
 * `solo_only_args`
 * `solo_except_args`
+* `solo_any_args`
 
 ```ruby
 class MyJob < ActiveJob::Base
@@ -74,6 +75,25 @@ class MyJob < ActiveJob::Base
   end
 end
 ```
+
+Specify `solo_any_args` to allow only one instance of your job to be enqueued or executing at any given
+time regardless of the arugments used in each instance.
+
+`solo_any_args` overrides `solo_only_args` and `solo_except_args`.
+
+```ruby
+class MyJob < ActiveJob::Base
+
+  include ActiveJob::Plugins::Resque::Solo
+
+  solo_any_args
+
+  queue_as :default
+
+  def perform(user: nil)
+  end
+end
+```
 ## Locking
 
 Solo uses an internal locking mechanism to prevent multiple processes from

data/lib/active_job/plugins/resque/solo.rb

@@ -14,6 +14,10 @@ module ActiveJob
         end
 
         module ClassMethods
+          def solo_any_args
+            @solo_any_args = true
+          end
+
           def solo_only_args(*args)
             @solo_only_args = args.compact.map(&:to_s).uniq
             raise ArgumentError, "solo_only_args requires one or more field names" if @solo_only_args.empty?
@@ -25,7 +29,7 @@ module ActiveJob
           end
 
           def solo_inspector
-            @solo_inspector ||= Inspector.new(@solo_only_args, @solo_except_args, @solo_lock_key_prefix)
+            @solo_inspector ||= Inspector.new(@solo_any_args, @solo_only_args, @solo_except_args, @solo_lock_key_prefix)
           end
 
           def solo_lock_key_prefix(key_prefix)

data/lib/active_job/plugins/resque/solo/inspector.rb

@@ -8,7 +8,8 @@ module ActiveJob
       module Solo
         class Inspector
 
-          def initialize(only_args, except_args, lock_key_prefix)
+          def initialize(any_args, only_args, except_args, lock_key_prefix)
+            @any_args = !!any_args
             @only_args = only_args
             @except_args = except_args || []
             # always ignore the ActiveJob symbol hash key.
@@ -92,13 +93,17 @@ module ActiveJob
 
           def job_args(args)
             if args.present?
-              args.map do |arg|
-                if arg.is_a? Hash
-                  arg.keep_if { |k,v| @only_args.include?(k.to_s) } if @only_args.present?
-                  arg.keep_if { |k,v| !@except_args.include?(k.to_s) } if @except_args.present?
+              if @any_args
+                args = []
+              else
+                args.map do |arg|
+                  if arg.is_a? Hash
+                    arg.keep_if { |k,v| @only_args.include?(k.to_s) } if @only_args.present?
+                    arg.keep_if { |k,v| !@except_args.include?(k.to_s) } if @except_args.present?
+                  end
+
+                  arg
                 end
-
-                arg
               end
             end
 

data/lib/active_job_resque_solo/version.rb

@@ -1,3 +1,3 @@
 module ActiveJobResqueSolo
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_job_resque_solo
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Phillip Kinkade
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails