sidekiq-unique-jobs 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54089588f5279692be7686eca3e9b4987c9cb706
-  data.tar.gz: 2ce8320f727817419868df6ddc877d143c9318cf
+  metadata.gz: 4ca11c77223ec339ed2dba0bbfa3630c17db88df
+  data.tar.gz: 8ac3ea5ed96f4303663cd7a43b3b70e93ece13c5
 SHA512:
-  metadata.gz: fe2abbb06c27ef94b8266d1bcc1727b1385e7d6897c35731986d90306ce218b16b7d22336facbfff95b43e294abf5dbe4b894ce4d6629d4373e272cb20285502
-  data.tar.gz: eba5e89015ec74852a4a6e0615e3793ede42dee32a22e59ccd019de3a22e14b27ea27dbb757c5a4cf6cc3eab2bf80d2a6801928bb8a4030c6c3dfb45e31df593
+  metadata.gz: ab6f325ea2633be2150c15f9441133901ec42fa767a5777328df8c44438fab1e8eddbb674a4f11132028899f7fab6c2a19dc1541dd9e2acea257e58bb96b3aca
+  data.tar.gz: ece51ecdb1244507c06a5336d78106b92423b13d026d4c1f8a0ebadad778526522ce52efc7199b41530295fd2865f1732e53029ad929c51f70ef62ab944d79c3

data/.rubocop.yml

@@ -55,10 +55,28 @@ Style/FileName:
 Style/GlobalVars:
   Enabled: true
 
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: single_quotes
+  ConsistentQuotesInMultiline: true
+
+Style/StringLiteralsInInterpolation:
+  Enabled: true
+  EnforcedStyle: single_quotes
+
 Style/SymbolArray:
   Enabled: true
   EnforcedStyle: brackets
 
+Style/TernaryParentheses:
+  Enabled: true
+  EnforcedStyle: require_parentheses_when_complex
+  AllowSafeAssignment: true
+
+Style/TrailingCommaInArguments:
+  Enabled: true
+  EnforcedStyleForMultiline: comma
+
 Style/TrailingCommaInLiteral:
   Enabled: true
   EnforcedStyleForMultiline: comma

data/.simplecov

@@ -1,11 +1,13 @@
 require 'simplecov-json'
 require 'codeclimate-test-reporter'
 
-# SimpleCov.refuse_coverage_drop
+SimpleCov.command_name 'rspec'
+SimpleCov.refuse_coverage_drop
 SimpleCov.formatters = [
   SimpleCov::Formatter::HTMLFormatter,
   SimpleCov::Formatter::JSONFormatter,
 ]
+
 SimpleCov.start do
   add_filter '/spec/'
   add_filter '/bin/'

data/.travis.yml

@@ -14,7 +14,6 @@ script:
 rvm:
   - 2.4.1
   - 2.3.2
-  - 2.2.5
   - jruby-9.1.8.0
 env: STYLE=false
 gemfile:

data/README.md

@@ -202,6 +202,9 @@ Start the console with the following command `bundle exec jobs console`.
 #### Remove Unique Keys
 `del '*', 100, false` the dry_run and count parameters are both required. This is to have some type of protection against clearing out all uniqueness.
 
+#### Expire
+`expire` clears the unique hash from expired keys
+
 ### Command Line
 
 `bundle exec jobs` displays help on how to use the unique jobs command line.

data/lib/sidekiq_unique_jobs/lock/until_executed.rb

@@ -44,7 +44,7 @@ module SidekiqUniqueJobs
           redis_pool,
           unique_key,
           item[JID_KEY],
-          max_lock_time
+          max_lock_time,
         )
       end
       # rubocop:enable MethodLength

data/lib/sidekiq_unique_jobs/normalizer.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module SidekiqUniqueJobs
   module Normalizer
     def self.jsonify(args)

data/lib/sidekiq_unique_jobs/script_mock.rb

@@ -19,7 +19,7 @@ module SidekiqUniqueJobs
         expires    = options[:argv][1].to_i
         stored_jid = redis.get(unique_key)
 
-        return stored_jid == job_id ? 1 : 0 if stored_jid
+        return (stored_jid == job_id) ? 1 : 0 if stored_jid
 
         return 0 unless redis.set(unique_key, job_id, nx: true, ex: expires)
         redis.hsetnx(SidekiqUniqueJobs::HASH_KEY, job_id, unique_key)

data/lib/sidekiq_unique_jobs/sidekiq_unique_ext.rb

@@ -14,47 +14,24 @@ module Sidekiq
       end
 
       def delete_ext
-        unlock(item) if delete_orig
+        SidekiqUniqueJobs::Unlockable.unlock(item) if delete_orig
       end
 
       private
 
       def remove_job_ext
         remove_job_orig do |message|
-          unlock(Sidekiq.load_json(message))
+          SidekiqUniqueJobs::Unlockable.unlock(Sidekiq.load_json(message))
           yield message
         end
       end
     end
 
-    include UniqueExtension if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('3.1')
+    include UniqueExtension
   end
 
   class ScheduledSet
-    # rubocop:disable Style/ClassAndModuleCamelCase
-    module UniqueExtension3_0
-      def self.included(base)
-        base.class_eval do
-          include SidekiqUniqueJobs::Unlockable
-          alias_method :delete_orig, :delete
-          alias_method :delete, :delete_ext
-        end
-      end
-
-      def delete_ext(score, jid = nil)
-        item = find_job(jid)
-        unlock(item) if delete_orig(score, jid)
-      end
-
-      def remove_job_ext
-        remove_job_orig do |message|
-          unlock(Sidekiq.load_json(message))
-          yield message
-        end
-      end
-    end
-
-    module UniqueExtension3_5
+    module UniqueExtension
       def self.included(base)
         base.class_eval do
           include SidekiqUniqueJobs::Unlockable
@@ -64,21 +41,17 @@ module Sidekiq
       end
 
       def delete_ext
-        unlock(item) if delete_orig
+        SidekiqUniqueJobs::Unlockable.unlock(item) if delete_orig
       end
 
       def remove_job_ext
         remove_job_orig do |message|
-          unlock(Sidekiq.load_json(message))
+          SidekiqUniqueJobs::Unlockable.unlock(Sidekiq.load_json(message))
           yield message
         end
       end
     end
-    sidekiq_version = Gem::Version.new(Sidekiq::VERSION)
-    include UniqueExtension3_5 if sidekiq_version >= Gem::Version.new('3.5')
-    include UniqueExtension3_0 if sidekiq_version >= Gem::Version.new('3.0') &&
-                                  sidekiq_version < Gem::Version.new('3.5')
-    # rubocop:enable Style/ClassAndModuleCamelCase
+    include UniqueExtension
   end
 
   class Job
@@ -92,7 +65,7 @@ module Sidekiq
       end
 
       def delete_ext
-        unlock(item)
+        SidekiqUniqueJobs::Unlockable.unlock(item)
         delete_orig
       end
     end
@@ -142,7 +115,7 @@ module Sidekiq
       end
 
       def delete_by_value_ext(name, value)
-        unlock(JSON.parse(value)) if delete_by_value_orig(name, value)
+        SidekiqUniqueJobs::Unlockable.unlock(JSON.parse(value)) if delete_by_value_orig(name, value)
       end
     end
 

data/lib/sidekiq_unique_jobs/testing/sidekiq_overrides.rb

@@ -3,42 +3,14 @@ require 'sidekiq/testing'
 module Sidekiq
   module Worker
     module ClassMethods
-      # Drain and run all jobs for this worker
-      unless Sidekiq::Testing.respond_to?(:server_middleware)
-        def drain
-          while (job = jobs.shift)
-            worker = new
-            worker.jid = job['jid']
-            worker.bid = job['bid'] if worker.respond_to?(:bid=)
-            execute_job(worker, job['args'])
-            unlock(job) if Sidekiq::Testing.fake?
-          end
-        end
-      end
-
-      # Pop out a single job and perform it
-      unless Sidekiq::Testing.respond_to?(:server_middleware)
-        def perform_one
-          raise(EmptyQueueError, 'perform_one called with empty job queue') if jobs.empty?
-          job = jobs.shift
-          worker = new
-          worker.jid = job['jid']
-          worker.bid = job['bid'] if worker.respond_to?(:bid=)
-          execute_job(worker, job['args'])
-          unlock(job) if Sidekiq::Testing.fake?
-        end
-      end
-
       # Clear all jobs for this worker
       def clear
         jobs.each do |job|
           unlock(job) if Sidekiq::Testing.fake?
         end
-        # if Sidekiq::VERSION >= '4'
-        #   Queues.jobs[queue].clear
-        # else
+
+        Sidekiq::Queues[queue].clear
         jobs.clear
-        # end
       end
 
       unless respond_to?(:execute_job)

data/lib/sidekiq_unique_jobs/unique_args.rb

@@ -45,7 +45,7 @@ module SidekiqUniqueJobs
 
       if unique_on_all_queues?
         logger.debug do
-          "uniqueness specified across all queues (deleting queue: #{@item[QUEUE_KEY]} from hash)"
+          "#{__method__} uniqueness specified across all queues (deleting queue: #{@item[QUEUE_KEY]} from hash)"
         end
         hash.delete(QUEUE_KEY)
       end
@@ -78,7 +78,7 @@ module SidekiqUniqueJobs
       if @worker_class.respond_to?(:get_sidekiq_options)
         true
       else
-        logger.debug { "#{@worker_class} does not respond to :get_sidekiq_options" }
+        logger.debug { "#{__method__} #{@worker_class} does not respond to :get_sidekiq_options" }
         nil
       end
     end
@@ -96,14 +96,14 @@ module SidekiqUniqueJobs
       when Symbol
         filter_by_symbol(json_args)
       else
-        logger.debug { 'arguments not filtered (the combined arguments count towards uniqueness)' }
+        logger.debug { "#{__method__} arguments not filtered (using all arguments for uniqueness)" }
         json_args
       end
     end
 
     def filter_by_proc(args)
       if unique_args_method.nil?
-        warn { "#{__method__} : Proc was nil, returning args as is #{args} -> #{filter_args}" }
+        logger.warn { "#{__method__} : unique_args_method is nil. Returning (#{args})" }
         return args
       end
       filter_args = unique_args_method.call(args)
@@ -114,8 +114,7 @@ module SidekiqUniqueJobs
     def filter_by_symbol(args)
       unless @worker_class.respond_to?(unique_args_method)
         logger.warn do
-          "#{__method__} : #{unique_args_method}) not defined in #{@worker_class} " \
-               "returning #{args} unchanged"
+          "#{__method__} : #{@worker_class} does not respond to #{unique_args_method}). Returning (#{args})"
         end
         return args
       end
@@ -123,6 +122,10 @@ module SidekiqUniqueJobs
       filter_args = @worker_class.send(unique_args_method, args)
       logger.debug { "#{__method__} : #{unique_args_method}(#{args}) => #{filter_args}" }
       filter_args
+    rescue ArgumentError => ex
+      logger.fatal "#{__method__} : #{@worker_class}'s #{unique_args_method} needs at least one argument"
+      logger.fatal ex
+      args
     end
 
     def unique_args_method

data/lib/sidekiq_unique_jobs/util.rb

@@ -107,7 +107,7 @@ module SidekiqUniqueJobs
     end
 
     def redis_keys_method
-      redis_version >= '2.8' ? SCAN_METHOD : KEYS_METHOD
+      (redis_version >= '2.8') ? SCAN_METHOD : KEYS_METHOD
     end
 
     def logger

data/lib/sidekiq_unique_jobs/version.rb

@@ -1,3 +1,3 @@
 module SidekiqUniqueJobs
-  VERSION = '5.0.1'.freeze
+  VERSION = '5.0.2'.freeze
 end

data/rails_example/app/controllers/work_controller.rb

@@ -17,6 +17,18 @@ class WorkController < ApplicationController
     redirect_to '/sidekiq'
   end
 
+  def duplicate_without_args
+    4.times { WithoutArgsWorker.perform_async }
+
+    redirect_to '/sidekiq'
+  end
+
+  def duplicate_with_args
+    4.times { WithoutArgsWorker.perform_async 1 }
+
+    redirect_to '/sidekiq'
+  end
+
   def unique_argument
     params[:id]
   end

data/rails_example/app/workers/without_args_worker.rb

@@ -0,0 +1,16 @@
+class WithoutArgsWorker
+  include Sidekiq::Worker
+  sidekiq_options queue: :default,
+                  retry: true,
+                  backtrace: true,
+                  unique: :until_executed,
+                  unique_args: :custom_args
+
+  def perform(_conditional = nil)
+    sleep 2
+  end
+
+  def self.custom_args
+    puts 'testing'
+  end
+end

data/rails_example/config/routes.rb

@@ -3,5 +3,6 @@ Rails.application.routes.draw do
   mount Sidekiq::Web, at: '/sidekiq'
   get 'work/duplicate_simple' => 'work#duplicate_simple'
   get 'work/duplicate_nested' => 'work#duplicate_nested'
-  get 'work/duplicate_slow' => 'work#duplicate_slow'
+  get 'work/duplicate_without_args' => 'work#duplicate_without_args'
+  get 'work/duplicate_with_args' => 'work#duplicate_with_args'
 end

data/spec/jobs/my_unique_job.rb

@@ -5,7 +5,7 @@ class MyUniqueJob
     retry: true,
     unique: :until_executed,
     unique_expiration: 7_200,
-    retry_count: 10
+    retry_count: 10,
   )
   def perform(_one, _two); end
 end

data/spec/jobs/unique_job_with_conditional_parameter.rb

@@ -0,0 +1,14 @@
+class UniqueJobWithoutUniqueArgsParameter
+  include Sidekiq::Worker
+  sidekiq_options queue: :customqueue,
+                  retry: true,
+                  backtrace: true,
+                  unique: :until_executed,
+                  unique_args: :unique_args
+
+  def perform(conditional = nil)
+    # NO-OP
+  end
+
+  def self.unique_args; end
+end

data/spec/jobs/unique_job_with_nil_unique_args.rb

@@ -0,0 +1,16 @@
+class UniqueJobWithNilUniqueArgs
+  include Sidekiq::Worker
+  sidekiq_options queue: :customqueue,
+                  retry: true,
+                  backtrace: true,
+                  unique: :until_executed,
+                  unique_args: :unique_args
+
+  def perform(*)
+    # NO-OP
+  end
+
+  def self.unique_args(_args)
+    nil
+  end
+end

data/spec/jobs/unique_job_with_no_unique_args_method.rb

@@ -0,0 +1,12 @@
+class UniqueJobWithNoUniqueArgsMethod
+  include Sidekiq::Worker
+  sidekiq_options queue: :customqueue,
+                  retry: true,
+                  backtrace: true,
+                  unique: :until_executed,
+                  unique_args: :filtered_args
+
+  def perform(*)
+    # NO-OP
+  end
+end

data/spec/jobs/unique_job_withthout_unique_args_parameter.rb

@@ -0,0 +1,14 @@
+class UniqueJobWithoutUniqueArgsParameter
+  include Sidekiq::Worker
+  sidekiq_options queue: :customqueue,
+                  retry: true,
+                  backtrace: true,
+                  unique: :until_executed,
+                  unique_args: :unique_args
+
+  def perform(optional = true)
+    # NO-OP
+  end
+
+  def self.unique_args; end
+end

data/spec/lib/sidekiq_unique_jobs/cli_spec.rb

@@ -108,8 +108,8 @@ RSpec.describe SidekiqUniqueJobs::Cli, ruby_ver: '>= 2.4' do
 
       let(:expected) do
         <<~EOS
-        Found 3 keys matching '#{pattern}':
-        uniquejobs:abcdefab  uniquejobs:defghayl  uniquejobs:poilkij
+          Found 3 keys matching '#{pattern}':
+          uniquejobs:abcdefab  uniquejobs:defghayl  uniquejobs:poilkij
         EOS
       end
       specify do

data/spec/lib/sidekiq_unique_jobs/client/middleware_spec.rb

@@ -123,7 +123,7 @@ RSpec.describe SidekiqUniqueJobs::Client::Middleware do
         Sidekiq::Client.push(
           'class' => MyUniqueJobWithFilterProc,
           'queue' => 'customqueue',
-          'args' => [1, type: 'value', some: 'not used']
+          'args' => [1, type: 'value', some: 'not used'],
         )
       end
       Sidekiq.redis { |c| expect(c.llen('queue:customqueue')).to eq(1) }
@@ -140,7 +140,7 @@ RSpec.describe SidekiqUniqueJobs::Client::Middleware do
         Sidekiq::Client.push(
           'class' => MyUniqueJobWithFilterMethod,
           'queue' => 'customqueue',
-          'args' => [1, type: 'value', some: 'not used']
+          'args' => [1, type: 'value', some: 'not used'],
         )
       end
       Sidekiq.redis { |c| expect(c.llen('queue:customqueue')).to eq(1) }
@@ -212,7 +212,7 @@ RSpec.describe SidekiqUniqueJobs::Client::Middleware do
           Sidekiq::Client.push(
             'class' => CustomQueueJobWithFilterMethod,
             'queue' => 'customqueue',
-            'args' => [1, i]
+            'args' => [1, i],
           )
         end
 
@@ -228,7 +228,7 @@ RSpec.describe SidekiqUniqueJobs::Client::Middleware do
           Sidekiq::Client.push(
             'class' => CustomQueueJobWithFilterProc,
             'queue' => 'customqueue',
-            'args' => [1, { random: rand, name: 'foobar' }]
+            'args' => [1, { random: rand, name: 'foobar' }],
           )
         end
 

data/spec/lib/sidekiq_unique_jobs/options_with_fallback_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe SidekiqUniqueJobs::OptionsWithFallback do
           .to receive(:warn)
           .with(
             'unique: true is no longer valid. Please set it to the type of lock required like: ' \
-            '`unique: :until_executed`'
+            '`unique: :until_executed`',
           )
 
         subject.unique_lock

data/spec/lib/sidekiq_unique_jobs/scripts/acquire_lock_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe SidekiqUniqueJobs::Scripts::AcquireLock do
           redis_pool,
           key,
           myjid,
-          max_lock
+          max_lock,
         )
       end
 

data/spec/lib/sidekiq_unique_jobs/sidekiq_unique_ext_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe 'Sidekiq::Api' do
       'class' => JustAWorker,
       'queue' => 'testqueue',
       'args'  => [foo: 'bar'],
-      'at'    => (Date.today + 1).to_time.to_i
+      'at'    => (Date.today + 1).to_time.to_i,
     )
   end
 

data/spec/lib/sidekiq_unique_jobs/unique_args_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 RSpec.describe SidekiqUniqueJobs::UniqueArgs do
   let(:item) { { 'class' => 'UntilExecutedJob', 'queue' => 'myqueue', 'args' => [[1, 2]] } }
   subject { described_class.new(item) }
-
   describe '#unique_digest' do
     context 'when args are empty' do
       let(:item) { { 'class' => 'WithoutArgumentJob', 'args' => [] } }
@@ -114,34 +113,145 @@ RSpec.describe SidekiqUniqueJobs::UniqueArgs do
 
   describe '#filter_by_proc' do
     let(:filter) { ->(args) { args[1]['test'] } }
+    let(:args) { [1, 'test' => 'it'] }
+    let(:unique_args) { described_class.new(item) }
+
+    subject { unique_args.filter_by_proc(args) }
+
     context 'without any default worker options configured' do
       before do
-        allow(subject).to receive(:unique_args_method).and_return(filter)
+        allow(unique_args).to receive(:unique_args_method).and_return(filter)
+      end
+
+      it 'returns the value of theoptions hash ' do
+        expect(subject).to eq('it')
+      end
+    end
+
+    context 'when #unique_args_method is nil' do
+      before do
+        allow(unique_args).to receive(:unique_args_method).and_return(nil)
       end
 
       it 'returns the value of theoptions hash ' do
-        expect(subject.filter_by_proc([1, 'test' => 'it'])).to eq('it')
+        expect(SidekiqUniqueJobs.logger).to receive(:warn) do |&block|
+          expect(block.call).to eq('filter_by_proc : unique_args_method is nil. Returning ([1, {"test"=>"it"}])')
+        end
+        expect(subject).to eq(args)
       end
     end
 
     with_default_worker_options(unique: :until_executed, unique_args: ->(args) { args[1]['test'] }) do
       it 'returns the value of the provided options' do
-        expect(subject.filter_by_proc([1, 'test' => 'it'])).to eq('it')
+        expect(subject).to eq('it')
       end
     end
   end
 
   describe '#filter_by_symbol' do
-    let(:item) do
-      { 'class' => 'UniqueJobWithFilterMethod',
-        'queue' => 'myqueue',
-        'args' => [[1, 2]] }
+    let(:unique_args) { described_class.new(item) }
+
+    context 'when filter is a working symbol' do
+      let(:item) do
+        { 'class' => 'UniqueJobWithFilterMethod',
+          'queue' => 'myqueue',
+          'args' => [[1, 2]] }
+      end
+
+      let(:args) { ['name', 2, 'whatever' => nil, 'type' => 'test'] }
+      subject { unique_args.filter_by_symbol(args) }
+
+      it 'returns the value of the provided class method' do
+        expected = %w[name test]
+        expect(unique_args.logger).to receive(:debug) do |&block|
+          expect(block.call).to eq("filter_by_symbol : filtered_args(#{args}) => #{expected}")
+        end
+        expect(subject).to eq(expected)
+      end
     end
-    subject { described_class.new(item) }
 
-    it 'returns the value of the provided class method' do
-      expect(subject.filter_by_symbol(['name', 2, 'whatever' => nil, 'type' => 'test']))
-        .to eq(%w[name test])
+    context 'when worker takes conditional parameters' do
+      let(:item) do
+        { 'class' => 'UniqueJobWithoutUniqueArgsParameter',
+          'queue' => 'myqueue',
+          'args' => [1] }
+      end
+      let(:args) { [1] }
+
+      subject { unique_args.filter_by_symbol(args) }
+
+      it 'returns the value of the provided class method' do
+        expect(subject).to eq(args)
+      end
+
+      context 'when provided nil' do
+        let(:args) { [] }
+        it 'returns the value of the provided class method' do
+          expect(subject).to eq(args)
+        end
+      end
+    end
+
+    context "when workers unique_args method doesn't take parameters" do
+      let(:item) do
+        { 'class' => 'UniqueJobWithoutUniqueArgsParameter',
+          'queue' => 'myqueue',
+          'args' => [[1, 2]] }
+      end
+
+      let(:args) { ['name', 2, 'whatever' => nil, 'type' => 'test'] }
+      subject { unique_args.filter_by_symbol(args) }
+
+      it 'returns the value of the provided class method' do
+        expect(unique_args.logger)
+          .to receive(:fatal)
+          .with('filter_by_symbol : UniqueJobWithoutUniqueArgsParameter\'s unique_args needs at least one argument')
+        expect(unique_args.logger).to receive(:fatal).with a_kind_of(ArgumentError)
+
+        expect(subject).to eq(args)
+      end
+    end
+
+    context 'when @worker_class does not respond_to unique_args_method' do
+      let(:item) do
+        { 'class' => 'UniqueJobWithNoUniqueArgsMethod',
+          'queue' => 'myqueue',
+          'args' => [[1, 2]] }
+      end
+
+      let(:args) { ['name', 2, 'whatever' => nil, 'type' => 'test'] }
+      subject { unique_args.filter_by_symbol(args) }
+
+      it 'returns the value of the provided class method' do
+        expect(unique_args.logger).to receive(:warn) do |&block|
+          expect(block.call)
+            .to eq(
+              "filter_by_symbol : UniqueJobWithNoUniqueArgsMethod does not respond to filtered_args). " \
+              "Returning (#{args})",
+            )
+        end
+
+        expect(subject).to eq(args)
+      end
+    end
+
+    context 'when workers unique_args method returns nil' do
+      let(:item) do
+        { 'class' => 'UniqueJobWithNilUniqueArgs',
+          'queue' => 'myqueue',
+          'args' => [[1, 2]] }
+      end
+
+      let(:args) { ['name', 2, 'whatever' => nil, 'type' => 'test'] }
+      subject { unique_args.filter_by_symbol(args) }
+
+      it 'returns the value of the provided class method' do
+        expect(unique_args.logger).to receive(:debug) do |&block|
+          expect(block.call).to eq("filter_by_symbol : unique_args(#{args}) => ")
+        end
+
+        expect(subject).to eq(nil)
+      end
     end
   end
 end

data/spec/lib/sidekiq_unique_jobs/unlockable_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe SidekiqUniqueJobs::Unlockable do
 
       described_class.unlock_by_key(
         unique_digest,
-        jid
+        jid,
       )
 
       expect(SidekiqUniqueJobs::Util.keys.count).to eq(0)

data/spec/support/ruby_meta.rb

@@ -9,7 +9,7 @@ RSpec.configure do |config|
       raise 'Please specify how to compare the version with >= or < or =' unless operator
 
       unless RUBY_VERSION.send(operator, version)
-        skip('Skipped due to version check (requirement was that ruby version is ' \
+        skip("Skipped due to version check (requirement was that ruby version is " \
              "#{operator} #{version}; was #{RUBY_VERSION})")
       end
     end

data/spec/support/sidekiq_meta.rb

@@ -17,7 +17,7 @@ RSpec.configure do |config|
         raise 'Please specify how to compare the version with >= or < or =' unless operator
 
         unless Sidekiq::VERSION.send(operator, version)
-          skip('Skipped due to version check (requirement was that sidekiq version is ' \
+          skip("Skipped due to version check (requirement was that sidekiq version is " \
                "#{operator} #{version}; was #{Sidekiq::VERSION})")
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-16 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -230,6 +230,7 @@ files:
 - rails_example/app/workers/slow_until_executing_worker.rb
 - rails_example/app/workers/spawn_simple_worker.rb
 - rails_example/app/workers/while_executing_worker.rb
+- rails_example/app/workers/without_args_worker.rb
 - rails_example/app/workers/without_argument_worker.rb
 - rails_example/bin/bundle
 - rails_example/bin/check_or_setup_db
@@ -315,7 +316,11 @@ files:
 - spec/jobs/simple_worker.rb
 - spec/jobs/spawn_simple_worker.rb
 - spec/jobs/test_class.rb
+- spec/jobs/unique_job_with_conditional_parameter.rb
 - spec/jobs/unique_job_with_filter_method.rb
+- spec/jobs/unique_job_with_nil_unique_args.rb
+- spec/jobs/unique_job_with_no_unique_args_method.rb
+- spec/jobs/unique_job_withthout_unique_args_parameter.rb
 - spec/jobs/unique_on_all_queues_job.rb
 - spec/jobs/until_and_while_executing_job.rb
 - spec/jobs/until_executed_job.rb