caffeinate 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f6b38c582c7ac99605a366b1217a973ebea58dad20cc60e4dd4a0f555da7474
-  data.tar.gz: a975e28f6386905c9e776cf2cc1dcb835054f0200d91fce9554d5c1f4bcdfd9b
+  metadata.gz: 80e462cd99749a8f1352d481fec74d6a053a1660d200888a93844205eafb984c
+  data.tar.gz: 1c709353c202c7a97eb2fd8067f31ee40ee2753d93f8771232494867d47ce9c0
 SHA512:
-  metadata.gz: dd713236a833425f2a17d8c455fadaec49ba60bf17083c4bd879aa343611d30793e6aaef0e70db5e6cae3e760beec69ea41bdb2e38881ec2ecaabdb00c9c28a7
-  data.tar.gz: 935e59b886250e6b216535f236241221f313eefe304b9a588f0c42384d0236335e8da0fef7f71421dd80bef4e3fd114729153766c1d52bc95f4c760d681ba2c9
+  metadata.gz: 9d4261e176299efc975f8d11791c95a58740bd94eaa6ae2e931fb262240f9e24a27cc1c88230965386ff4658e037dcbeb00ebf2100399d077872be0196e3ba8c
+  data.tar.gz: 208bc056825501459d0247e4fa91f64b3d9c4408f8219d7f47aa6dd492e9b183e614adeb97b5746f3e9c686d31aa38035667cc003142c93417f1d6cb8935b906

data/app/models/caffeinate/campaign_subscription.rb

@@ -28,8 +28,9 @@ module Caffeinate
 
     has_many :caffeinate_mailings, class_name: 'Caffeinate::Mailing', foreign_key: :caffeinate_campaign_subscription_id, dependent: :destroy
     has_many :mailings, class_name: 'Caffeinate::Mailing', foreign_key: :caffeinate_campaign_subscription_id, dependent: :destroy
+    has_many :future_mailings, -> { upcoming.unsent }, class_name: '::Caffeinate::Mailing', foreign_key: :caffeinate_campaign_subscription_id
 
-    has_one :next_caffeinate_mailing, -> { upcoming.unsent.order(send_at: :asc) }, class_name: '::Caffeinate::Mailing', foreign_key: :caffeinate_campaign_subscription_id
+    has_one :next_caffeinate_mailing, -> { joins(:caffeinate_campaign_subscription).where(caffeinate_campaign_subscriptions: { ended_at: nil, unsubscribed_at: nil }).upcoming.unsent.order(send_at: :asc) }, class_name: '::Caffeinate::Mailing', foreign_key: :caffeinate_campaign_subscription_id
     has_one :next_mailing, -> { joins(:caffeinate_campaign_subscription).where(caffeinate_campaign_subscriptions: { ended_at: nil, unsubscribed_at: nil }).upcoming.unsent.order(send_at: :asc) }, class_name: '::Caffeinate::Mailing', foreign_key: :caffeinate_campaign_subscription_id
 
     belongs_to :caffeinate_campaign, class_name: 'Caffeinate::Campaign', foreign_key: :caffeinate_campaign_id
@@ -49,6 +50,8 @@ module Caffeinate
     before_validation :set_token!, on: [:create]
     validates :token, uniqueness: true, on: [:create]
 
+    before_validation :call_dripper_before_subscribe_blocks!, on: :create
+
     after_commit :create_mailings!, on: :create
 
     after_commit :on_complete, if: :completed?
@@ -143,6 +146,10 @@ module Caffeinate
 
     private
 
+    def call_dripper_before_subscribe_blocks!
+      caffeinate_campaign.to_dripper.run_callbacks(:before_subscribe, self)
+    end
+
     def on_complete
       caffeinate_campaign.to_dripper.run_callbacks(:on_complete, self)
     end

data/app/models/caffeinate/mailing.rb

@@ -30,6 +30,8 @@ module Caffeinate
     scope :skipped, -> { where.not(skipped_at: nil) }
     scope :unskipped, -> { where(skipped_at: nil) }
 
+    after_touch :end_if_no_mailings!
+
     def initialize_dup(args)
       super
       self.send_at = nil
@@ -119,5 +121,9 @@ module Caffeinate
         raise NoMethodError, "Neither perform_later or perform_async are defined on #{klass}."
       end
     end
+
+    def end_if_no_mailings!
+      end! if future_mailings.empty?
+    end
   end
 end

data/lib/caffeinate/drip.rb

@@ -6,6 +6,26 @@ module Caffeinate
   #
   # Handles the block and provides convenience methods for the drip
   class Drip
+    class OptionEvaluator
+      def initialize(thing, drip, mailing)
+        @thing = thing
+        @drip = drip
+        @mailing = mailing
+      end
+
+      def call
+        if @thing.is_a?(Symbol)
+          @drip.dripper.new.send(@thing, @drip, @mailing)
+        elsif @thing.is_a?(Proc)
+          @mailing.instance_exec(&@thing)
+        elsif @thing.is_a?(String)
+          Time.parse(@thing)
+        else
+          @thing
+        end
+      end
+    end
+
     attr_reader :dripper, :action, :options, :block
 
     def initialize(dripper, action, options, &block)
@@ -26,13 +46,16 @@ module Caffeinate
         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])
+        date = OptionEvaluator.new(options[:on], self, mailing).call
       else
-        date = options[:delay].from_now
+        date = OptionEvaluator.new(options[:delay], self, mailing).call
+        if date.respond_to?(:from_now)
+          date = date.from_now
+        end
       end
 
       if options[:at]
-        time = Time.parse(options[:at])
+        time = OptionEvaluator.new(options[:at], self, mailing).call
         return date.change(hour: time.hour, min: time.min, sec: time.sec)
       end
 

data/lib/caffeinate/dripper/callbacks.rb

@@ -21,6 +21,14 @@ module Caffeinate
           end
         end
 
+        def before_subscribe(&block)
+          before_subscribe_blocks << block
+        end
+
+        def before_subscribe_blocks
+          @before_subscribe_blocks ||= []
+        end
+
         # Callback after a Caffeinate::CampaignSubscription is created, and after the Caffeinate::Mailings have
         # been created.
         #

data/lib/caffeinate/dripper/perform.rb

@@ -16,11 +16,7 @@ module Caffeinate
       # @return nil
       def perform!
         run_callbacks(:before_perform, self)
-        Caffeinate::Mailing
-          .upcoming
-          .unsent
-          .joins(:caffeinate_campaign_subscription)
-          .merge(Caffeinate::CampaignSubscription.active.where(caffeinate_campaign: self.campaign))
+        self.class.upcoming_mailings
           .in_batches(of: self.class.batch_size)
           .each do |batch|
           run_callbacks(:on_perform, self, batch)
@@ -35,6 +31,14 @@ module Caffeinate
         def perform!
           new.perform!
         end
+
+        def upcoming_mailings
+          Caffeinate::Mailing
+              .upcoming
+              .unsent
+              .joins(:caffeinate_campaign_subscription)
+              .merge(Caffeinate::CampaignSubscription.active.where(caffeinate_campaign: campaign))
+        end
       end
     end
   end

data/lib/caffeinate/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caffeinate
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Josh Brody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-26 00:00:00.000000000 Z
+date: 2021-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails