sidekiq-unique-jobs 4.0.18 → 5.0.0

data/spec/lib/sidekiq_unique_jobs/config_spec.rb

@@ -0,0 +1,84 @@
+require 'spec_helper'
+
+RSpec.describe SidekiqUniqueJobs::Config do
+  let(:args) do
+    {
+
+      unique_prefix: 'unique',
+      default_queue_lock_expiration: 30 * 60,
+      default_run_lock_expiration: 60,
+      default_lock: :while_executing,
+      redis_test_mode: :redis,
+    }
+  end
+
+  subject do
+    described_class.new(args)
+  end
+
+  describe '#testing_enabled?' do
+    context 'when Sidekiq::Testing is undefined' do
+      before { hide_const('Sidekiq::Testing') }
+      its(:testing_enabled?) do
+        is_expected.to eq(false)
+      end
+    end
+
+    context 'when Sidekiq::Testing is defined' do
+      context 'and Sidekiq::Testing.enabled? is false' do
+        before { allow(Sidekiq::Testing).to receive(:enabled?).and_return(false) }
+        its(:testing_enabled?) do
+          is_expected.to eq(false)
+        end
+      end
+
+      context 'and Sidekiq::Testing.enabled? is true' do
+        before { allow(Sidekiq::Testing).to receive(:enabled?).and_return(true) }
+        its(:testing_enabled?) do
+          is_expected.to eq(true)
+        end
+      end
+    end
+  end
+
+  describe '#inline_testing_enabled?' do
+    context 'when testing_enabled? is false' do
+      before { allow(subject).to receive(:testing_enabled?).and_return(false) }
+      its(:inline_testing_enabled?) do
+        is_expected.to eq(false)
+      end
+    end
+    context 'when testing_enabled? is true' do
+      before { allow(subject).to receive(:testing_enabled?).and_return(true) }
+
+      context 'and Sidekiq::Testing.inline? is false' do
+        before { allow(Sidekiq::Testing).to receive(:inline?).and_return(false) }
+        its(:inline_testing_enabled?) do
+          is_expected.to eq(false)
+        end
+      end
+
+      context 'and Sidekiq::Testing.inline? is true' do
+        before { allow(Sidekiq::Testing).to receive(:inline?).and_return(true) }
+        its(:inline_testing_enabled?) do
+          is_expected.to eq(true)
+        end
+      end
+    end
+  end
+
+  describe '#mocking?' do
+    context 'when redis_test_mode is :redis' do
+      its(:mocking?) do
+        is_expected.to eq(false)
+      end
+    end
+
+    context 'when redis_test_mode is :mock' do
+      subject { described_class.new(args.merge(redis_test_mode: :mock)) }
+      its(:mocking?) do
+        is_expected.to eq(true)
+      end
+    end
+  end
+end

data/spec/lib/sidekiq_unique_jobs/lock/until_and_while_executing_spec.rb

@@ -7,11 +7,12 @@ RSpec.describe SidekiqUniqueJobs::Lock::UntilAndWhileExecuting do
       'queue' => 'dupsallowed',
       'class' => 'UntilAndWhileExecuting',
       'unique' => 'until_executed',
-      'args' => [1]
+      'args' => [1],
     }
   end
   let(:callback) { -> {} }
   subject { described_class.new(item) }
+
   describe '#execute' do
     before do
       Sidekiq.redis(&:flushdb)

data/spec/lib/sidekiq_unique_jobs/lock/while_executing_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe SidekiqUniqueJobs::Lock::WhileExecuting do
       'class' => 'UntilAndWhileExecuting',
       'unique' => 'until_executed',
       'unique_digest' => 'test_mutex_key',
-      'args' => [1]
+      'args' => [1],
     }
   end
 
@@ -22,7 +22,7 @@ RSpec.describe SidekiqUniqueJobs::Lock::WhileExecuting do
       Thread.new do
         m.synchronize do
           y = x
-          sleep 0.001
+          sleep 0.1
           x = y + 1
         end
       end

data/spec/lib/sidekiq_unique_jobs/script_mock_spec.rb

@@ -1,15 +1,20 @@
 require 'spec_helper'
-require 'mock_redis'
 
-MOCK_REDIS ||= MockRedis.new
+begin
+  require 'mock_redis'
+  MOCK_REDIS ||= MockRedis.new
+rescue LoadError # rubocop:disable Lint/HandleExceptions
+  # This is a known issue (we only run this spec for ruby 2.4.1)
+end
 
-RSpec.describe SidekiqUniqueJobs::ScriptMock do
+RSpec.describe SidekiqUniqueJobs::ScriptMock, ruby_ver: '>= 2.4.1' do
   MD5_DIGEST ||= 'unique'.freeze
   UNIQUE_KEY ||= 'uniquejobs:unique'.freeze
   JID ||= 'fuckit'.freeze
   ANOTHER_JID ||= 'anotherjid'.freeze
 
   before do
+    Sidekiq.redis(&:flushdb)
     SidekiqUniqueJobs.configure do |config|
       config.redis_test_mode = :mock
     end
@@ -24,13 +29,14 @@ RSpec.describe SidekiqUniqueJobs::ScriptMock do
       MOCK_REDIS.del(keys)
     end
 
-    allow(Redis).to receive(:new).and_return(MOCK_REDIS)
+    allow(Sidekiq).to receive(:redis).and_yield(MOCK_REDIS)
   end
 
   after do
     SidekiqUniqueJobs.configure do |config|
       config.redis_test_mode = :redis
     end
+    Sidekiq.redis(&:flushdb)
   end
 
   subject { SidekiqUniqueJobs::Scripts }
@@ -58,13 +64,13 @@ RSpec.describe SidekiqUniqueJobs::ScriptMock do
 
       context 'when job is locked' do
         before  { expect(lock_for(10)).to eq(1) }
-        specify { expect(lock_for(5, 'anotherjid')).to eq(0) }
+        specify { expect(lock_for(5, ANOTHER_JID)).to eq(0) }
       end
     end
 
     describe '.release_lock' do
       context 'when job is locked by another jid' do
-        before  { expect(lock_for(10, 'anotherjid')).to eq(1) }
+        before  { expect(lock_for(10, ANOTHER_JID)).to eq(1) }
         specify { expect(unlock).to eq(0) }
         after { unlock(UNIQUE_KEY, ANOTHER_JID) }
       end

data/spec/lib/sidekiq_unique_jobs/scripts_spec.rb

@@ -14,15 +14,10 @@ RSpec.describe SidekiqUniqueJobs::Scripts do
 
     it { is_expected.to respond_to(:call).with(3).arguments }
     it { is_expected.to respond_to(:logger) }
-    it { is_expected.to respond_to(:script_shas) }
     it { is_expected.to respond_to(:connection).with(1).arguments }
     it { is_expected.to respond_to(:script_source).with(1).arguments }
     it { is_expected.to respond_to(:script_path).with(1).arguments }
 
-    describe '.script_shas' do
-      its(:script_shas) { is_expected.to be_a(Hash) }
-    end
-
     describe '.logger' do
       its(:logger) { is_expected.to eq(Sidekiq.logger) }
     end

data/spec/lib/sidekiq_unique_jobs/sidekiq_testing_enabled_spec.rb

@@ -12,9 +12,11 @@ RSpec.describe 'When Sidekiq::Testing is enabled' do
       Sidekiq.redis = REDIS
       Sidekiq.redis(&:flushdb)
       Sidekiq::Worker.clear_all
-      Sidekiq::Testing.server_middleware do |chain|
-        chain.add SidekiqUniqueJobs::Server::Middleware
-      end if Sidekiq::Testing.respond_to?(:server_middleware)
+      if Sidekiq::Testing.respond_to?(:server_middleware)
+        Sidekiq::Testing.server_middleware do |chain|
+          chain.add SidekiqUniqueJobs::Server::Middleware
+        end
+      end
     end
 
     after do

data/spec/lib/sidekiq_unique_jobs/sidekiq_unique_ext_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe 'Sidekiq::Api' do
     JustAWorker.perform_async(foo: 'bar')
   end
 
-  describe Sidekiq::SortedEntry::UniqueExtension, sidekiq_ver: '>= 3.1' do
+  describe Sidekiq::SortedEntry::UniqueExtension do
     it 'deletes uniqueness lock on delete' do
       expect(schedule_job).to be_truthy
 
@@ -68,7 +68,7 @@ RSpec.describe 'Sidekiq::Api' do
     end
   end
 
-  describe Sidekiq::JobSet::UniqueExtension, sidekiq_ver: '>= 3.1' do
+  describe Sidekiq::JobSet::UniqueExtension do
     it 'deletes uniqueness locks on clear' do
       schedule_job
       Sidekiq::JobSet.new('schedule').clear

data/spec/lib/sidekiq_unique_jobs/unique_args_spec.rb

@@ -5,9 +5,19 @@ RSpec.describe SidekiqUniqueJobs::UniqueArgs do
   subject { described_class.new(item) }
 
   describe '#unique_digest' do
-    let(:item) { item_options.merge('args' => [1, 2, 'type' => 'it']) }
+    context 'when args are empty' do
+      let(:item) { { 'class' => 'WithoutArgumentJob', 'args' => [] } }
+      let(:another_subject) { described_class.new(item) }
+
+      context 'with the same unique args' do
+        it 'equals to unique_digest for that item' do
+          expect(subject.unique_digest).to eq(another_subject.unique_digest)
+        end
+      end
+    end
 
     shared_examples 'unique digest' do
+      subject { described_class.new(item_options) }
       context 'given another item' do
         let(:another_subject) { described_class.new(another_item) }
 
@@ -21,7 +31,7 @@ RSpec.describe SidekiqUniqueJobs::UniqueArgs do
         context 'with different unique args' do
           let(:another_item) { item_options.merge('args' => [1, 3, 'type' => 'that']) }
           it 'differs from unique_digest for that item' do
-            expect(subject.unique_digest).to_not eq(another_subject.unique_digest)
+            expect(subject.unique_digest).not_to eq(another_subject.unique_digest)
           end
         end
       end
@@ -29,8 +39,11 @@ RSpec.describe SidekiqUniqueJobs::UniqueArgs do
 
     context 'when unique_args is a proc' do
       let(:item_options) do
-        { 'class' => 'UntilExecutedJob', 'queue' => 'myqueue',
-          'unique_args' => proc { |args| args[1] } }
+        {
+          'class' => 'MyUniqueJobWithFilterProc',
+          'queue' => 'customqueue',
+          'args' => [1, 2, 'type' => 'it'],
+        }
       end
 
       it_behaves_like 'unique digest'
@@ -38,8 +51,11 @@ RSpec.describe SidekiqUniqueJobs::UniqueArgs do
 
     context 'when unique_args is a symbol' do
       let(:item_options) do
-        { 'class' => 'UniqueJobWithFilterMethod', 'queue' => 'myqueue',
-          'unique_args' => :filtered_args }
+        {
+          'class' => 'MyUniqueJobWithFilterMethod',
+          'queue' => 'customqueue',
+          'args' => [1, 2, 'type' => 'it'],
+        }
       end
 
       it_behaves_like 'unique digest'
@@ -125,7 +141,7 @@ RSpec.describe SidekiqUniqueJobs::UniqueArgs do
 
     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))
+        .to eq(%w[name test])
     end
   end
 end

data/spec/lib/sidekiq_unique_jobs/unlockable_spec.rb

@@ -1,4 +1,38 @@
 require 'spec_helper'
 
 RSpec.describe SidekiqUniqueJobs::Unlockable do
+  before { Sidekiq.redis(&:flushdb) }
+  def item_with_digest
+    SidekiqUniqueJobs::UniqueArgs.digest(item)
+    item
+  end
+  let(:item) do
+    { 'class' => MyUniqueJob,
+      'queue' => 'customqueue',
+      'args' => [1, 2] }
+  end
+
+  let(:unique_digest) { item_with_digest[SidekiqUniqueJobs::UNIQUE_DIGEST_KEY] }
+  describe '.unlock_by_key' do
+    before do
+    end
+
+    specify do
+      expect(SidekiqUniqueJobs::Util.keys.count).to eq(0)
+      jid = Sidekiq::Client.push(item_with_digest)
+
+      expect(SidekiqUniqueJobs::Util.keys.count).to eq(1)
+      expect(SidekiqUniqueJobs::Util.keys).to match_array([unique_digest])
+      expect(SidekiqUniqueJobs::Util.unique_key(jid)).to eq(unique_digest)
+
+      described_class.unlock_by_key(
+        unique_digest,
+        jid
+      )
+
+      expect(SidekiqUniqueJobs::Util.keys.count).to eq(0)
+      expect(SidekiqUniqueJobs::Util.keys).not_to match_array([unique_digest])
+      expect(SidekiqUniqueJobs::Util.unique_key(jid)).to eq(nil)
+    end
+  end
 end

data/spec/lib/sidekiq_unique_jobs/util_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe SidekiqUniqueJobs::Util do
-  let(:keys) { %w(uniquejobs:keyz) }
+  let(:keys) { %w[uniquejobs:keyz] }
 
   def set(key, value)
     described_class.connection do |c|

data/spec/spec_helper.rb

@@ -1,10 +1,6 @@
-if RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '2.3.0'
-  if ENV['CI']
-    require 'codeclimate-test-reporter'
-    CodeClimate::TestReporter.start
-  else
-    require 'simplecov'
-  end
+VERSION_REGEX = /(?<operator>[<>=]+)?\s?(?<version>(\d+.?)+)/m
+if RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '2.4.0'
+  require 'simplecov'
 
   begin
     require 'pry-byebug'
@@ -16,7 +12,6 @@ end
 require 'rspec'
 require 'rspec/its'
 
-require 'celluloid_with_fallback'
 require 'sidekiq'
 require 'sidekiq/util'
 require 'sidekiq-unique-jobs'
@@ -29,12 +24,6 @@ Sidekiq.logger.level = "Logger::#{ENV.fetch('LOGLEVEL') { 'error' }.upcase}".con
 
 require 'sidekiq/redis_connection'
 
-begin
-  require 'redis-namespace'
-rescue LoadError
-  puts 'Redis Namespace unavailable'
-end
-
 REDIS_URL ||= ENV['REDIS_URL'] || 'redis://localhost/15'.freeze
 REDIS_NAMESPACE ||= 'unique-test'.freeze
 REDIS_OPTIONS ||= { url: REDIS_URL } # rubocop:disable MutableConstant

data/spec/support/ruby_meta.rb

@@ -1,10 +1,17 @@
 RSpec.configure do |config|
   config.before(:each) do |example|
     ruby_ver = example.metadata[:ruby_ver]
-    next unless ruby_ver
+    VERSION_REGEX.match(ruby_ver.to_s) do |match|
+      version  = match[:version]
+      operator = match[:operator]
+      next unless ruby_ver
 
-    if Gem::Version.new(ruby_ver) >= Gem::Version.new(RUBY_VERSION)
-      skip("Not relevant for version less than #{ruby_ver}")
+      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 ' \
+             "#{operator} #{version}; was #{RUBY_VERSION})")
+      end
     end
   end
 end

data/spec/support/sidekiq_meta.rb

@@ -1,8 +1,7 @@
 RSpec.configure do |config|
-  VERSION_REGEX = /(?<operator>[<>=]+)?\s?(?<version>(\d+.?)+)/m
   config.before(:each) do |example|
-    SidekiqUniqueJobs.configure do |config|
-      config.redis_test_mode = :redis
+    SidekiqUniqueJobs.configure do |c|
+      c.redis_test_mode = :redis
     end
 
     if (sidekiq = example.metadata[:sidekiq])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 4.0.18
+  version: 5.0.0
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-24 00:00:00.000000000 Z
+date: 2017-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: The unique jobs that were removed from sidekiq
 email:
 - mikael@zoolutions.se
@@ -117,8 +131,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".csslintrc"
 - ".dockerignore"
 - ".editorconfig"
+- ".eslintignore"
+- ".eslintrc"
 - ".fasterer.yml"
 - ".gitignore"
 - ".rspec"
@@ -134,15 +151,10 @@ files:
 - bin/bench
 - bin/jobs
 - circle.yml
-- gemfiles/sidekiq_2.15.gemfile
-- gemfiles/sidekiq_2.16.gemfile
-- gemfiles/sidekiq_2.17.gemfile
-- gemfiles/sidekiq_3.0.gemfile
-- gemfiles/sidekiq_3.1.gemfile
-- gemfiles/sidekiq_3.2.gemfile
-- gemfiles/sidekiq_3.3.gemfile
 - gemfiles/sidekiq_4.0.gemfile
 - gemfiles/sidekiq_4.1.gemfile
+- gemfiles/sidekiq_4.2.gemfile
+- gemfiles/sidekiq_5.0.gemfile
 - gemfiles/sidekiq_develop.gemfile
 - lib/sidekiq-unique-jobs.rb
 - lib/sidekiq/simulator.rb
@@ -173,6 +185,7 @@ files:
 - lib/sidekiq_unique_jobs/util.rb
 - lib/sidekiq_unique_jobs/version.rb
 - rails_example/.env
+- rails_example/.env.test
 - rails_example/.gitignore
 - rails_example/.rspec
 - rails_example/Gemfile
@@ -198,7 +211,9 @@ files:
 - rails_example/app/models/post.rb
 - rails_example/app/views/layouts/application.html.erb
 - rails_example/app/workers/simple_worker.rb
+- rails_example/app/workers/slow_until_executing_worker.rb
 - rails_example/app/workers/spawn_simple_worker.rb
+- rails_example/app/workers/without_argument_worker.rb
 - rails_example/bin/bundle
 - rails_example/bin/check_or_setup_db
 - rails_example/bin/docker-setup
@@ -251,6 +266,7 @@ files:
 - rails_example/public/favicon.ico
 - rails_example/public/robots.txt
 - rails_example/simple.ru
+- rails_example/spec/controllers/work_controller_mock_spec.rb
 - rails_example/spec/controllers/work_controller_spec.rb
 - rails_example/spec/factories/posts.rb
 - rails_example/spec/models/post_spec.rb
@@ -264,7 +280,6 @@ files:
 - redis/release_lock.lua
 - redis/synchronize.lua
 - sidekiq-unique-jobs.gemspec
-- spec/celluloid_with_fallback.rb
 - spec/jobs/another_unique_job.rb
 - spec/jobs/custom_queue_job.rb
 - spec/jobs/custom_queue_job_with_filter_method.rb
@@ -291,7 +306,9 @@ files:
 - spec/jobs/until_global_timeout_job.rb
 - spec/jobs/until_timeout_job.rb
 - spec/jobs/while_executing_job.rb
+- spec/jobs/without_argument_job.rb
 - spec/lib/sidekiq_unique_jobs/client/middleware_spec.rb
+- spec/lib/sidekiq_unique_jobs/config_spec.rb
 - spec/lib/sidekiq_unique_jobs/core_ext_spec.rb
 - spec/lib/sidekiq_unique_jobs/lock/until_and_while_executing_spec.rb
 - spec/lib/sidekiq_unique_jobs/lock/until_executed_spec.rb
@@ -337,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: The unique jobs that were removed from sidekiq