sidekiq-unique-jobs 5.0.0 → 5.0.1

data/spec/lib/sidekiq_unique_jobs/scripts_spec.rb

@@ -6,10 +6,6 @@ RSpec.describe SidekiqUniqueJobs::Scripts do
   ANOTHER_JID ||= 'anotherjid'.freeze
 
   context 'class methods' do
-    before do
-      Sidekiq.redis(&:flushdb)
-      Sidekiq::Worker.clear_all
-    end
     subject { SidekiqUniqueJobs::Scripts }
 
     it { is_expected.to respond_to(:call).with(3).arguments }
@@ -34,12 +30,12 @@ RSpec.describe SidekiqUniqueJobs::Scripts do
       context 'when job is unique' do
         specify { expect(lock_for).to eq(1) }
         specify do
-          expect(lock_for(0.5)).to eq(1)
-          expect(Redis)
+          expect(lock_for(2)).to eq(1)
+          expect(SidekiqUniqueJobs)
             .to have_key(UNIQUE_KEY)
             .for_seconds(1)
-            .with_value('fuckit')
-          sleep 0.5
+            .with_value(JID)
+          sleep 2
           expect(lock_for).to eq(1)
         end
 

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

@@ -11,11 +11,6 @@ RSpec.describe SidekiqUniqueJobs::Server::Middleware do
     SidekiqUniqueJobs::UniqueArgs.digest(item)
   end
 
-  before do
-    Sidekiq.redis = REDIS
-    Sidekiq.redis(&:flushdb)
-  end
-
   describe '#call' do
     context 'when unique is disabled' do
       it 'does not use locking' do

data/spec/lib/sidekiq_unique_jobs/sidekiq_testing_enabled_spec.rb

@@ -5,25 +5,6 @@ require 'sidekiq/scheduled'
 
 RSpec.describe 'When Sidekiq::Testing is enabled' do
   describe 'when set to :fake!', sidekiq: :fake do
-    before do
-      SidekiqUniqueJobs.configure do |config|
-        config.redis_test_mode = :redis
-      end
-      Sidekiq.redis = REDIS
-      Sidekiq.redis(&:flushdb)
-      Sidekiq::Worker.clear_all
-      if Sidekiq::Testing.respond_to?(:server_middleware)
-        Sidekiq::Testing.server_middleware do |chain|
-          chain.add SidekiqUniqueJobs::Server::Middleware
-        end
-      end
-    end
-
-    after do
-      Sidekiq.redis(&:flushdb)
-      Sidekiq::Testing.server_middleware(&:clear) if Sidekiq::Testing.respond_to?(:server_middleware)
-    end
-
     context 'with unique worker' do
       it 'does not push duplicate messages' do
         param = 'work'

data/spec/lib/sidekiq_unique_jobs/sidekiq_unique_ext_spec.rb

@@ -6,11 +6,6 @@ require 'sidekiq_unique_jobs/client/middleware'
 require 'sidekiq_unique_jobs/sidekiq_unique_ext'
 
 RSpec.describe 'Sidekiq::Api' do
-  before do
-    Sidekiq.redis = REDIS
-    Sidekiq.redis(&:flushdb)
-  end
-
   let(:item) do
     { 'class' => JustAWorker,
       'queue' => 'testqueue',

data/spec/lib/sidekiq_unique_jobs/unlockable_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 RSpec.describe SidekiqUniqueJobs::Unlockable do
-  before { Sidekiq.redis(&:flushdb) }
   def item_with_digest
     SidekiqUniqueJobs::UniqueArgs.digest(item)
     item

data/spec/lib/sidekiq_unique_jobs/util_spec.rb

@@ -1,47 +1,62 @@
 require 'spec_helper'
 
 RSpec.describe SidekiqUniqueJobs::Util do
-  let(:keys) { %w[uniquejobs:keyz] }
-
-  def set(key, value)
-    described_class.connection do |c|
-      c.set(key, value)
-      expect(c.keys('*')).to match_array([key])
-    end
+  let(:job) do
+    {
+      'class' => 'MyUniqueJob',
+      'args' => [[1, 2]],
+      'at' => 1_492_341_850.358196,
+      'retry' => true,
+      'queue' => 'customqueue',
+      'unique' => :until_executed,
+      'unique_expiration' => 7200,
+      'retry_count' => 10,
+      'jid' => jid,
+      'created_at' => 1_492_341_790.358217,
+    }
   end
+  let(:unique_args) { SidekiqUniqueJobs::UniqueArgs.new(job) }
+  let(:unique_key) { unique_args.unique_digest }
+  let(:jid) { 'e3049b05b0bd9c809182bbe0' }
 
-  before(:each) do
-    Sidekiq.redis = REDIS
-    Sidekiq.redis(&:flushdb)
+  def acquire_lock
+    SidekiqUniqueJobs::Scripts::AcquireLock.execute(nil, unique_key, jid, 1)
   end
 
   describe '.keys' do
   end
 
   describe '.del' do
-    context 'given a key named "keyz" with value "valz"' do
-      before do
-        set('uniquejobs:keyz', 'valz')
-      end
+    before do
+      acquire_lock
+    end
 
-      it 'deletes the keys by pattern' do
-        expect(described_class.del('*', 100, false)).to eq(1)
-      end
+    it 'deletes the keys by pattern' do
+      expect(described_class.del(described_class::SCAN_PATTERN, 100, false)).to eq(1)
+    end
 
-      it 'deletes the keys by pattern' do
-        expect(described_class.del('keyz', 100, false)).to eq(1)
-      end
+    it 'deletes the keys by distinct key' do
+      expect(described_class.del(unique_key, 100, false)).to eq(1)
     end
   end
 
-  describe '.prefix' do
-    context 'when .unique_prefix is nil?' do
-      it 'does not prefix with unique_prefix' do
-        allow(SidekiqUniqueJobs.config).to receive(:unique_prefix).and_return(nil)
-        expect(described_class.prefix('key')).to eq('key')
-      end
+  describe '.expire' do
+    before do
+      acquire_lock
     end
 
+    it 'does some shit' do
+      sleep 1
+      expected = { jid => unique_key }
+      expect(described_class.unique_hash).to match(expected)
+      removed_keys = described_class.expire
+      expect(removed_keys).to match(expected)
+      expect(described_class.unique_hash).not_to match(expected)
+      expect(described_class.keys('*')).not_to include(unique_key)
+    end
+  end
+
+  describe '.prefix' do
     before do
       allow(SidekiqUniqueJobs.config).to receive(:unique_prefix).and_return('test-uniqueness')
     end
@@ -49,5 +64,18 @@ RSpec.describe SidekiqUniqueJobs::Util do
     it 'returns a prefixed key' do
       expect(described_class.prefix('key')).to eq('test-uniqueness:key')
     end
+
+    context 'when .unique_prefix is nil?' do
+      it 'does not prefix with unique_prefix' do
+        allow(SidekiqUniqueJobs.config).to receive(:unique_prefix).and_return(nil)
+        expect(described_class.prefix('key')).to eq('key')
+      end
+    end
+
+    context 'when key is already prefixed' do
+      it 'does not add another prefix' do
+        expect(described_class.prefix('test-uniqueness:key')).to eq('test-uniqueness:key')
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -20,7 +20,7 @@ require 'sidekiq_unique_jobs/testing'
 require 'sidekiq/simulator'
 
 Sidekiq::Testing.disable!
-Sidekiq.logger.level = "Logger::#{ENV.fetch('LOGLEVEL') { 'error' }.upcase}".constantize
+SidekiqUniqueJobs.logger.level = "Logger::#{ENV.fetch('LOGLEVEL') { 'error' }.upcase}".constantize
 
 require 'sidekiq/redis_connection'
 
@@ -35,7 +35,8 @@ Sidekiq.configure_client do |config|
 end
 
 Dir[File.join(File.dirname(__FILE__), 'support', '**', '*.rb')].each { |f| require f }
-RSpec.configure do |config|
+
+RSpec.configure do |config| # rubocop:disable BlockLength
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
@@ -49,6 +50,43 @@ RSpec.configure do |config|
   config.default_formatter = 'doc' if config.files_to_run.one?
   config.order = :random
   Kernel.srand config.seed
+
+  config.before(:each) do
+    SidekiqUniqueJobs.configure do |unique_config|
+      unique_config.redis_test_mode = :redis
+    end
+    Sidekiq.redis = REDIS
+    Sidekiq.redis(&:flushdb)
+    Sidekiq::Worker.clear_all
+    Sidekiq::Queues.clear_all
+
+    if Sidekiq::Testing.respond_to?(:server_middleware)
+      Sidekiq::Testing.server_middleware do |chain|
+        chain.add SidekiqUniqueJobs::Server::Middleware
+      end
+    end
+    enable_delay = defined?(Sidekiq::Extensions) && Sidekiq::Extensions.respond_to?(:enable_delay!)
+    Sidekiq::Extensions.enable_delay! if enable_delay
+  end
+
+  config.after(:each) do
+    Sidekiq.redis(&:flushdb)
+    respond_to_middleware = defined?(Sidekiq::Testing) && Sidekiq::Testing.respond_to?(:server_middleware)
+    Sidekiq::Testing.server_middleware(&:clear) if respond_to_middleware
+  end
 end
 
 Dir[File.join(File.dirname(__FILE__), 'jobs', '**', '*.rb')].each { |f| require f }
+
+def capture(stream)
+  begin
+    stream = stream.to_s
+    eval "$#{stream} = StringIO.new" # rubocop:disable Security/Eval
+    yield
+    result = eval("$#{stream}").string # rubocop:disable Security/Eval
+  ensure
+    eval("$#{stream} = #{stream.upcase}") # rubocop:disable Security/Eval
+  end
+
+  result
+end

data/spec/support/matchers/redis_matchers.rb

@@ -2,18 +2,28 @@ require 'rspec/expectations'
 
 RSpec::Matchers.define :have_key do |unique_key|
   Sidekiq.redis do |redis|
-    match do |_actual|
-      with_value && for_seconds
+    match do |_unique_jobs|
+      @value = redis.get(unique_key)
+      @ttl = redis.ttl(unique_key)
+
+      @value && with_value && for_seconds
     end
 
     chain :with_value do |value = nil|
-      value.nil? ||
-        redis.get(unique_key) == value
+      @expected_value = value
+      @expected_value && @value == @expected_value
     end
 
     chain :for_seconds do |ttl = nil|
-      ttl.nil? ||
-        redis.ttl(unique_key) == ttl
+      @expected_ttl = ttl
+      @expected_ttl && @ttl == @expected_ttl
+    end
+
+    failure_message do |_actual|
+      msg = "expected Redis to have key #{unique_key}"
+      msg << " with value #{@expected_value} was (#{@value})" if @expected_value
+      msg << " with value #{@expected_ttl} was (#{@ttl})" if @expected_ttl
+      msg
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-08 00:00:00.000000000 Z
+date: 2017-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +189,8 @@ files:
 - lib/sidekiq_unique_jobs/run_lock_failed.rb
 - lib/sidekiq_unique_jobs/script_mock.rb
 - lib/sidekiq_unique_jobs/scripts.rb
+- lib/sidekiq_unique_jobs/scripts/acquire_lock.rb
+- lib/sidekiq_unique_jobs/scripts/release_lock.rb
 - lib/sidekiq_unique_jobs/server/middleware.rb
 - lib/sidekiq_unique_jobs/sidekiq_unique_ext.rb
 - lib/sidekiq_unique_jobs/testing.rb
@@ -213,6 +229,7 @@ files:
 - 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/while_executing_worker.rb
 - rails_example/app/workers/without_argument_worker.rb
 - rails_example/bin/bundle
 - rails_example/bin/check_or_setup_db
@@ -307,6 +324,7 @@ files:
 - spec/jobs/until_timeout_job.rb
 - spec/jobs/while_executing_job.rb
 - spec/jobs/without_argument_job.rb
+- spec/lib/sidekiq_unique_jobs/cli_spec.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
@@ -319,6 +337,8 @@ files:
 - spec/lib/sidekiq_unique_jobs/queue_lock_timeout_calculator_spec.rb
 - spec/lib/sidekiq_unique_jobs/run_lock_timeout_calculator_spec.rb
 - spec/lib/sidekiq_unique_jobs/script_mock_spec.rb
+- spec/lib/sidekiq_unique_jobs/scripts/acquire_lock_spec.rb
+- spec/lib/sidekiq_unique_jobs/scripts/release_lock_spec.rb
 - spec/lib/sidekiq_unique_jobs/scripts_spec.rb
 - spec/lib/sidekiq_unique_jobs/server/middleware_spec.rb
 - spec/lib/sidekiq_unique_jobs/sidekiq_testing_enabled_spec.rb