caffeinate 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99e1c4493c6e9c0a024a789e5ee16383afe64fa73b6263ee2482dcace8038703
-  data.tar.gz: 9d49f256a79051ad3264de0444843dd5dc5c4bf8cf74fd77021709728f9dc8b4
+  metadata.gz: 6ee66cd0cefbff81f194970176755cde5fe49ccc8acd9307f3081bc13f71bd2f
+  data.tar.gz: 25380078f2edd4c8ccb7fdd4adc5903a783ce1f123ea59981def0bf5ee08698c
 SHA512:
-  metadata.gz: 76f7ed8231cfc694d020edc3432e064bed577aad92fbc7e0bd3e5bed9b9d93a10b3b7d5650fbd72a10911dff29484aa19dfdfa64c2971fb8b47f7d0ef8312402
-  data.tar.gz: 668b441c7fda4930186e9bae3758c8d0d29eac861f0f2079dc3f17602fbefa5e96ec323508679c243f87272153fc89f3066c1fd5931e25fcbd2ff42ef856a6f0
+  metadata.gz: 5fe9f92105e1acf59ce7f931a75a3e5d7e7a7ed5a58ee19d1b9cd1ce661c3f86011e3e910576fdad058009a8a2b2e54ab1e99eb073f11ec5a4d6bd27a9c30f47
+  data.tar.gz: 397e39515c8d7bf8e7bfb1d794b0beb434bb916af1f4ac310a027c9a9f21fb8ef0a74abf99acc53f6f59e8efd6b32ac50239e75cb329241d5d3ca8cc3a876405

data/README.md

@@ -20,7 +20,7 @@ Caffeinate is a drip email engine for managing, creating, and sending scheduled
 
 Caffeinate provides a simple DSL to create scheduled email sequences which can be used by ActionMailer without any additional configuration. 
 
-There's a cool demo with all the things included at [caffeinate.email](https://caffeinate.email). You can view the [marketing site source code here](https://github.com/joshmn/caffeinate-marketing).
+There's a cool demo app you can spin up [here](https://github.com/joshmn/caffeinate-marketing).
 
 ## Is this thing dead?
 

data/app/models/caffeinate/campaign_subscription.rb

@@ -16,6 +16,7 @@
 #  created_at             :datetime         not null
 #  updated_at             :datetime         not null
 #
+
 module Caffeinate
   # If a record tries to be `unsubscribed!` or `ended!` or `resubscribe!` and it's in a state that is not
   # correct, raise this
@@ -59,6 +60,22 @@ module Caffeinate
 
     after_commit :on_complete, if: :completed?
 
+    # Add (new) drips to a `CampaignSubscriber`.
+    #
+    # Useful if you added new drips to a `Campaign` and have existing `CampaignSubscription`
+    # which you want to add them to.
+    #
+    # Pass `:created_at` if you want to offset `Mailing#send_at` time from the time the `CampaignSubscription`
+    # was originally created. That is to say that if you add a new drip for 5 days from now, the mailing will be sent
+    # 5 days from when the `CampaignSubscription` was created.
+    #
+    # Pass `:current` to offset from the current time (doesn't offset anything, actually)
+    def refuel!(offset: :created_at)
+      ::CampaignSubscriptions::RefuelService.new(self, offset: offset).call
+
+      true
+    end
+
     # Actually deliver and process the mail
     def deliver!(mailing)
       caffeinate_campaign.to_dripper.deliver!(mailing)

data/app/models/caffeinate/mailing.rb

@@ -32,6 +32,14 @@ module Caffeinate
 
     after_touch :end_if_no_mailings!
 
+    def self.find_or_initialize_from_drip(campaign_subscription, drip)
+      find_or_initialize_by(
+        caffeinate_campaign_subscription: campaign_subscription,
+        mailer_class: drip.options[:mailer_class],
+        mailer_action: drip.action
+      )
+    end
+
     def initialize_dup(args)
       super
       self.send_at = nil

data/app/services/campaign_subscriptions/refuel_service.rb

@@ -0,0 +1,33 @@
+module CampaignSubscriptions
+  class RefuelService
+
+    def initialize(campaign_subscription, offset: :created_at)
+      raise ArgumentError, "must be either :current or :created_at" unless [:created_at, :current].include?(offset.to_sym)
+
+      @campaign_subscription = campaign_subscription
+      @campaign = @campaign_subscription.caffeinate_campaign
+      @offset = offset.to_sym
+    end
+
+    def call
+      mailings = []
+
+      @campaign.to_dripper.drips.each do |drip|
+        mailing = Caffeinate::Mailing.find_or_initialize_from_drip(@campaign_subscription, drip)
+        if mailing.new_record?
+          mailing.send_at = drip.send_at(@campaign_subscription)
+          if @offset == :created_at
+            mailing.send_at + (Caffeinate.config.now.call - @campaign_subscription.created_at)
+          elsif @offset == :current
+            # do nothing on purpose!
+          end
+
+          mailing.save!
+          mailings << mailing
+        end
+      end
+
+      mailings
+    end
+  end
+end

data/lib/caffeinate/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caffeinate
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Josh Brody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-14 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -153,6 +153,7 @@ files:
 - app/models/caffeinate/campaign.rb
 - app/models/caffeinate/campaign_subscription.rb
 - app/models/caffeinate/mailing.rb
+- app/services/campaign_subscriptions/refuel_service.rb
 - app/views/caffeinate/campaign_subscriptions/subscribe.html.erb
 - app/views/caffeinate/campaign_subscriptions/unsubscribe.html.erb
 - app/views/layouts/_caffeinate.html.erb