job_boss 0.7.10 → 0.7.11

data/job_boss.gemspec

@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "job_boss"
-  s.version     = '0.7.10'
+  s.version     = '0.7.11'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Brian Underwood"]
   s.email       = ["ml+job_boss@semi-sentient.com"]

data/lib/job_boss/job.rb

@@ -199,8 +199,7 @@ module JobBoss
       # Returns a hash where the keys are the job method arguments and the values are the
       # results of the job processing
       def result_hash(jobs = nil)
-        jobs = [jobs] if jobs.is_a?(Job)
-        jobs = self.scoped if jobs.nil?
+        get_jobs(jobs)
 
         # the #result method automatically reloads the result here if needed but this will
         # do it in one SQL call
@@ -213,17 +212,23 @@ module JobBoss
       end
 
       def cancelled?(jobs = nil)
-        if jobs
-          count = Job.where('id in (?)', jobs).where('cancelled_at IS NULL').count
+        get_jobs(jobs)
 
-          !(count > 0)
-        end
+        count = self.where('cancelled_at IS NULL').count
+
+        !(count > 0)
       end
 
       def cancel(jobs = nil)
-        if jobs
-          jobs.each(&:cancel)
-        end
+        get_jobs(jobs)
+
+        self.all.each(&:cancel)
+      end
+
+      def get_jobs(jobs)
+        jobs = [jobs] if jobs.is_a?(Job)
+        jobs = self.scoped if jobs.nil?
+        jobs
       end
 
       # Given a time object

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: job_boss
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 7
-  - 10
-  version: 0.7.10
+  - 11
+  version: 0.7.11
 platform: ruby
 authors: 
 - Brian Underwood