inst-jobs 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6319beb67c1232acefb48870136662c958970b22
-  data.tar.gz: 0f4051eda72fa6fe638924b62a35ab6ff7714595
+  metadata.gz: 17372b30ae01ad83a1a94d8fe5e3bcb38ad91155
+  data.tar.gz: 2104ebf5b0f2518dcbb6cded76454455df39aff4
 SHA512:
-  metadata.gz: 8b69032f63bac4ef84c16812eab90e9ae7cea727545c4cdf3d276bd726715b7f7725f2f22d51e469a3d94815252147bc31263bda9ce9b085344ac63cbd956d06
-  data.tar.gz: beda3ba76d7e9314e19464a263ea2a05fdc66866c1672e8049c50e7c7402b38c0ccb1e9272041badf6ea4f7a06d8a789f33b2475037347c05237bdb8932d91fa
+  metadata.gz: ad3bd5d9ff71acc4a012d8cdd1cfddd590719404f0774be0f25c98bcd97b2f477a263c378f187b8ec1b017a4d6876f4f55e165810734a56b395829dc210e8e8e
+  data.tar.gz: 5b14d39f433a8640d1636ccdbd74359679a8d71855a76f602ded2a73ffb2b3c9ab2820ded05b37a635a4afa532052304a6e50a35d4ea63f0cca8e3bff8caad88

data/lib/delayed/backend/active_record.rb

@@ -212,7 +212,9 @@ module Delayed
               batch_size *= worker_names.length if worker_names.is_a?(Array)
               find_available(batch_size, queue, min_priority, max_priority)
             end
-            return nil if jobs.empty?
+            if jobs.empty?
+              return worker_names.is_a?(Array) ? {} : nil
+            end
             if Settings.select_random_from_batch
               jobs = jobs.sort_by { rand }
             end

data/lib/delayed/backend/redis/job.rb

@@ -234,7 +234,13 @@ class Job
     # rather than just a job id, saving a round trip
     job_attrs = functions.get_and_lock_next_available(worker_name, queue, min_priority, max_priority, db_time_now)
     job = instantiate_from_attrs(job_attrs) # will return nil if the attrs are blank
-    job = { worker_name => job } if multiple_workers
+    if multiple_workers
+      if job.nil?
+        job = {}
+      else
+        job = { worker_name => job }
+      end
+    end
     job
   end
 

data/lib/delayed/version.rb

@@ -1,3 +1,3 @@
 module Delayed
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

data/spec/shared/shared_backend.rb

@@ -110,6 +110,11 @@ shared_examples_for 'a backend' do
       @job = create_job
       Delayed::Job.find_available(5).should include(@job)
     end
+
+    it "returns an empty hash when asking for multiple jobs, and there aren't any" do
+      locked_jobs = Delayed::Job.get_and_lock_next_available(['worker1', 'worker2'])
+      locked_jobs.should == {}
+    end
   end
 
   context "when another worker is already performing an task, it" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Tobias Luetke