resque-integration 3.8.0 → 3.8.2

data/lib/resque/integration/unique.rb

@@ -144,7 +144,7 @@ module Resque
 
       # When job is dequeued we should remove lock
       def after_dequeue_lock(_meta_id, *args)
-        unlock(*args) unless args.empty?
+        unlock(*args)
       end
 
       # Fail metadata if dequeue succeed
@@ -165,12 +165,12 @@ module Resque
       end
 
       # Returns true if resque job is in locked state
-      #
-      # Returns Boolean
       def locked?(*args)
-        redis = ::Resque.redis
-
-        redis.respond_to?(:exists?) ? redis.exists?(lock_id(*args)) : redis.exists(lock_id(*args))
+        if Gem::Version.new(Redis::VERSION) < Gem::Version.new('4.3')
+          ::Resque.redis.exists(lock_id(*args))
+        else
+          ::Resque.redis.exists?(lock_id(*args))
+        end
       end
 
       # Dequeue unique job

data/lib/resque/integration/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module Integration
-    VERSION = '3.8.0'.freeze
+    VERSION = '3.8.2'.freeze
   end
 end

data/resque-integration.gemspec

@@ -28,8 +28,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'multi_json'
   gem.add_runtime_dependency 'rake'
 
-  gem.add_runtime_dependency 'redis'
-
   gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'rspec', '~> 2.14'
   gem.add_development_dependency 'rspec-its'

data/spec/resque/integration/unique_spec.rb

@@ -88,7 +88,7 @@ describe Resque::Integration::Unique, '#dequeue' do
 
     @queue = :queue2
 
-    def self.execute(x)
+    def self.execute(*params)
       sleep 0.1
     end
   end
@@ -105,14 +105,24 @@ describe Resque::Integration::Unique, '#dequeue' do
     meta.should be_failed
   end
 
+  it 'dequeues and unlocks job without args if job is not in work now' do
+    JobDequeueTest.enqueue
+    JobDequeueTest.should be_enqueued
+
+    JobDequeueTest.dequeue
+    JobDequeueTest.should_not be_enqueued
+    JobDequeueTest.should_not be_locked
+
+    meta = JobDequeueTest.get_meta(JobDequeueTest.meta_id)
+    meta.should be_failed
+  end
+
   it 'does not dequeue jobs in progress' do
     meta = JobDequeueTest.enqueue(1)
 
     job = Resque.reserve(:queue2)
 
-    worker = Thread.new {
-      job.perform
-    }
+    worker = Thread.new { job.perform }
 
     sleep 0.01 # give a worker some time to start
     meta.reload!
@@ -124,6 +134,24 @@ describe Resque::Integration::Unique, '#dequeue' do
 
     worker.join
   end
+
+  it 'does not dequeue jobs without args in progress' do
+    meta = JobDequeueTest.enqueue
+
+    job = Resque.reserve(:queue2)
+
+    worker = Thread.new { job.perform }
+
+    sleep 0.01 # give a worker some time to start
+    meta.reload!
+    meta.should be_working
+
+    JobDequeueTest.dequeue
+    JobDequeueTest.should be_locked
+    JobDequeueTest.should be_enqueued
+
+    worker.join
+  end
 end
 
 describe Resque::Integration::Unique, '#on_failure_retry' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-integration
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.8.2
 platform: ruby
 authors:
 - Alexei Mikhailov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2024-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -165,20 +165,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -306,6 +292,7 @@ files:
 - Appraisals
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - app/assets/javascripts/standalone/progress_bar.js
@@ -320,6 +307,14 @@ files:
 - docker-compose.development.yml
 - docker-compose.drone.yml
 - docker-compose.yml
+- gemfiles/rails4.2.gemfile
+- gemfiles/rails4.2.gemfile.lock
+- gemfiles/rails5.0.gemfile
+- gemfiles/rails5.0.gemfile.lock
+- gemfiles/rails5.1.gemfile
+- gemfiles/rails5.1.gemfile.lock
+- gemfiles/rails5.2.gemfile
+- gemfiles/rails5.2.gemfile.lock
 - lib/generators/resque/integration/install/install_generator.rb
 - lib/resque-integration.rb
 - lib/resque/integration.rb
@@ -386,8 +381,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Seamless integration of resque with resque-progress and resque-lock