crono_trigger 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f57e39321ff772c9fc7a02d4d63d19e991be0eb
-  data.tar.gz: 72949a4a2b1984e90ff27c0acc0f5fc74818a947
+  metadata.gz: efcd9ba0f357498e090d327a1b9ef3af54437501
+  data.tar.gz: ca3c3b5c144479f64c8cb6e39ea2904da63b8e2d
 SHA512:
-  metadata.gz: f537b832ef60d83e107946134f6d112d104e984cb6432ed3fcd9da2f95c38ca800c100bef471d8473f398fe18fab3cf2f21db000f921c0d7f9928a72dfa87a09
-  data.tar.gz: f3268eabf16acfeb54aa39246d0315cc1c01f0668f7674d2f3b6e03607f41984a37d0ba0bd0dc51c33cd5d41b4dc3756df891e6179bd5604ff9243b3dcb944b5
+  metadata.gz: 2ec6528498231a77d1a2b255e1cf04fe43ed0a035dac4009a3b8cdc099acb28d8a16663b0a793fe3aa27de9d5091c86dd3bdbaed9e9f77e01c1cd674da02a2a2
+  data.tar.gz: c0a0edce5e9601db48f9585bb88cd964a06bb81458bbce1d83f601a7d916247c5f4c60b3528de0ba434e8c12a53de0b889834016c6c36d4d785a4d86cb78f4d9

data/README.md

@@ -93,6 +93,23 @@ class MailNotification < ActiveRecord::Base
     throw :ok_without_reset    # break execution and handle task as success but without schedule reseting and unlocking
   end
 end
+
+# one time schedule
+MailNotification.create(next_execute_at: Time.current.since(5.minutes))
+
+# cron schedule
+MailNotification.create(cron: "0 12 * * *").activate_schedule!
+# or
+MailNotification.new(cron: "0 12 * * *").activate_schedule!.save
+
+# if update cron column or timezone column
+# update next_execute_at automatically by before_update callback
+mail = MailNotification.create(cron: "0 12 * * *").activate_schedule!
+mail.next_execute_at # => next 12:00 with Time.zone
+mail.update(cron: "0 13 * * *")
+mail.next_execute_at # => next 13:00 with Time.zone
+mail.update(timezone: "Asia/Tokyo")
+mail.next_execute_at # => next 13:00 with Asia/Japan
 ```
 
 #### Run Worker
@@ -137,6 +154,10 @@ Usage: crono_trigger [options] MODEL [MODEL..]
 You can rename some columns.
 ex. `crono_trigger_options[:next_execute_at_column_name] = "next_time"`
 
+## Rollbar integration
+This gem has rollbar plugin.
+If `crono_trigger/rollbar` is required, Add Rollbar logging process to `CronoTrigger.config.error_handlers`
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/crono_trigger/schedulable.rb

@@ -46,7 +46,9 @@ module CronoTrigger
         rel
       end
 
-      before_create :ensure_next_execute_at
+      before_update :update_next_execute_at_if_update_cron
+
+      validate :validate_cron_format
     end
 
     module ClassMethods
@@ -109,6 +111,18 @@ module CronoTrigger
       raise
     end
 
+    def activate_schedule!(at: Time.current)
+      time = calculate_next_execute_at || at
+
+      if new_record?
+        self[crono_trigger_column_name(:next_execute_at)] ||= time
+      else
+        unless self[crono_trigger_column_name(:next_execute_at)]
+          update_column(crono_trigger_column_name(:next_execute_at), time)
+        end
+      end
+    end
+
     def retry!
       logger.info "Retry #{self.class}-#{id}" if logger
 
@@ -171,13 +185,29 @@ module CronoTrigger
     def calculate_next_execute_at(now = Time.current)
       if self[crono_trigger_column_name(:cron)]
         tz = self[crono_trigger_column_name(:timezone)].try { |zn| TZInfo::Timezone.get(zn) }
-        now = tz ? now.in_time_zone(tz) : now
-        Chrono::NextTime.new(now: now, source: self[crono_trigger_column_name(:cron)]).to_time
+        base = [now, self[crono_trigger_column_name(:started_at)]].max
+        cron_now = tz ? base.in_time_zone(tz) : base
+        Chrono::NextTime.new(now: cron_now, source: self[crono_trigger_column_name(:cron)]).to_time
+      end
+    end
+
+    def update_next_execute_at_if_update_cron
+      if changes[crono_trigger_column_name(:cron)] || changes[crono_trigger_column_name(:timezone)]
+        if self[crono_trigger_column_name(:cron)]
+          self[crono_trigger_column_name(:next_execute_at)] = calculate_next_execute_at
+        end
       end
     end
 
-    def ensure_next_execute_at
-      self[crono_trigger_column_name(:next_execute_at)] ||= calculate_next_execute_at || Time.current
+    def validate_cron_format
+      return unless self[crono_trigger_column_name(:cron)]
+
+      Chrono::NextTime.new(now: Time.current, source: self[crono_trigger_column_name(:cron)]).to_time
+    rescue Chrono::Fields::Base::InvalidField
+      self.errors.add(
+        crono_trigger_column_name(:cron).to_sym,
+        crono_trigger_options["invalid_field_error_message"] || "has invalid field"
+      )
     end
 
     def retry_limit

data/lib/crono_trigger/version.rb

@@ -1,3 +1,3 @@
 module CronoTrigger
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crono_trigger
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2017-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chrono