resque-unique_by_arity 1.0.12 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5928902e215fcf41c92705e36c57cc6a56e6d41aa200a0877ceb573bab8831d
-  data.tar.gz: 5bf582a91c934187ef71a192dbcfa6bfb4374c2d6bd735cdaf5c9e467efebdcd
+  metadata.gz: 4ffc61efab34c9af47299c3527bee8da39876ed1e0a2bfd1144c05c0698f8f1b
+  data.tar.gz: f5604f556244558ff6893cfc57f09b5315f708db073463dd2644928d1cb51d1d
 SHA512:
-  metadata.gz: 154e126d3b23d5646c2fcee110bf184cec637813cd6fcf5ab5f6f06dd89f9f58353c3b06413ccdc217ad049954638785418d44b96a8fc67d751482629179dfb6
-  data.tar.gz: adae368b0a19f9d5ea756bbad1bc5384376515bcc083ce140a9e884ff376c66e8d6073df0a0677b1d07de2c1805220f6ea6293a7c6e1fb2f9ba3c149f0020355
+  metadata.gz: 3a71f1fc0529d0d1a42685a239b65e3d787d9650d4e96b217e3bdf8feed18b8cb5c45a7327e44b25ef83e0e11ca6a36a1f57ea5fb2d405726bdc694c18d54693
+  data.tar.gz: bdefff7d32f6f61df917344be934206e188c9c661db6692fe79f9ec0388b8a4b5dd57a5ac6f0e5fb1ca49930048412ec08ccdaf3138f4f45a4bfd9be8464ad82

data/.gitignore

@@ -1,12 +1,17 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/.rspec_status

@@ -0,0 +1,35 @@
+example_id                                         | status | run_time        |
+-------------------------------------------------- | ------ | --------------- |
+./spec/resque/unique_by_arity_spec.rb[1:1]         | passed | 0.00088 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:2:1:1]     | passed | 0.00094 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:3:1]       | passed | 0.00017 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:4:1:1]     | passed | 0.00016 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:5:1:1]     | passed | 0.00159 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:5:2:1]     | passed | 0.00029 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:5:3:1]     | passed | 0.0003 seconds  |
+./spec/resque/unique_by_arity_spec.rb[1:6:1]       | passed | 0.00016 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:7:1]       | passed | 0.00033 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:7:2:1]     | passed | 0.00028 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:7:3:1]     | passed | 0.00036 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:7:4:1]     | passed | 0.00035 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:8:1:1:1:1] | passed | 0.00811 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:8:1:2:1:1] | passed | 0.0006 seconds  |
+./spec/resque/unique_by_arity_spec.rb[1:8:1:3:1:1] | passed | 0.00104 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:8:2:1:1:1] | passed | 0.00079 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:8:2:2:1:1] | passed | 0.0003 seconds  |
+./spec/resque/unique_by_arity_spec.rb[1:8:2:3:1:1] | passed | 0.00026 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:8:3:1:1:1] | passed | 0.00042 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:8:3:2:1:1] | passed | 0.00083 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:8:3:3:1:1] | passed | 0.00028 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:8:4:1:1:1] | passed | 0.00032 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:8:4:2:1:1] | passed | 0.00076 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:8:4:3:1:1] | passed | 0.00031 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:8:5:1:1:1] | passed | 0.00032 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:8:5:2:1:1] | passed | 0.001 seconds   |
+./spec/resque/unique_by_arity_spec.rb[1:8:5:3:1]   | passed | 0.00078 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:9:1]       | passed | 0.00452 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:10:1:1]    | passed | 0.00026 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:11:1:1]    | passed | 0.00052 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:11:2:1:1]  | passed | 0.00083 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:11:2:2:1]  | passed | 0.00264 seconds |
+./spec/resque/unique_by_arity_spec.rb[1:11:2:3:1]  | passed | 0.00328 seconds |

data/.rubocop.yml

@@ -0,0 +1,2 @@
+inherit_from: .rubocop_todo.yml
+TargetRubyVersion: 2.5

data/.rubocop_todo.yml

@@ -0,0 +1,72 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-11-07 04:06:55 -0800 using RuboCop version 0.60.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'resque-unique_by_arity.gemspec'
+
+# Offense count: 5
+Metrics/AbcSize:
+  Max: 97
+
+# Offense count: 8
+# Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Max: 525
+
+# Offense count: 4
+Metrics/CyclomaticComplexity:
+  Max: 20
+
+# Offense count: 5
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/MethodLength:
+  Max: 72
+
+# Offense count: 4
+Metrics/PerceivedComplexity:
+  Max: 22
+
+# Offense count: 4
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/resque/unique_by_arity.rb'
+    - 'lib/resque/unique_by_arity/configuration.rb'
+    - 'lib/resque/unique_by_arity/modulizer.rb'
+    - 'lib/resque/unique_by_arity/validation.rb'
+
+# Offense count: 3
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/resque/unique_by_arity/configuration.rb'
+    - 'lib/resque/unique_by_arity/validation.rb'
+
+# Offense count: 1
+Style/IfInsideElse:
+  Exclude:
+    - 'lib/resque/unique_by_arity/configuration.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'lib/resque/unique_by_arity/configuration.rb'
+    - 'lib/resque/unique_by_arity/modulizer.rb'
+
+# Offense count: 83
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 385

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.5.1

data/Gemfile

@@ -2,12 +2,17 @@ source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
+gem 'resque-unique_in_queue', path: '/Users/pboling/Documents/code/intricately/resque-unique_in_queue'
+gem 'resque-unique_at_runtime', path: '/Users/pboling/Documents/code/intricately/resque-unique_at_runtime'
+
 group :test do
-  gem 'rubocop', '~> 0.59.0'
-  gem 'rubocop-rspec', '~> 1.24.0'
-  gem 'byebug', '~> 10', platform: :mri, require: false
-  gem 'pry', '~> 0', platform: :mri, require: false
-  gem 'pry-byebug', '~> 3', platform: :mri, require: false
+  unless ENV['TRAVIS']
+    gem 'byebug', '~> 10', platform: :mri, require: false
+    gem 'pry', '~> 0', platform: :mri, require: false
+    gem 'pry-byebug', '~> 3', platform: :mri, require: false
+  end
+  gem 'rubocop', '~> 0.60.0'
+  gem 'rubocop-rspec', '~> 1.30.0'
   gem 'simplecov', '~> 0', require: false
 end
 

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2017 - 2018 Peter H. Boling
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -24,7 +24,11 @@ Why? `resque-lonely_job` and `resque_solo` can't be used together, because their
 
 ## Important Note
 
-You must configure this gem *after* you define the perform class method in your job or the arity validation will not work properly.
+See `lib/resque/unique_by_arity/configuration.rb` for all config options.  Only a smattering of what is available is documented in this README.
+
+## Most Important Note
+
+You must configure this gem *after* you define the perform class method in your job or an error will be raised thanks to `perform` not having been defined yet.
 
 Example:
 
@@ -67,16 +71,13 @@ Some jobs have parameters that you do not want to consider for determination of
 
 ```ruby
 class MyJob
-  def self.perform(arg1, arg2, arg3)
-    # do stuff
+  def self.perform(my, cat, is, the, best, opts = {})
+    # Only the first 3: [my, cat, is] will be considered for determination of uniqueness
   end
   include UniqueByArity::Cop.new(
     arity_for_uniqueness: 3,
     unique_at_runtime: true
   )
-  def self.perform(my, cat, is, the, best, opts = {})
-    # Only the first 3: [my, cat, is] will be considered for determination of uniqueness
-  end
 end
 ```
 
@@ -86,14 +87,6 @@ Want this gem to tell you when it is misconfigured?  It can.
 
 ```ruby
 class MyJob
-  def self.perform(arg1, arg2, arg3)
-    # do stuff
-  end
-  include UniqueByArity::Cop.new(
-    arity_for_uniqueness: 3,
-    arity_validation: :warning, # or :skip, :error, or an error class to be raised, e.g. RuntimeError
-    unique_at_runtime: true
-  )
   def self.perform(my, cat, opts = {})
     # Because the third argument is optional the arity valdiation will not approve.
     # Arguments to be considered for uniqueness should be required arguments.
@@ -101,6 +94,11 @@ class MyJob
     # 
     #    MyJob.perform has the following required parameters: [:my, :cat], which is not enough to satisfy the configured arity_for_uniqueness of 3
   end
+  include UniqueByArity::Cop.new(
+    arity_for_uniqueness: 3,
+    arity_validation: :warning, # or :skip, :error, or an error class to be raised, e.g. RuntimeError
+    unique_at_runtime: true
+  )
 end
 ```
 
@@ -155,6 +153,17 @@ class MyJob
 end
 ```
 
+#### Oops, I have stale runtime uniqueness keys for MyJob stored in Redis...
+ 
+Preventing jobs with matching signatures from running, and they never get
+dequeued because there is no actual corresponding job to dequeue.
+
+*How to deal?*
+
+```ruby
+MyJob.purge_unique_at_runtime_redis_keys
+```
+
 ### Unique At Queue Time
 
 #### Unique In Job's Specific Queue
@@ -189,6 +198,29 @@ class MyJob
 end
 ```
 
+#### Oops, I have stale Queue Time uniqueness keys...
+ 
+Preventing jobs with matching signatures from being queued, and they never get
+dequeued because there is no actual corresponding job to dequeue.
+
+*How to deal?*
+
+Option: Rampage
+
+```ruby
+# Delete *all* queued jobs in the queue, and
+#   delete *all* unqueness keys for the queue.
+Redis.remove_queue('queue_name')
+```
+
+Option: Butterfly
+
+```ruby
+# Delete *no* queued jobs at all, and
+#   delete *all* unqueness keys for the queue (might then allow duplicates).
+Resque::UniqueInQueue::Queue.cleanup('queue_name')
+```
+
 ### All Together Now
 
 #### Unique At Runtime (across all queues) AND Unique In Job's Specific Queue
@@ -231,7 +263,7 @@ end
 
 ### Debugging
 
-Run your worker with `RESQUE_DEBUG=true` to see payloads printed before they are used to determine uniqueness.
+Run your worker with `RESQUE_DEBUG=true` to see payloads printed before they are used to determine uniqueness, as well as a lot of other debugging output.
 
 ### Customize Unique Keys Per Job
 
@@ -249,28 +281,28 @@ class MyJob
   # Core hashing algorithm for a job used for *all 3 types* of uniqueness 
   # @return [Array<String, arguments>], where the string is the unique digest, and arguments are the specific args that were used to calculate the digest 
   def self.redis_unique_hash(payload)
-    # ... See source @ lib/resque/unique_by_arity/cop_modulizer.rb 
+    modulizer.rb
     #       for how the built-in version works
     # uniqueness_args = payload["args"] # over simplified & ignoring arity
     # args = { class: job, args: uniqueness_args }
     # return [Digest::MD5.hexdigest(Resque.encode(args)), uniqueness_args]
   end
 
-  # Prefix to the unique key for a job for resque_solo, queue time uniqueness 
-  def self.solo_redis_key_prefix
+  unique_in_queue
+  def self.unique_at_runtime_redis_key_prefix
     # "unique_job:#{self}" # <= default value
   end
 
-  # Prefix to the unique redis key for a job for resque_solo, queue time uniqueness 
-  def self.solo_key_namespace(queue = nil)
+  unique_in_queue
+  def self.unique_at_runtime_key_namespace(queue = nil)
     # definition depends on which type of uniqueness is chosen, be careful if you customize
-    # "solo:queue:#{queue}:job" # <= is for unique within queue at queue time
-    # "solo:across_queues:job" # <= is for unique across all queues at queue time
+    # "r-uiq:queue:#{queue}:job" # <= is for unique within queue at queue time
+    # "r-uiq:across_queues:job" # <= is for unique across all queues at queue time
   end
   
-  def self.unique_at_queue_time_redis_key(queue, payload)
+  def self.unique_in_queue_redis_key(queue, payload)
     # unique_hash, _args_for_uniqueness = redis_unique_hash(payload)
-    # "#{solo_key_namespace(queue)}:#{solo_redis_key_prefix}:#{unique_hash}"
+    # "#{unique_at_runtime_key_namespace(queue)}:#{unique_at_runtime_redis_key_prefix}:#{unique_hash}"
   end
   
   def self.runtime_key_namespace

data/Rakefile

@@ -1,6 +1,10 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+#!/usr/bin/env rake
+# frozen_string_literal: true
 
-RSpec::Core::RakeTask.new(:spec)
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
-task :default => :spec
+RSpec::Core::RakeTask.new
+
+task default: :spec
+task test: :spec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "resque/unique_by_arity"
+require 'bundler/setup'
+require 'resque/unique_by_arity'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "resque/unique_by_arity"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/resque/plugins/unique_by_arity.rb

@@ -0,0 +1,55 @@
+module Resque
+  module Plugins
+    # If you want your job to support uniqueness either at enqueue-time or at
+    #   runtime, or both, and you want that uniqueness based on a specific arity
+    #   of arguments, simply include this module into your job class.
+    #
+    # NOTE: This module gets instantiated.
+    #       It is a module - class hybrid.
+    #       That's unconventional, and extremely powerful.
+    #
+    #   class EnqueueAndRunAlone
+    #     @queue = :enqueue_and_run_alone
+    #
+    #     def self.perform(arg1, arg2)
+    #       alone_stuff
+    #     end
+    #     include Resque::Plugins::UniqueByArity.new(
+    #       arity_for_uniqueness: 1,
+    #       arity_validation: :warning, # or nil, false, or :error
+    #       unique_at_runtime: true,
+    #       unique_in_queue: true
+    #     )
+    #   end
+    #
+    class UniqueByArity < Module
+      def initialize(**config)
+        @configuration = Resque::UniqueByArity::Configuration.new(**config)
+      end
+
+      def included(base)
+        return unless @configuration
+
+        @configuration.base_klass_name = base.to_s
+        @configuration.validate
+        base.send(:extend, Resque::UniqueByArity)
+        base.uniqueness_config_reset(@configuration.dup)
+
+        # gem is unique_in_queue, which is a rewrite of resque-loner
+        # see: https://github.com/neighborland/resque_solo
+        # defines a redis_key method, which we have to override.
+        base.send(:include, Resque::Plugins::UniqueInQueue) if @configuration.unique_in_queue || @configuration.unique_across_queues
+
+        # gem is resque-unique_at_runtime, which is a rewrite of resque-lonely_job
+        # see: https://github.com/pboling/resque-unique_at_runtime
+        base.send(:extend, Resque::Plugins::UniqueAtRuntime) if @configuration.unique_at_runtime
+
+        uniqueness_cop_module = Resque::UniqueByArity::Modulizer.to_mod(@configuration)
+        # This will override methods from both plugins above, if configured for both
+        base.send(:extend, uniqueness_cop_module)
+
+        base.include Resque::UniqueByArity::Validation unless @configuration.skip_arity_validation?
+      end
+    end
+  end
+end

data/lib/resque/unique_by_arity.rb

@@ -1,20 +1,24 @@
-require "colorized_string"
+require 'resque/unique_by_arity/version'
 
-require "resque-unique_at_runtime"
-require "resque_solo"
-# Little hack of the resque_solo gem
-require "resque/resque_solo/queue"
+# External Gems
+require 'colorized_string'
+require 'resque'
 
-require "resque/unique_by_arity/version"
-require "resque/unique_by_arity/configuration"
-require "resque/unique_by_arity/cop"
-require "resque/unique_by_arity/cop_modulizer"
-require "resque/unique_by_arity/validation"
+# External Resque Plugins
+require 'resque-unique_in_queue'
+require 'resque-unique_at_runtime'
+
+require 'resque/plugins/unique_by_arity'
+require 'resque/unique_by_arity/configuration'
+require 'resque/unique_by_arity/modulizer'
+require 'resque/unique_by_arity/validation'
 
 # Usage:
 #
 # class MyJob
-#   include UniqueByArity::Cop.new(
+#   def self.perform(arg1, arg2)
+#   end
+#   include Resque::Plugins::UniqueByArity.new(
 #     arity_for_uniqueness: 1,
 #     arity_validation: :warning, # or nil, false, or :error
 #     unique_at_runtime: true,
@@ -22,12 +26,23 @@ require "resque/unique_by_arity/validation"
 #   )
 # end
 #
+# NOTE: DO NOT include this module directly.
+#       Use the Resque::Plugins::UniqueByArity approach as above.
+#       This module is ultimately extended into the job class.
 module Resque
   module UniqueByArity
+    PLUGIN_TAG = (ColorizedString['[R-UBA] '].green).freeze
+
     def unique_log(message, config_proxy = nil)
       config_proxy ||= uniqueness_configuration
-      config_proxy.unique_logger.send(config_proxy.unique_log_level, message) if config_proxy.unique_logger
+      config_proxy.unique_logger&.send(config_proxy.unique_log_level, message) if config_proxy.unique_logger
+    end
+
+    def unique_debug(message, config_proxy = nil)
+      config_proxy ||= uniqueness_configuration
+      config_proxy.unique_logger&.debug("#{Resque::UniqueByArity::PLUGIN_TAG}#{message}") if config_proxy.debug_mode
     end
+    module_function(:unique_log, :unique_debug)
 
     # There are times when the class will need access to the configuration object,
     #   such as to override it per instance method
@@ -48,55 +63,70 @@ module Resque
     def uniqueness_config_reset(config = Configuration.new)
       @uniqueness_configuration = config
     end
+
     def uniqueness_log_level
       @uniqueness_configuration.log_level
     end
+
     def uniqueness_log_level=(log_level)
       @uniqueness_configuration.log_level = log_level
     end
+
     def uniqueness_arity_for_uniqueness
       @uniqueness_configuration.arity_for_uniqueness
     end
+
     def uniqueness_arity_for_uniqueness=(arity_for_uniqueness)
       @uniqueness_configuration.arity_for_uniqueness = arity_for_uniqueness
     end
+
     def uniqueness_arity_validation
       @uniqueness_configuration.arity_validation
     end
+
     def uniqueness_arity_validation=(arity_validation)
       @uniqueness_configuration.arity_validation = arity_validation
     end
+
     def uniqueness_lock_after_execution_period
       @uniqueness_configuration.lock_after_execution_period
     end
+
     def uniqueness_lock_after_execution_period=(lock_after_execution_period)
       @uniqueness_configuration.lock_after_execution_period = lock_after_execution_period
     end
+
     def uniqueness_runtime_lock_timeout
       @uniqueness_configuration.runtime_lock_timeout
     end
+
     def uniqueness_runtime_lock_timeout=(runtime_lock_timeout)
       @uniqueness_configuration.runtime_lock_timeout = runtime_lock_timeout
     end
+
     def uniqueness_unique_at_runtime
       @uniqueness_configuration.unique_at_runtime
     end
+
     def uniqueness_unique_at_runtime=(unique_at_runtime)
       @uniqueness_configuration.unique_at_runtime = unique_at_runtime
     end
+
     def uniqueness_unique_in_queue
       @uniqueness_configuration.unique_in_queue
     end
+
     def uniqueness_unique_in_queue=(unique_in_queue)
       @uniqueness_configuration.unique_in_queue = unique_in_queue
     end
+
     def uniqueness_unique_across_queues
       @uniqueness_configuration.unique_across_queues
     end
+
     def uniqueness_unique_across_queues=(unique_across_queues)
       @uniqueness_configuration.unique_across_queues = unique_across_queues
     end
     self.uniqueness_configuration = Configuration.new # setup defaults
-    module_function(:unique_log)
   end
 end

data/lib/resque/unique_by_arity/configuration.rb

@@ -2,36 +2,50 @@ require 'logger'
 module Resque
   module UniqueByArity
     class Configuration
-      VALID_ARITY_VALIDATION_LEVELS = [ :warning, :error, :skip, nil, false ]
-      SKIPPED_ARITY_VALIDATION_LEVELS = [ :skip, nil, false ]
+      VALID_ARITY_VALIDATION_LEVELS = [:warning, :error, :skip, nil, false].freeze
+      SKIPPED_ARITY_VALIDATION_LEVELS = [:skip, nil, false].freeze
+      DEFAULT_AT_RUNTIME_KEY_BASE = 'r-uar'.freeze
+      DEFAULT_IN_QUEUE_KEY_BASE = 'r-uiq'.freeze
       attr_accessor :logger
       attr_accessor :log_level
       attr_accessor :arity_for_uniqueness
       attr_accessor :arity_validation
       attr_accessor :lock_after_execution_period
       attr_accessor :runtime_lock_timeout
+      attr_accessor :runtime_requeue_interval
       attr_accessor :unique_at_runtime
+      attr_accessor :unique_at_runtime_key_base
       attr_accessor :unique_in_queue
+      attr_accessor :unique_in_queue_key_base
       attr_accessor :unique_across_queues
       attr_accessor :base_klass_name
+      attr_accessor :debug_mode
       def initialize(**options)
         @logger = options.key?(:logger) ? options[:logger] : Logger.new(STDOUT)
         @log_level = options.key?(:log_level) ? options[:log_level] : :debug
         @arity_for_uniqueness = options.key?(:arity_for_uniqueness) ? options[:arity_for_uniqueness] : 1
         @arity_validation = options.key?(:arity_validation) ? options[:arity_validation] : :warning
-        raise ArgumentError, "UniqueByArity::Cop.new requires arity_validation values of #{arity_validation.inspect}, or a class inheriting from Exception, but the value is #{@arity_validation} (#{@arity_validation.class})" unless VALID_ARITY_VALIDATION_LEVELS.include?(@arity_validation) || !@arity_validation.respond_to?(:ancestors) || @arity_validation.ancestors.include?(Exception)
+        raise ArgumentError, "Resque::Plugins::UniqueByArity.new requires arity_validation values of #{arity_validation.inspect}, or a class inheriting from Exception, but the value is #{@arity_validation} (#{@arity_validation.class})" unless VALID_ARITY_VALIDATION_LEVELS.include?(@arity_validation) || !@arity_validation.respond_to?(:ancestors) || @arity_validation.ancestors.include?(Exception)
+
         @lock_after_execution_period = options.key?(:lock_after_execution_period) ? options[:lock_after_execution_period] : nil
         @runtime_lock_timeout = options.key?(:runtime_lock_timeout) ? options[:runtime_lock_timeout] : nil
+        @runtime_requeue_interval = options.key?(:runtime_requeue_interval) ? options[:runtime_requeue_interval] : nil
         @unique_at_runtime = options.key?(:unique_at_runtime) ? options[:unique_at_runtime] : false
+        @unique_at_runtime_key_base = options.key?(:unique_at_runtime_key_base) ? options[:unique_at_runtime_key_base] : DEFAULT_AT_RUNTIME_KEY_BASE
+        @unique_in_queue_key_base = options.key?(:unique_in_queue_key_base) ? options[:unique_in_queue_key_base] : DEFAULT_IN_QUEUE_KEY_BASE
         @unique_in_queue = options.key?(:unique_in_queue) ? options[:unique_in_queue] : false
         @unique_across_queues = options.key?(:unique_across_queues) ? options[:unique_across_queues] : false
+        env_debug = ENV['RESQUE_DEBUG']
+        @debug_mode = options.key?(:debug_mode) ? options[:debug_mode] : env_debug == 'true' || (env_debug.is_a?(String) && env_debug.match?(/arity/))
       end
 
       def validate
         # The default config initialization shouldn't trigger any warnings.
         if base_klass_name && logger
           log "[#{base_klass_name}] :arity_for_uniqueness is set to #{arity_for_uniqueness}, but no uniqueness enforcement was turned on [:unique_at_runtime, :unique_in_queue, :unique_across_queues]" unless unique_at_runtime || unique_in_queue || unique_across_queues
-          log "[#{base_klass_name}] :lock_after_execution_period is set to #{lock_after_execution_period}, but :unique_at_runtime is not set" if lock_after_execution_period && !unique_at_runtime
+          log "[#{base_klass_name}] :lock_after_execution_period is set to #{lock_after_execution_period}, but :unique_at_runtime is not set" if lock_after_execution_period && !(unique_in_queue || unique_across_queues)
+          log "[#{base_klass_name}] :runtime_lock_timeout is set to #{runtime_lock_timeout}, but :unique_at_runtime is not set" if runtime_lock_timeout && !unique_at_runtime
+          log "[#{base_klass_name}] :runtime_requeue_interval is set to #{runtime_requeue_interval}, but :unique_at_runtime is not set" if runtime_requeue_interval && !unique_at_runtime
           log "[#{base_klass_name}] :unique_in_queue and :unique_across_queues should not be set at the same time, as :unique_across_queues will always supercede :unique_in_queue" if unique_in_queue && unique_across_queues
         end
       end
@@ -50,15 +64,15 @@ module Resque
 
       def to_hash
         {
-            logger: logger,
-            log_level: log_level,
-            arity_for_uniqueness: arity_for_uniqueness,
-            arity_validation: arity_validation,
-            lock_after_execution_period: lock_after_execution_period,
-            runtime_lock_timeout: runtime_lock_timeout,
-            unique_at_runtime: unique_at_runtime,
-            unique_in_queue: unique_in_queue,
-            unique_across_queues: unique_across_queues
+          logger: logger,
+          log_level: log_level,
+          arity_for_uniqueness: arity_for_uniqueness,
+          arity_validation: arity_validation,
+          lock_after_execution_period: lock_after_execution_period,
+          runtime_lock_timeout: runtime_lock_timeout,
+          unique_at_runtime: unique_at_runtime,
+          unique_in_queue: unique_in_queue,
+          unique_across_queues: unique_across_queues
         }
       end
 
@@ -68,6 +82,7 @@ module Resque
 
       def validate_arity(klass_string, perform_method)
         return true if skip_arity_validation?
+
         # method.arity -
         #   Returns an indication of the number of arguments accepted by a method.
         #   Returns a non-negative integer for methods that take a fixed number of arguments.
@@ -83,7 +98,7 @@ module Resque
                   "#{klass_string}.#{perform_method.name} has arity of #{perform_method.arity} which will not work with arity_for_uniqueness of #{arity_for_uniqueness}"
                 end
               else
-                if (perform_method.arity).abs < arity_for_uniqueness
+                if perform_method.arity.abs < arity_for_uniqueness
                   # parform(a, b, c, opts = {}) # => arity == -4
                   #   and in this case arity for uniqueness can be 0, 1, 2, or 3, because 4 of the arguments are required
                   "#{klass_string}.#{perform_method.name} has arity of #{perform_method.arity} which will not work with arity_for_uniqueness of #{arity_for_uniqueness}"
@@ -91,14 +106,16 @@ module Resque
                   "#{klass_string}.#{perform_method.name} has the following required parameters: #{required_parameter_names}, which is not enough to satisfy the configured arity_for_uniqueness of #{arity_for_uniqueness}"
                 end
               end
-        case arity_validation
+        if msg
+          case arity_validation
           when :warning then
             log(ColorizedString[msg].red)
           when :error then
             raise ArgumentError, msg
           else
             raise arity_validation, msg
-        end if msg
+          end
+        end
       end
     end
   end

data/lib/resque/unique_by_arity/{cop_modulizer.rb → modulizer.rb}

@@ -1,42 +1,63 @@
 module Resque
   module UniqueByArity
-    module CopModulizer
+    module Modulizer
       def self.to_mod(configuration)
         Module.new do
           if configuration.unique_in_queue || configuration.unique_at_runtime || configuration.unique_across_queues
             # @return [Array<String, arguments>] the key base hash used to enforce uniqueness, and the arguments from the payload used to calculate it
             define_method(:redis_unique_hash) do |payload|
               payload = Resque.decode(Resque.encode(payload))
-              Resque::UniqueByArity.unique_log "payload is #{payload.inspect}" if ENV['RESQUE_DEBUG'] == 'true'
-              job  = payload["class"]
+              Resque::UniqueByArity.unique_debug("payload is #{payload.inspect}")
+              job  = payload['class']
               # It seems possible that some jobs may not have an "args" key in the payload.
-              args = payload["args"] || []
+              args = payload['args'] || []
               args.map! do |arg|
                 arg.is_a?(Hash) ? arg.sort : arg
               end
               # what is the configured arity for uniqueness?
-              # minus one because zero indexed
-              uniqueness_args = args[0..(configuration.arity_for_uniqueness - 1)]
+              uniqueness_args = if configuration.arity_for_uniqueness.zero?
+                                  []
+                                else
+                                  # minus one because zero indexed, so
+                                  #   when arity_for_uniqueness is 2 we use args
+                                  #   at indexes 0 and 1.
+                                  args[0..(configuration.arity_for_uniqueness - 1)]
+                                end
               args = { class: job, args: uniqueness_args }
               return [Digest::MD5.hexdigest(Resque.encode(args)), uniqueness_args]
             end
           end
 
           if configuration.lock_after_execution_period
-            self.instance_variable_set(:@lock_after_execution_period, configuration.lock_after_execution_period)
+            instance_variable_set(:@lock_after_execution_period, configuration.lock_after_execution_period)
           end
 
           if configuration.runtime_lock_timeout
-            self.instance_variable_set(:@runtime_lock_timeout, configuration.runtime_lock_timeout)
+            instance_variable_set(:@runtime_lock_timeout, configuration.runtime_lock_timeout)
+          end
+
+          if configuration.runtime_requeue_interval
+            instance_variable_set(:@runtime_requeue_interval, configuration.runtime_requeue_interval)
+          end
+
+          if configuration.unique_at_runtime_key_base
+            instance_variable_set(:@unique_at_runtime_key_base, configuration.unique_at_runtime_key_base)
+          end
+
+          if configuration.unique_in_queue_key_base
+            # Can't be overridden per each class because it wouldn't make sense.
+            # It wouldn't be able to determine or enforce uniqueness across queues,
+            #   and general cleanup of stray keys would be nearly impossible.
+            Resque::UniqueInQueue.uniq_config&.unique_in_queue_key_base = configuration.unique_in_queue_key_base
           end
 
           if configuration.unique_in_queue || configuration.unique_across_queues
-            ### Gem: resque_solo
+            ### Gem: unique_in_queue
             ### Plugin Name: Resque::Plugins::UniqueJob
             ### Provides: Queue-time uniqueness for a single queue, or across queues
             #
             # Returns a string, used by Resque::Plugins::UniqueJob, that will be used as the prefix to the redis key
-            define_method(:solo_redis_key_prefix) do
+            define_method(:unique_at_runtime_redis_key_prefix) do
               "unique_job:#{self}"
             end
             #
@@ -46,30 +67,30 @@ module Resque
             # Payload is what Resque stored for this job along with the job's class name:
             #   a hash containing :class and :args
             # @return [String] the key used to enforce uniqueness (at queue-time)
-            define_method(:unique_at_queue_time_redis_key) do |queue, payload|
+            define_method(:unique_in_queue_redis_key) do |queue, payload|
               unique_hash, args_for_uniqueness = redis_unique_hash(payload)
-              key = "#{solo_key_namespace(queue)}:#{solo_redis_key_prefix}:#{unique_hash}"
-              Resque::UniqueByArity.unique_log "#{ColorizedString['[Queue-Time]'].green} #{self}.unique_at_queue_time_redis_key for #{args_for_uniqueness} is: #{ColorizedString[key].green}" if ENV['RESQUE_DEBUG'] == 'true'
+              key = "#{unique_at_runtime_key_namespace(queue)}:#{unique_at_runtime_redis_key_prefix}:#{unique_hash}"
+              Resque::UniqueByArity.unique_debug("#{self}.unique_in_queue_redis_key for #{args_for_uniqueness} is: #{ColorizedString[key].green}")
               key
             end
             #
             # @return [Fixnum] number of keys that were deleted
             define_method(:purge_unique_queued_redis_keys) do
-              # solo_key_namespace may or may not ignore the queue passed in, depending on config.
-              key_match = "#{solo_key_namespace(self.instance_variable_get(:@queue))}:#{solo_redis_key_prefix}:*"
+              # unique_at_runtime_key_namespace may or may not ignore the queue passed in, depending on config.
+              key_match = "#{unique_at_runtime_key_namespace(instance_variable_get(:@queue))}:#{unique_at_runtime_redis_key_prefix}:*"
               keys = Resque.redis.keys(key_match)
-              Resque::UniqueByArity.unique_log "Purging #{keys.length} keys from #{ColorizedString[key_match].red}"
-              Resque.redis.del keys if keys.length > 0
+              Resque::UniqueByArity.unique_log("#{Resque::UniqueByArity::PLUGIN_TAG}#{Resque::UniqueInQueue::PLUGIN_TAG} Purging #{keys.length} keys from #{ColorizedString[key_match].red}")
+              Resque.redis.del keys unless keys.empty?
             end
             if configuration.unique_in_queue
               # @return [String] the Redis namespace of the key used to enforce uniqueness (at queue-time)
-              define_method(:solo_key_namespace) do |queue = nil|
-                "solo:queue:#{queue}:job"
+              define_method(:unique_at_runtime_key_namespace) do |queue = nil|
+                "#{configuration.unique_in_queue_key_base}:queue:#{queue}:job"
               end
             elsif configuration.unique_across_queues
               # @return [String] the Redis namespace of the key used to enforce uniqueness (at queue-time)
-              define_method(:solo_key_namespace) do |_queue = nil|
-                "solo:across_queues:job"
+              define_method(:unique_at_runtime_key_namespace) do |_queue = nil|
+                "#{configuration.unique_in_queue_key_base}:across_queues:job"
               end
             end
           end
@@ -80,29 +101,28 @@ module Resque
           if configuration.unique_at_runtime
             # @return [String] the Redis namespace of the key used to enforce uniqueness (at runtime)
             define_method(:runtime_key_namespace) do
-              puts "runtime_key_namespace for #{self}"
-              "unique_at_runtime:#{self}"
+              "#{configuration.unique_at_runtime_key_base}:#{self}"
             end
             # Returns a string, used by Resque::Plugins::UniqueAtRuntime, that will be used as the redis key
-            # The versions of redis_key from resque_solo and resque-lonely_job are incompatible.
+            # The versions of redis_key from unique_in_queue and resque-lonely_job are incompatible.
             # So we forked resque-lonely_job, change the name of the method so it would not conflict,
             #   and now we can override it, and fix the params to be compatible with the redis_key
-            #   from resque_solo
+            #   from unique_in_queue
             # Does not need any customization for arity, because it funnels down to redis_key,
             #   and we handle the arity option there
             # @return [String] the key used to enforce loneliness (uniqueness at runtime)
             define_method(:unique_at_runtime_redis_key) do |*args|
-              unique_hash, args_for_uniqueness = redis_unique_hash({"class" => self.to_s, "args" => args})
+              unique_hash, args_for_uniqueness = redis_unique_hash('class' => to_s, 'args' => args)
               key = "#{runtime_key_namespace}:#{unique_hash}"
-              Resque::UniqueByArity.unique_log "#{ColorizedString['[Run-Time]'].yellow} #{self}.unique_at_runtime_redis_key for #{args_for_uniqueness} is: #{ColorizedString[key].yellow}" if ENV['RESQUE_DEBUG'] == 'true'
+              Resque::UniqueByArity.unique_debug("#{ColorizedString['[R-UAR]'].yellow} #{self}.unique_at_runtime_redis_key for #{args_for_uniqueness} is: #{ColorizedString[key].yellow}")
               key
             end
             # @return [Fixnum] number of keys that were deleted
             define_method(:purge_unique_at_runtime_redis_keys) do
               key_match = "#{runtime_key_namespace}:*"
               keys = Resque.redis.keys(key_match)
-              Resque::UniqueByArity.unique_log "Purging #{keys.length} keys from #{ColorizedString[key_match].red}"
-              Resque.redis.del keys if keys.length > 0
+              Resque::UniqueByArity.unique_log("#{ColorizedString['[R-UBA][R-UAR]'].red} Purging #{keys.length} keys from #{ColorizedString[key_match].red}")
+              Resque.redis.del keys unless keys.empty?
             end
           end
         end

data/lib/resque/unique_by_arity/validation.rb

@@ -10,4 +10,3 @@ module Resque
     end
   end
 end
-

data/lib/resque/unique_by_arity/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module UniqueByArity
-    VERSION = "1.0.12"
+    VERSION = '2.0.0'.freeze
   end
 end

data/resque-unique_by_arity.gemspec

@@ -1,31 +1,37 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'resque/unique_by_arity/version'
+# frozen_string_literal: true
+
+require File.expand_path('lib/resque/unique_by_arity/version', __dir__)
 
 Gem::Specification.new do |spec|
-  spec.name          = "resque-unique_by_arity"
+  spec.name          = 'resque-unique_by_arity'
   spec.version       = Resque::UniqueByArity::VERSION
-  spec.authors       = ["Peter Boling"]
-  spec.email         = ["peter.boling@gmail.com"]
-  spec.license       = "MIT"
+  spec.authors       = ['Peter H. Boling']
+  spec.email         = ['peter.boling@gmail.com']
+  spec.license       = 'MIT'
 
-  spec.summary       = %q{Magic hacks which allow integration of resque_solo and resque-unique_at_runtime_simultaneously into Resque jobs}
-  spec.description   = %q{fixes incompatibilities between resque_solo and resque-unique_at_runtime}
-  spec.homepage      = "https://github.com/pboling/resque-unique_by_arity"
-  spec.required_ruby_version = ">= 2.0.0"
+  spec.summary       = 'Configure resque-unique_in_queue and resque-unique_at_runtime uniqueness by arity of perform method'
+  spec.description   = 'Configure resque-unique_in_queue and resque-unique_at_runtime uniqueness by arity of perform method, with automated cleanup tools'
+  spec.homepage      = 'https://github.com/pboling/resque-unique_by_arity'
+  spec.required_ruby_version = '>= 2.3.0'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
+
+  spec.add_runtime_dependency 'colorize', '~> 0.8'
+  spec.add_runtime_dependency 'resque', '>= 1.2'
+  spec.add_runtime_dependency 'resque-unique_in_queue', '~> 1.0'
+  spec.add_runtime_dependency 'resque-unique_at_runtime', '~> 3.0'
 
-  spec.add_runtime_dependency "resque-unique_at_runtime", "~> 2.0"
-  spec.add_runtime_dependency "resque_solo", "~> 0.3"
-  spec.add_runtime_dependency "colorize", "~> 0.8"
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 12.3"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'byebug', '~> 10.0'
+  spec.add_development_dependency 'pry', '~> 0.11'
+  spec.add_development_dependency 'pry-byebug', '~> 3.6'
+  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec-block_is_expected', '~> 1.0'
+  spec.add_development_dependency 'rspec-stubbed_env', '~> 1.0'
+  spec.add_development_dependency 'rubocop', '~> 0.60'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.30'
 end

metadata

@@ -1,71 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: resque-unique_by_arity
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 2.0.0
 platform: ruby
 authors:
-- Peter Boling
+- Peter H. Boling
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2018-09-10 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: resque-unique_at_runtime
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: resque
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: resque_solo
+  name: resque-unique_in_queue
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: resque-unique_at_runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +150,64 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: fixes incompatibilities between resque_solo and resque-unique_at_runtime
+- !ruby/object:Gem::Dependency
+  name: rspec-block_is_expected
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-stubbed_env
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.60'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.60'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.30'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.30'
+description: Configure resque-unique_in_queue and resque-unique_at_runtime uniqueness
+  by arity of perform method, with automated cleanup tools
 email:
 - peter.boling@gmail.com
 executables: []
@@ -103,17 +216,21 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rspec_status"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
-- lib/resque/resque_solo/queue.rb
+- lib/resque/plugins/unique_by_arity.rb
 - lib/resque/unique_by_arity.rb
 - lib/resque/unique_by_arity/configuration.rb
-- lib/resque/unique_by_arity/cop.rb
-- lib/resque/unique_by_arity/cop_modulizer.rb
+- lib/resque/unique_by_arity/modulizer.rb
 - lib/resque/unique_by_arity/validation.rb
 - lib/resque/unique_by_arity/version.rb
 - resque-unique_by_arity.gemspec
@@ -129,7 +246,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -140,6 +257,6 @@ rubyforge_project:
 rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
-summary: Magic hacks which allow integration of resque_solo and resque-unique_at_runtime_simultaneously
-  into Resque jobs
+summary: Configure resque-unique_in_queue and resque-unique_at_runtime uniqueness
+  by arity of perform method
 test_files: []

data/lib/resque/resque_solo/queue.rb

@@ -1,9 +0,0 @@
-module ResqueSoloUniqueHack
-  def unique_key(queue, item)
-    # "solo:queue:#{queue}:job:#{const_for(item).redis_key(item)}"
-    const_for(item).unique_at_queue_time_redis_key(queue, item)
-    # NOTE: DOES NOT CALL SUPER
-  end
-end
-
-ResqueSolo::Queue.singleton_class.prepend ResqueSoloUniqueHack

data/lib/resque/unique_by_arity/cop.rb

@@ -1,31 +0,0 @@
-module Resque
-  module UniqueByArity
-    class Cop < Module
-      def initialize(**config)
-        @configuration = Resque::UniqueByArity::Configuration.new(**config)
-      end
-      def included(base)
-        return unless @configuration
-        @configuration.base_klass_name = base.to_s
-        @configuration.validate
-        base.send(:extend, Resque::UniqueByArity)
-        base.uniqueness_config_reset(@configuration.dup)
-
-        # gem is resque_solo, which is a rewrite of resque-loner
-        # see: https://github.com/neighborland/resque_solo
-        # defines a redis_key method, which we have to override.
-        base.send(:include, Resque::Plugins::UniqueJob) if @configuration.unique_in_queue || @configuration.unique_across_queues
-
-        # gem is resque-unique_at_runtime, which is a rewrite of resque-lonely_job
-        # see: https://github.com/pboling/resque-unique_at_runtime
-        base.send(:extend, Resque::Plugins::UniqueAtRuntime) if @configuration.unique_at_runtime
-
-        uniqueness_cop_module = Resque::UniqueByArity::CopModulizer.to_mod(@configuration)
-        # This will override methods from both plugins above, if configured for both
-        base.send(:extend, uniqueness_cop_module)
-
-        base.include Resque::UniqueByArity::Validation unless @configuration.skip_arity_validation?
-      end
-    end
-  end
-end