activejob-locking 0.4.0 → 0.6.2

data/test/test_serialized_memory.rb

@@ -1,11 +1,11 @@
-require_relative('./serialized_tests')
-
-class SerializedMemory < MiniTest::Test
-  include SerializedTests
-
-  def setup
-    ActiveJob::Base.queue_adapter = :test
-    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
-    ActiveJob::Locking.options.adapter = ActiveJob::Locking::Adapters::Memory
-  end
+require_relative('./serialized_tests')
+
+class SerializedMemory < MiniTest::Test
+  include SerializedTests
+
+  def setup
+    ActiveJob::Base.queue_adapter = :test
+    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
+    ActiveJob::Locking.options.adapter = ActiveJob::Locking::Adapters::Memory
+  end
 end

data/test/test_serialized_redis_semaphore.rb

@@ -1,12 +1,12 @@
-require_relative('./serialized_tests')
-
-class UniqueRedisSemaphoreTest < MiniTest::Test
-  include SerializedTests
-
-  def setup
-    redis_reset
-    ActiveJob::Base.queue_adapter = :test
-    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
-    ActiveJob::Locking.options.adapter = ActiveJob::Locking::Adapters::RedisSemaphore
-  end
+require_relative('./serialized_tests')
+
+class UniqueRedisSemaphoreTest < MiniTest::Test
+  include SerializedTests
+
+  def setup
+    redis_reset
+    ActiveJob::Base.queue_adapter = :test
+    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
+    ActiveJob::Locking.options.adapter = ActiveJob::Locking::Adapters::RedisSemaphore
+  end
 end

data/test/test_serialized_redlock.rb

@@ -1,14 +1,14 @@
-require_relative('./serialized_tests')
-
-class SerializedRedlockTest < MiniTest::Test
-  include SerializedTests
-
-  def setup
-    redis_reset
-
-    ActiveJob::Base.queue_adapter = :test
-    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
-    ActiveJob::Locking.options.adapter = ActiveJob::Locking::Adapters::Redlock
-    ActiveJob::Locking.options.hosts = Redlock::Client::DEFAULT_REDIS_URLS
-  end
+require_relative('./serialized_tests')
+
+class SerializedRedlockTest < MiniTest::Test
+  include SerializedTests
+
+  def setup
+    redis_reset
+
+    ActiveJob::Base.queue_adapter = :test
+    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
+    ActiveJob::Locking.options.adapter = ActiveJob::Locking::Adapters::Redlock
+    ActiveJob::Locking.options.hosts = Redlock::Client::DEFAULT_REDIS_URLS
+  end
 end

data/test/test_serialized_suo_redis.rb

@@ -1,12 +1,12 @@
-require_relative('./serialized_tests')
-
-class SerializedSuoRedisTest < MiniTest::Test
-  include SerializedTests
-
-  def setup
-    redis_reset
-    ActiveJob::Base.queue_adapter = :test
-    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
-    ActiveJob::Locking.options.adapter = ActiveJob::Locking::Adapters::SuoRedis
-  end
+require_relative('./serialized_tests')
+
+class SerializedSuoRedisTest < MiniTest::Test
+  include SerializedTests
+
+  def setup
+    redis_reset
+    ActiveJob::Base.queue_adapter = :test
+    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
+    ActiveJob::Locking.options.adapter = ActiveJob::Locking::Adapters::SuoRedis
+  end
 end

data/test/test_suite.rb

@@ -1,12 +1,12 @@
-%w(
-  test_serialized_memory
-  test_serialized_redis_semaphore
-  test_serialized_redlock
-  test_serialized_suo_redis
-  test_unique_memory
-  test_unique_redis_semaphore
-  test_unique_redlock
-  test_unique_suo_redis
-).each do |test|
-  require File.expand_path("../#{test}", __FILE__)
-end
+%w(
+  test_serialized_memory
+  test_serialized_redis_semaphore
+  test_serialized_redlock
+  test_serialized_suo_redis
+  test_unique_memory
+  test_unique_redis_semaphore
+  test_unique_redlock
+  test_unique_suo_redis
+).each do |test|
+  require File.expand_path("../#{test}", __FILE__)
+end

data/test/test_unique_memory.rb

@@ -1,12 +1,12 @@
-require_relative('./unique_tests')
-
-class UniqueMemoryTest < MiniTest::Test
-  include UniqueTests
-
-  def setup
-    ActiveJob::Locking::Adapters::Memory.reset
-    ActiveJob::Base.queue_adapter = :test
-    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
-    ActiveJob::Locking.options.adapter = ActiveJob::Locking::Adapters::Memory
-  end
-end
+require_relative('./unique_tests')
+
+class UniqueMemoryTest < MiniTest::Test
+  include UniqueTests
+
+  def setup
+    ActiveJob::Locking::Adapters::Memory.reset
+    ActiveJob::Base.queue_adapter = :test
+    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
+    ActiveJob::Locking.options.adapter = ActiveJob::Locking::Adapters::Memory
+  end
+end

data/test/test_unique_redis_semaphore.rb

@@ -1,12 +1,12 @@
-require_relative('./unique_tests')
-
-class UniqueRedisSemaphoreTest < MiniTest::Test
-  include UniqueTests
-
-  def setup
-    redis_reset
-    ActiveJob::Base.queue_adapter = :test
-    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
-    ActiveJob::Locking.options.adapter = ActiveJob::Locking::Adapters::RedisSemaphore
-  end
+require_relative('./unique_tests')
+
+class UniqueRedisSemaphoreTest < MiniTest::Test
+  include UniqueTests
+
+  def setup
+    redis_reset
+    ActiveJob::Base.queue_adapter = :test
+    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
+    ActiveJob::Locking.options.adapter = ActiveJob::Locking::Adapters::RedisSemaphore
+  end
 end

data/test/test_unique_redlock.rb

@@ -1,14 +1,14 @@
-require_relative('./unique_tests')
-
-class UniqueRedlockTest < MiniTest::Test
-  include UniqueTests
-
-  def setup
-    redis_reset
-
-    ActiveJob::Base.queue_adapter = :test
-    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
-    ActiveJob::Locking.options.adapter = ActiveJob::Locking::Adapters::Redlock
-    ActiveJob::Locking.options.hosts = Redlock::Client::DEFAULT_REDIS_URLS
-  end
+require_relative('./unique_tests')
+
+class UniqueRedlockTest < MiniTest::Test
+  include UniqueTests
+
+  def setup
+    redis_reset
+
+    ActiveJob::Base.queue_adapter = :test
+    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
+    ActiveJob::Locking.options.adapter = ActiveJob::Locking::Adapters::Redlock
+    ActiveJob::Locking.options.hosts = Redlock::Client::DEFAULT_REDIS_URLS
+  end
 end

data/test/test_unique_suo_redis.rb

@@ -1,12 +1,12 @@
-require_relative('./unique_tests')
-
-class UniqueSuoRedisTest < MiniTest::Test
-  include UniqueTests
-
-  def setup
-    redis_reset
-    ActiveJob::Base.queue_adapter = :test
-    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
-    ActiveJob::Locking.options.adapter = ActiveJob::Locking::Adapters::SuoRedis
-  end
+require_relative('./unique_tests')
+
+class UniqueSuoRedisTest < MiniTest::Test
+  include UniqueTests
+
+  def setup
+    redis_reset
+    ActiveJob::Base.queue_adapter = :test
+    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
+    ActiveJob::Locking.options.adapter = ActiveJob::Locking::Adapters::SuoRedis
+  end
 end

data/test/unique_tests.rb

@@ -1,100 +1,100 @@
-require File.expand_path('../test_helper', __FILE__)
-
-module UniqueTests
-  def test_none_performed
-    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = false
-
-    assert_equal(0, ActiveJob::Base.queue_adapter.enqueued_jobs.count)
-    assert_equal(0, ActiveJob::Base.queue_adapter.performed_jobs.count)
-
-    sleep_time = UniqueJob.lock_acquire_time
-    threads = 3.times.map do |i|
-      Thread.new do
-        UniqueJob.perform_later(i, sleep_time)
-      end
-    end
-
-    threads.each {|thread| thread.join}
-    assert_equal(1, ActiveJob::Base.queue_adapter.enqueued_jobs.count)
-    assert_equal(0, ActiveJob::Base.queue_adapter.performed_jobs.count)
-  ensure
-    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
-    ActiveJob::Base.queue_adapter.enqueued_jobs.clear
-  end
-
-  def test_one_performed
-    assert_equal(0, ActiveJob::Base.queue_adapter.enqueued_jobs.count)
-    assert_equal(0, ActiveJob::Base.queue_adapter.performed_jobs.count)
-
-    sleep_time = UniqueJob.lock_acquire_time * 2
-    threads = 3.times.map do |i|
-      Thread.new do
-        UniqueJob.perform_later(i, sleep_time)
-      end
-    end
-
-    threads.each {|thread| thread.join}
-    assert_equal(0, ActiveJob::Base.queue_adapter.enqueued_jobs.count)
-    assert_equal(1, ActiveJob::Base.queue_adapter.performed_jobs.count)
-  end
-
-  def test_all_performed
-    assert_equal(0, ActiveJob::Base.queue_adapter.enqueued_jobs.count)
-    assert_equal(0, ActiveJob::Base.queue_adapter.performed_jobs.count)
-
-    start_time = Time.now
-    sleep_time = UniqueJob.lock_acquire_time / 4.0
-    threads = 3.times.map do |i|
-      Thread.new do
-        UniqueJob.perform_later(i, sleep_time)
-      end
-    end
-
-    threads.each {|thread| thread.join}
-
-    assert_equal(0, ActiveJob::Base.queue_adapter.enqueued_jobs.count)
-    assert_equal(threads.count, ActiveJob::Base.queue_adapter.performed_jobs.count)
-    assert(Time.now - start_time > (threads.count * sleep_time))
-  end
-
-  def test_some_performed
-    assert_equal(0, ActiveJob::Base.queue_adapter.enqueued_jobs.count)
-    assert_equal(0, ActiveJob::Base.queue_adapter.performed_jobs.count)
-
-    start_time = Time.now
-    sleep_time = UniqueJob.lock_acquire_time / 2.0
-    threads = 3.times.map do |i|
-      Thread.new do
-        UniqueJob.perform_later(i, sleep_time)
-      end
-    end
-
-    threads.each {|thread| thread.join}
-
-    assert_equal(0, ActiveJob::Base.queue_adapter.enqueued_jobs.count)
-    assert_equal(threads.count - 1, ActiveJob::Base.queue_adapter.performed_jobs.count)
-    assert(Time.now - start_time > ((threads.count - 1) * sleep_time))
-  end
-
-  def test_fail
-    assert_equal(0, ActiveJob::Base.queue_adapter.enqueued_jobs.count)
-    assert_equal(0, ActiveJob::Base.queue_adapter.performed_jobs.count)
-
-    start_time = Time.now
-    sleep_time = UniqueJob.lock_acquire_time
-    threads = 3.times.map do |i|
-      Thread.new do
-        begin
-          FailJob.perform_later(i, sleep_time)
-        rescue => e
-          # do nothing
-        end
-      end
-    end
-
-    threads.each {|thread| thread.join}
-
-    assert_equal(0, ActiveJob::Base.queue_adapter.enqueued_jobs.count)
-    assert_equal(threads.count, ActiveJob::Base.queue_adapter.performed_jobs.count)
-  end
+require File.expand_path('../test_helper', __FILE__)
+
+module UniqueTests
+  def test_none_performed
+    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = false
+
+    assert_equal(0, ActiveJob::Base.queue_adapter.enqueued_jobs.count)
+    assert_equal(0, ActiveJob::Base.queue_adapter.performed_jobs.count)
+
+    sleep_time = UniqueJob.lock_acquire_time
+    threads = 3.times.map do |i|
+      Thread.new do
+        UniqueJob.perform_later(i, sleep_time)
+      end
+    end
+
+    threads.each {|thread| thread.join}
+    assert_equal(1, ActiveJob::Base.queue_adapter.enqueued_jobs.count)
+    assert_equal(0, ActiveJob::Base.queue_adapter.performed_jobs.count)
+  ensure
+    ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
+    ActiveJob::Base.queue_adapter.enqueued_jobs.clear
+  end
+
+  def test_one_performed
+    assert_equal(0, ActiveJob::Base.queue_adapter.enqueued_jobs.count)
+    assert_equal(0, ActiveJob::Base.queue_adapter.performed_jobs.count)
+
+    sleep_time = UniqueJob.lock_acquire_time * 2
+    threads = 3.times.map do |i|
+      Thread.new do
+        UniqueJob.perform_later(i, sleep_time)
+      end
+    end
+
+    threads.each {|thread| thread.join}
+    assert_equal(0, ActiveJob::Base.queue_adapter.enqueued_jobs.count)
+    assert_equal(1, ActiveJob::Base.queue_adapter.performed_jobs.count)
+  end
+
+  def test_all_performed
+    assert_equal(0, ActiveJob::Base.queue_adapter.enqueued_jobs.count)
+    assert_equal(0, ActiveJob::Base.queue_adapter.performed_jobs.count)
+
+    start_time = Time.now
+    sleep_time = UniqueJob.lock_acquire_time / 4.0
+    threads = 3.times.map do |i|
+      Thread.new do
+        UniqueJob.perform_later(i, sleep_time)
+      end
+    end
+
+    threads.each {|thread| thread.join}
+
+    assert_equal(0, ActiveJob::Base.queue_adapter.enqueued_jobs.count)
+    assert_equal(threads.count, ActiveJob::Base.queue_adapter.performed_jobs.count)
+    assert(Time.now - start_time > (threads.count * sleep_time))
+  end
+
+  def test_some_performed
+    assert_equal(0, ActiveJob::Base.queue_adapter.enqueued_jobs.count)
+    assert_equal(0, ActiveJob::Base.queue_adapter.performed_jobs.count)
+
+    start_time = Time.now
+    sleep_time = UniqueJob.lock_acquire_time / 2.0
+    threads = 3.times.map do |i|
+      Thread.new do
+        UniqueJob.perform_later(i, sleep_time)
+      end
+    end
+
+    threads.each {|thread| thread.join}
+
+    assert_equal(0, ActiveJob::Base.queue_adapter.enqueued_jobs.count)
+    assert_equal(threads.count - 1, ActiveJob::Base.queue_adapter.performed_jobs.count)
+    assert(Time.now - start_time > ((threads.count - 1) * sleep_time))
+  end
+
+  def test_fail
+    assert_equal(0, ActiveJob::Base.queue_adapter.enqueued_jobs.count)
+    assert_equal(0, ActiveJob::Base.queue_adapter.performed_jobs.count)
+
+    start_time = Time.now
+    sleep_time = UniqueJob.lock_acquire_time
+    threads = 3.times.map do |i|
+      Thread.new do
+        begin
+          FailJob.perform_later(i, sleep_time)
+        rescue => e
+          # do nothing
+        end
+      end
+    end
+
+    threads.each {|thread| thread.join}
+
+    assert_equal(0, ActiveJob::Base.queue_adapter.enqueued_jobs.count)
+    assert_equal(threads.count, ActiveJob::Base.queue_adapter.performed_jobs.count)
+  end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: activejob-locking
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2020-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.10.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.10.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis-mutex
   requirement: !ruby/object:Gem::Requirement
@@ -153,8 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ActiveJob locking to control how jobs are enqueued and performed.