caffeinate 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebd5c45c4d4fd056ba4ff2080a464e2151bc3245849c709d9f81d396c4b36523
-  data.tar.gz: 0ed91aa4d77c8b368fadc721ffdd81bdd70a249cebe077fadcd2161b6ebf6dab
+  metadata.gz: 95fdb8a2737308443cbaea5cd679815501c8eef5b28a195a5922912436193b4c
+  data.tar.gz: 7d30e96bb9dedc5c5230c67435bc0a3967da9dd1a117c995b828f0ce5cc1c10c
 SHA512:
-  metadata.gz: 0dc2f09d245f8936bf55ab0c00d8a4cd4b8651db10f9656a66869088297c43c694b1c71356421216d59a27376fac89962bb8dbd02dfd7d648e65578f2cfb1900
-  data.tar.gz: 3554585afc00fc341c8627ee67071c02ca8f60092f96545043c4c06447a4c6c0ae37e3292cda9293047670471c7b16843dfa3a5b04b4b215ea93562d7050d22b
+  metadata.gz: 621b74af22e92674652545c490eb46a1ff26d936f2786741eed4afd11f596d5c21fcf391d80db271d2d99851a0d12bae13571b30315f2e43a1d24f1b9f07f878
+  data.tar.gz: ab7c14a44591695c6c76c038ee98e366c81e6b7cb3ab63435145b800174b26fae6cc155a8d27379a75e774b5f3b564679119ea9ca5ae41d640af806aaa9696f8

data/lib/caffeinate/drip.rb

@@ -25,6 +25,8 @@ module Caffeinate
         start = mailing.instance_exec(&options[:start])
         start += options[:every] if mailing.caffeinate_campaign_subscription.caffeinate_mailings.count.positive?
         date = start.from_now
+      elsif options[:on]
+        date = mailing.instance_exec(&options[:on])
       else
         date = options[:delay].from_now
       end

data/lib/caffeinate/dripper/drip_collection.rb

@@ -42,7 +42,7 @@ module Caffeinate
 
       def validate_drip_options(action, options)
         options.symbolize_keys!
-        options.assert_valid_keys(:mailer_class, :step, :delay, :every, :start, :using, :mailer, :at)
+        options.assert_valid_keys(:mailer_class, :step, :delay, :every, :start, :using, :mailer, :at, :on)
         options[:mailer_class] ||= options[:mailer] || @dripper.defaults[:mailer_class]
         options[:using] ||= @dripper.defaults[:using]
         options[:step] ||= @dripper.drips.size + 1
@@ -51,8 +51,8 @@ module Caffeinate
           raise ArgumentError, "You must define :mailer_class or :mailer in the options for #{action.inspect} on #{@dripper.inspect}"
         end
 
-        if options[:every].nil? && options[:delay].nil?
-          raise ArgumentError, "You must define :delay in the options for #{action.inspect} on #{@dripper.inspect}"
+        if options[:every].nil? && options[:delay].nil? && options[:on].nil?
+          raise ArgumentError, "You must define :delay or :on or :every in the options for #{action.inspect} on #{@dripper.inspect}"
         end
 
         options

data/lib/caffeinate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Caffeinate
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caffeinate
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Josh Brody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-15 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails