rocketjob 3.3.3 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 296d6077572bea816bb7b5823df1bab3f4291b42
-  data.tar.gz: 593b8a806b15fc01903818b7eeb003d3d54effb3
+  metadata.gz: d6c4cf70983793dd982cefbc5b58b7ae33d6b8f1
+  data.tar.gz: 2c593219205c7ff16dbd02dce31c57b8c67dcfa9
 SHA512:
-  metadata.gz: 443c33e173c47eb83b916c9e9c1592551989996bdf116f8b53f0f2f811540cf712c2eb6815cf843742102705f6b6c645991db8b1f2675cfb02b1bd7203e4343d
-  data.tar.gz: 9234139d37b517607de16d2a6a3fb553be22f7fec2dc633b40f69df1022f24f7141c0053740f6677a84804ecdd2b80acc94a3e83072d4cdf9309d9125a72c3d4
+  metadata.gz: 6dd940e8008cc81dd36085bc12f705c87a12a348e1edf29c3dbf34c1b6000bcfaf3ed085505968c35f94072f862cd13f524371836b5fe0eb7b0697da7181ca47
+  data.tar.gz: b2e616a1ef53886ea4a5c2fef6c097d3fc640ce9a71971f1ebdb9ee4d1fc1bcd57372773af8e81003d873b4e30eb2497c2708755067b51d3994d8d74104cc288

data/lib/rocket_job/plugins/cron.rb

@@ -32,6 +32,8 @@ module RocketJob
     # - The job will not be restarted if:
     #   - A validation fails after cloning this job.
     #   - The job has expired.
+    # - Any time the `cron_schedule` is changed, the `run_at` is automatically set before saving the changes.
+    #   - However, if the `run_at` is explicitly set then it will not be overriden.
     #
     # Example:
     #
@@ -102,7 +104,7 @@ module RocketJob
 
         field :cron_schedule, type: String, class_attribute: true, user_editable: true, copy_on_restart: true
 
-        before_create :rocket_job_set_run_at
+        before_save :rocket_job_set_run_at
 
         validates_presence_of :cron_schedule
         validates_each :cron_schedule do |record, attr, value|
@@ -114,10 +116,20 @@ module RocketJob
         end
       end
 
+      # Returns [Time] the next time this job will be scheduled to run at.
+      #
+      # Parameters
+      #   time: [Time]
+      #     The next time as of this time.
+      #     Default: Time.now
+      def rocket_job_cron_next_time(time = Time.now)
+        RocketJob::Plugins::Rufus::CronLine.new(cron_schedule).next_time(time)
+      end
+
       private
 
       def rocket_job_set_run_at
-        self.run_at = RocketJob::Plugins::Rufus::CronLine.new(cron_schedule).next_time
+        self.run_at = rocket_job_cron_next_time if cron_schedule_changed? && !run_at_changed?
       end
 
     end

data/lib/rocket_job/version.rb

@@ -1,3 +1,3 @@
 module RocketJob #:nodoc
-  VERSION = '3.3.3'
+  VERSION = '3.3.4'
 end

data/test/plugins/cron_test.rb

@@ -54,6 +54,22 @@ module Plugins
 
       end
 
+      describe '#save' do
+        it 'updates run_at for a new record' do
+          @job = CronJob.create!(cron_schedule: '* 1 * * *')
+          assert @job.run_at
+        end
+
+        it 'updates run_at for a modified record' do
+          @job = CronJob.create!(cron_schedule: '* 1 * * * UTC')
+          assert run_at = @job.run_at
+          @job.cron_schedule = '* 2 * * * UTC'
+          assert_equal run_at, @job.run_at
+          @job.save!
+          assert run_at < @job.run_at
+        end
+      end
+
       describe '#valid?' do
         it 'fails on missing cron schedule' do
           @job = CronJob.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.4
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby