sidekiq-unique-jobs 4.0.0 → 4.0.7

data/spec/lib/sidekiq_unique_jobs/sidekiq_unique_ext_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe 'Sidekiq::Api' do
       'class' => JustAWorker,
       'queue' => 'testqueue',
       'args'  => [foo: 'bar'],
-      'at'    => Time.now.tomorrow.to_i)
+      'at'    => (Date.today + 1).to_time.to_i)
   end
 
   def schedule_job
@@ -67,7 +67,7 @@ RSpec.describe 'Sidekiq::Api' do
     end
   end
 
-  describe Sidekiq::JobSet::UniqueExtension, sidekiq_ver: '>= 3' do
+  describe Sidekiq::JobSet::UniqueExtension, sidekiq_ver: '>= 3.1' do
     it 'deletes uniqueness locks on clear' do
       schedule_job
       Sidekiq::JobSet.new('schedule').clear

data/spec/lib/sidekiq_unique_jobs/{lock/time_calculator_spec.rb → timeout_calculator_spec.rb}

@@ -1,13 +1,12 @@
 require 'spec_helper'
 
-RSpec.describe SidekiqUniqueJobs::Lock::TimeCalculator do
-  include ActiveSupport::Testing::TimeHelpers
+RSpec.describe SidekiqUniqueJobs::TimeoutCalculator do
   shared_context 'undefined worker class' do
     subject { described_class.new('class' => 'test') }
   end
 
   shared_context 'item not scheduled' do
-    subject { described_class.new('class' => 'MyUniqueWorker') }
+    subject { described_class.new('class' => 'MyUniqueJob') }
   end
 
   describe 'public api' do
@@ -41,13 +40,13 @@ RSpec.describe SidekiqUniqueJobs::Lock::TimeCalculator do
       its(:time_until_scheduled) { is_expected.to eq(0) }
     end
 
-    subject { described_class.new('class' => 'MyUniqueWorker', 'at' => schedule_time) }
-    let(:schedule_time) { 1.day.from_now.to_i }
+    subject { described_class.new('class' => 'MyUniqueJob', 'at' => schedule_time) }
+    let(:schedule_time) { Time.now.utc.to_i + 24 * 60 * 60 }
     let(:now_in_utc) { Time.now.utc.to_i }
 
     its(:time_until_scheduled) do
-      travel_to(Time.at(now_in_utc)) do
-        is_expected.to eq(schedule_time - now_in_utc)
+      Timecop.travel(Time.at(now_in_utc)) do
+        is_expected.to be_within(1).of(schedule_time - now_in_utc)
       end
     end
   end
@@ -57,7 +56,7 @@ RSpec.describe SidekiqUniqueJobs::Lock::TimeCalculator do
       its(:unique_expiration) { is_expected.to eq(SidekiqUniqueJobs.config.default_expiration) }
     end
 
-    subject { described_class.new('class' => 'MyUniqueWorker') }
+    subject { described_class.new('class' => 'MyUniqueJob') }
     its(:unique_expiration) { is_expected.to eq(7_200) }
   end
 
@@ -66,7 +65,7 @@ RSpec.describe SidekiqUniqueJobs::Lock::TimeCalculator do
       its(:worker_class_unique_expiration) { is_expected.to eq(nil) }
     end
 
-    subject { described_class.new('class' => 'MyUniqueWorker') }
+    subject { described_class.new('class' => 'MyUniqueJob') }
     its(:worker_class_unique_expiration) { is_expected.to eq(7_200) }
   end
 
@@ -75,7 +74,7 @@ RSpec.describe SidekiqUniqueJobs::Lock::TimeCalculator do
       its(:worker_class) { is_expected.to eq('test') }
     end
 
-    subject { described_class.new('class' => 'MyWorker') }
-    its(:worker_class) { is_expected.to eq(MyWorker) }
+    subject { described_class.new('class' => 'MyJob') }
+    its(:worker_class) { is_expected.to eq(MyJob) }
   end
 end

data/spec/lib/sidekiq_unique_jobs/unique_args_spec.rb

@@ -1,45 +1,30 @@
 require 'spec_helper'
 
 RSpec.describe SidekiqUniqueJobs::UniqueArgs do
-  let(:item) { { 'class' => 'UniqueWorker', 'queue' => 'myqueue', 'args' => [[1, 2]] } }
+  let(:item) { { 'class' => 'UntilExecutedJob', 'queue' => 'myqueue', 'args' => [[1, 2]] } }
   subject { described_class.new(item) }
 
-  describe '#unique_args_enabled_in_worker?' do
-    with_sidekiq_options_for(UniqueWorker, unique_args: :unique_args) do
-      its(:unique_args_enabled_in_worker?) { is_expected.to eq(:unique_args) }
-    end
-
-    with_sidekiq_options_for(UniqueWorker, unique_args: false) do
-      its(:unique_args_enabled_in_worker?) { is_expected.to eq(false) }
-    end
-
-    # For when a worker doesn't exist in the current context
-    with_sidekiq_options_for('NotAWorker') do
-      its(:unique_args_enabled_in_worker?) { is_expected.to eq(nil) }
-    end
-  end
-
   describe '#unique_args_enabled?' do
-    with_global_config(unique_args_enabled: true) do
-      with_sidekiq_options_for(UniqueWorker, unique_args: :unique_args) do
+    with_default_worker_options(unique: :until_executed, unique_args: ->(args) { args[1]['test'] }) do
+      with_sidekiq_options_for(UntilExecutedJob, unique_args: :unique_args) do
         its(:unique_args_enabled?) { is_expected.to eq(:unique_args) }
       end
 
-      with_sidekiq_options_for(UniqueWorker, unique_args: false) do
-        its(:unique_args_enabled?) { is_expected.to eq(true) }
+      with_sidekiq_options_for(UntilExecutedJob, unique_args: false) do
+        its(:unique_args_enabled?) { is_expected.to be_a(Proc) }
       end
     end
 
-    with_global_config(unique_args_enabled: false) do
-      with_sidekiq_options_for(UniqueWorker, unique_args: :unique_args) do
+    with_default_worker_options(unique: false, unique_args: nil) do
+      with_sidekiq_options_for(UntilExecutedJob, unique_args: :unique_args) do
         its(:unique_args_enabled?) { is_expected.to eq(:unique_args) }
       end
 
-      with_sidekiq_options_for(UniqueWorker, unique_args: false) do
-        its(:unique_args_enabled?) { is_expected.to eq(false) }
+      with_sidekiq_options_for(UntilExecutedJob, unique_args: false) do
+        its(:unique_args_enabled?) { is_expected.to be_falsy }
       end
 
-      its(:unique_args_enabled?) { is_expected.to eq(false) }
+      its(:unique_args_enabled?) { is_expected.to be_falsy }
     end
   end
 
@@ -47,46 +32,44 @@ RSpec.describe SidekiqUniqueJobs::UniqueArgs do
     with_global_config(unique_args_enabled: true) do
       its(:unique_on_all_queues?) { is_expected.to eq(nil) }
 
-      with_sidekiq_options_for(UniqueWorker, unique_args: :unique_args, unique_on_all_queues: true) do
+      with_sidekiq_options_for(UntilExecutedJob, unique_args: :unique_args, unique_on_all_queues: true) do
         its(:unique_on_all_queues?) { is_expected.to eq(true) }
       end
 
-      with_sidekiq_options_for(UniqueWorker, unique_args: :unique_args, unique_on_all_queues: false) do
-        its(:unique_on_all_queues?) { is_expected.to eq(false) }
-      end
-
-      # For when a worker doesn't exist in the current context
-      with_sidekiq_options_for('NotAWorker', unique_args: :unique_args, unique_on_all_queues: true) do
-        its(:unique_args_enabled_in_worker?) { is_expected.to eq(nil) }
+      with_sidekiq_options_for(UntilExecutedJob, unique_args: :unique_args, unique_on_all_queues: false) do
+        its(:unique_on_all_queues?) { is_expected.to be_falsy }
       end
     end
 
     with_global_config(unique_args_enabled: false) do
       its(:unique_on_all_queues?) { is_expected.to eq(nil) }
 
-      with_sidekiq_options_for(UniqueWorker, unique_args: :unique_args, unique_on_all_queues: false) do
+      with_sidekiq_options_for(UntilExecutedJob, unique_args: :unique_args, unique_on_all_queues: false) do
         its(:unique_on_all_queues?) { is_expected.to eq(false) }
       end
 
-      with_sidekiq_options_for(UniqueWorker, unique_args: :unique_args, unique_on_all_queues: true) do
+      with_sidekiq_options_for(UntilExecutedJob, unique_args: :unique_args, unique_on_all_queues: true) do
         its(:unique_on_all_queues?) { is_expected.to eq(true) }
       end
-
-      # For when a worker doesn't exist in the current context
-      with_sidekiq_options_for('NotAWorker', unique_args: :unique_args, unique_on_all_queues: true) do
-        its(:unique_args_enabled_in_worker?) { is_expected.to eq(nil) }
-      end
     end
   end
 
   describe '#filter_by_proc' do
-    let(:proc) { ->(args) { args[1]['test'] } }
-    before do
-      allow(subject).to receive(:unique_args_method).and_return(proc)
+    let(:filter) { ->(args) { args[1]['test'] } }
+    context 'without any default worker options configured' do
+      before do
+        allow(subject).to receive(:unique_args_method).and_return(filter)
+      end
+
+      it 'returns the value of theoptions hash ' do
+        expect(subject.filter_by_proc([1, 'test' => 'it'])).to eq('it')
+      end
     end
 
-    it 'returns the value of the provided ' do
-      expect(subject.filter_by_proc([1, 'test' => 'it'])).to eq('it')
+    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')
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -1,26 +1,34 @@
-if ENV['CI'] && RUBY_ENGINE == 'ruby'
-  require 'codeclimate-test-reporter'
-  CodeClimate::TestReporter.start
-else
-  require 'simplecov'
-end
+if RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '2.2.3'
+  if ENV['CI']
+    require 'codeclimate-test-reporter'
+    CodeClimate::TestReporter.start
+  else
+    require 'simplecov'
+  end
 
-begin
-  require 'pry-byebug'
-rescue LoadError
-  puts 'Pry unavailable'
+  begin
+    require 'pry-byebug'
+  rescue LoadError
+    puts 'Pry unavailable'
+  end
 end
 
 require 'rspec'
 require 'rspec/its'
-require 'celluloid/current'
+
+begin
+  require 'celluloid/current'
+rescue LoadError
+  warn 'Celluloid is old'
+  require 'celluloid'
+end
 require 'celluloid/test'
+Celluloid.boot
 require 'sidekiq'
 require 'sidekiq/util'
 require 'sidekiq-unique-jobs'
 require 'sidekiq_unique_jobs/testing'
-require 'active_support/all'
-require 'active_support/testing/time_helpers'
+require 'timecop'
 
 require 'rspec-sidekiq'
 
@@ -47,7 +55,7 @@ RSpec.configure do |config|
   config.filter_run :focus unless ENV['CI']
   config.run_all_when_everything_filtered = true
   config.disable_monkey_patching!
-  config.warnings = true
+  config.warnings = false
   config.default_formatter = 'doc' if config.files_to_run.one?
   config.order = :random
   Kernel.srand config.seed
@@ -64,4 +72,4 @@ RSpec::Sidekiq.configure do |config|
   config.warn_when_jobs_not_processed_by_sidekiq = false
 end
 
-Dir[File.join(File.dirname(__FILE__), 'workers', '**', '*.rb')].each { |f| require f }
+Dir[File.join(File.dirname(__FILE__), 'jobs', '**', '*.rb')].each { |f| require f }

data/spec/support/unique_macros.rb

@@ -10,7 +10,6 @@ module SidekiqUniqueJobs
         SidekiqUniqueJobs.configure(was_config)
       end
 
-      # enable versioning for specific blocks (at instance-level)
       def with_sidekiq_options_for(worker_class, options)
         worker_class = SidekiqUniqueJobs.worker_class_constantize(worker_class)
         if worker_class.respond_to?(:sidekiq_options)
@@ -21,6 +20,16 @@ module SidekiqUniqueJobs
       ensure
         worker_class.sidekiq_options_hash = was_options if worker_class.respond_to?(:sidekiq_options_hash=)
       end
+
+      def with_default_worker_options(options)
+        was_options = Sidekiq.default_worker_options
+        Sidekiq.default_worker_options.clear
+        Sidekiq.default_worker_options = options
+        yield
+      ensure
+        Sidekiq.default_worker_options.clear
+        Sidekiq.default_worker_options = was_options
+      end
     end
 
     module ClassMethods
@@ -42,6 +51,16 @@ module SidekiqUniqueJobs
           class_exec(&block)
         end
       end
+
+      # enable versioning for specific blocks (at class-level)
+      def with_default_worker_options(config = {}, &block)
+        context "with default sidekiq options #{config}" do
+          around(:each) do |ex|
+            with_default_worker_options(config, &ex)
+          end
+          class_exec(&block)
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.7
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -139,9 +125,10 @@ files:
 - lib/sidekiq-unique-jobs.rb
 - lib/sidekiq_unique_jobs/client/middleware.rb
 - lib/sidekiq_unique_jobs/config.rb
+- lib/sidekiq_unique_jobs/constants.rb
 - lib/sidekiq_unique_jobs/core_ext.rb
 - lib/sidekiq_unique_jobs/lock.rb
-- lib/sidekiq_unique_jobs/lock/time_calculator.rb
+- lib/sidekiq_unique_jobs/lock/until_and_while_executing.rb
 - lib/sidekiq_unique_jobs/lock/until_executed.rb
 - lib/sidekiq_unique_jobs/lock/until_executing.rb
 - lib/sidekiq_unique_jobs/lock/until_timeout.rb
@@ -155,6 +142,7 @@ files:
 - lib/sidekiq_unique_jobs/sidekiq_unique_ext.rb
 - lib/sidekiq_unique_jobs/testing.rb
 - lib/sidekiq_unique_jobs/testing/sidekiq_overrides.rb
+- lib/sidekiq_unique_jobs/timeout_calculator.rb
 - lib/sidekiq_unique_jobs/unique_args.rb
 - lib/sidekiq_unique_jobs/unlockable.rb
 - lib/sidekiq_unique_jobs/version.rb
@@ -162,45 +150,45 @@ files:
 - redis/release_lock.lua
 - redis/synchronize.lua
 - sidekiq-unique-jobs.gemspec
+- spec/jobs/another_unique_job.rb
+- spec/jobs/custom_queue_job.rb
+- spec/jobs/custom_queue_job_with_filter_method.rb
+- spec/jobs/custom_queue_job_with_filter_proc.rb
+- spec/jobs/expiring_job.rb
+- spec/jobs/inline_worker.rb
+- spec/jobs/just_a_worker.rb
+- spec/jobs/main_job.rb
+- spec/jobs/my_job.rb
+- spec/jobs/my_unique_job.rb
+- spec/jobs/plain_class.rb
+- spec/jobs/test_class.rb
+- spec/jobs/unique_job_with_filter_method.rb
+- spec/jobs/unique_on_all_queues_job.rb
+- spec/jobs/until_and_while_executing_job.rb
+- spec/jobs/until_executed_job.rb
+- spec/jobs/until_executing_job.rb
+- spec/jobs/until_global_timeout_job.rb
+- spec/jobs/until_timeout_job.rb
+- spec/jobs/while_executing_job.rb
 - spec/lib/sidekiq_unique_jobs/client/middleware_spec.rb
 - spec/lib/sidekiq_unique_jobs/core_ext_spec.rb
-- spec/lib/sidekiq_unique_jobs/lock/time_calculator_spec.rb
+- spec/lib/sidekiq_unique_jobs/lock/until_and_while_executing_spec.rb
+- spec/lib/sidekiq_unique_jobs/lock/until_executed_spec.rb
 - spec/lib/sidekiq_unique_jobs/lock/while_executing_spec.rb
 - spec/lib/sidekiq_unique_jobs/normalizer_spec.rb
+- spec/lib/sidekiq_unique_jobs/options_with_fallback_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
 - spec/lib/sidekiq_unique_jobs/sidekiq_unique_ext_spec.rb
 - spec/lib/sidekiq_unique_jobs/sidekiq_unique_jobs_spec.rb
+- spec/lib/sidekiq_unique_jobs/timeout_calculator_spec.rb
 - spec/lib/sidekiq_unique_jobs/unique_args_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers/redis_matchers.rb
 - spec/support/ruby_meta.rb
 - spec/support/sidekiq_meta.rb
 - spec/support/unique_macros.rb
-- spec/workers/after_unlock_worker.rb
-- spec/workers/after_yield_worker.rb
-- spec/workers/another_unique_worker.rb
-- spec/workers/before_yield_worker.rb
-- spec/workers/expiring_worker.rb
-- spec/workers/inline_expiration_worker.rb
-- spec/workers/inline_unlock_order_worker.rb
-- spec/workers/inline_worker.rb
-- spec/workers/just_a_worker.rb
-- spec/workers/main_job.rb
-- spec/workers/my_unique_worker.rb
-- spec/workers/my_worker.rb
-- spec/workers/plain_class.rb
-- spec/workers/queue_worker.rb
-- spec/workers/queue_worker_with_filter_method.rb
-- spec/workers/queue_worker_with_filter_proc.rb
-- spec/workers/run_lock_with_retries_worker.rb
-- spec/workers/run_lock_worker.rb
-- spec/workers/test_class.rb
-- spec/workers/unique_job_with_filter_method.rb
-- spec/workers/unique_on_all_queues_worker.rb
-- spec/workers/unique_worker.rb
-- spec/workers/while_executing_worker.rb
 homepage: https://github.com/mhenrixon/sidekiq-unique-jobs
 licenses:
 - LGPL-3.0

data/lib/sidekiq_unique_jobs/lock/time_calculator.rb

@@ -1,44 +0,0 @@
-module SidekiqUniqueJobs
-  module Lock
-    class TimeCalculator
-      def self.for_item(item)
-        new(item)
-      end
-
-      def initialize(item)
-        @item = item
-      end
-
-      def seconds
-        time_until_scheduled + unique_expiration
-      end
-
-      def time_until_scheduled
-        scheduled = item['at'.freeze]
-        return 0 unless scheduled
-        (Time.at(scheduled) - Time.now.utc).to_i
-      end
-
-      def unique_expiration
-        @unique_expiration ||=
-          (
-            worker_class_unique_expiration ||
-            SidekiqUniqueJobs.config.default_expiration
-          ).to_i
-      end
-
-      def worker_class_unique_expiration
-        return unless worker_class.respond_to?(:get_sidekiq_options)
-        worker_class.get_sidekiq_options['unique_expiration'.freeze]
-      end
-
-      def worker_class
-        @worker_class ||= SidekiqUniqueJobs.worker_class_constantize(item['class'.freeze])
-      end
-
-      private
-
-      attr_reader :item
-    end
-  end
-end