rocketjob 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c487cc0cf7d030acbd18c74a651fee0b559d77fa
-  data.tar.gz: 24a88f78d955288148a8f89e0dd72fa892dddbd6
+  metadata.gz: 69c06ffc4a4e337c787f06d36873d763ccced1be
+  data.tar.gz: 401c2bda273c7413b0ceda2853aef6c325b15159
 SHA512:
-  metadata.gz: 061a09fbc865798f63089a438d061db0383f3abfaa1c00cfc78daa3715fa5e16fcef57dd8def16b5549f8b4e0de5e5e8288aeeefa29e4b6bac53e45f0b6febfc
-  data.tar.gz: 587f8186e73d7f1bbbcc80a3b3049cf2eabfd69c9f034ae45a68704a7bb1f51400d13e2990fc7291760949a11e021d47d8fb855e0b295341acb2176649b34614
+  metadata.gz: 87d8f78b0e766a6d1ab06efb00ff83a3b7b27ade12d11109630f01bed3a753ba8f1fe6241d198209870657ee2e6256d5f6c6ba49293c21ad6dc305c85cc4835e
+  data.tar.gz: d87017700e5fb67815b6ce934b73a683d4c08d96ed04e5f802e58ced4a4aa28b2c67be371258c6f643edb6444f90d66e57f0dc1d698b7398dd199bb80eb1d4c6

data/lib/rocket_job/plugins/restart.rb

@@ -17,10 +17,11 @@ module RocketJob
     module Restart
       extend ActiveSupport::Concern
 
-      # Attributes to exclude when copying across the attributes to the new instance
-      RESTART_EXCLUDES = %w(_id state created_at started_at completed_at failure_count worker_name percent_complete exception result run_at record_count sub_state)
-
       included do
+        # Attributes to exclude when copying across the attributes to the new instance
+        class_attribute :rocket_job_restart_excludes
+        self.rocket_job_restart_excludes = %w(_id state created_at started_at completed_at failure_count worker_name percent_complete exception result run_at record_count sub_state)
+
         after_abort :rocket_job_restart_new_instance
         after_complete :rocket_job_restart_new_instance
         after_fail :rocket_job_restart_abort
@@ -32,7 +33,7 @@ module RocketJob
       def rocket_job_restart_new_instance
         return if expired?
         attrs = attributes.dup
-        RESTART_EXCLUDES.each { |attr| attrs.delete(attr) }
+        rocket_job_restart_excludes.each { |attr| attrs.delete(attr) }
 
         # Copy across run_at for future dated jobs
         attrs['run_at'] = run_at if run_at && (run_at > Time.now)

data/lib/rocket_job/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module RocketJob #:nodoc
-  VERSION = '2.1.2'
+  VERSION = '2.1.3'
 end

data/test/plugins/restart_test.rb

@@ -6,7 +6,15 @@ module Plugins
     class RestartableJob < RocketJob::Job
       include RocketJob::Plugins::Restart
 
+      # Ensure a new start_at and end_at is generated every time this job is restarted
+      self.rocket_job_restart_excludes = self.rocket_job_restart_excludes + %w(start_at end_at)
+
+      key :start_at, Date
+      key :end_at, Date
+
       def perform
+        self.start_at = Date.today
+        self.end_at   = Date.today
         'DONE'
       end
     end
@@ -147,11 +155,14 @@ module Plugins
           assert job2.queued?, job2.attributes.ai
 
           # Copy across all attributes, except
-          @job.attributes.each_pair do |key, value|
-            next if RocketJob::Plugins::Restart::RESTART_EXCLUDES.include?(key)
+          job2.attributes.each_pair do |key, value|
+            refute_equal 'start_at', key, "Should not include start_at in retried job. #{job2.attributes.inspect}"
+            next if RestartableJob.rocket_job_restart_excludes.include?(key)
             assert_equal value, job2[key], "Attributes are supposed to be copied across. For #{key}"
           end
 
+          assert_equal nil, job2.start_at
+          assert_equal nil, job2.end_at
           assert_equal :queued, job2.state
           assert job2.created_at
           assert_equal nil, job2.started_at

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby