caffeinate 0.16.0 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ea20b479c229cc1a535ede3e35ef0f37d3ee57ad146f429937ee66016bd871f
-  data.tar.gz: e361cb2d6a4562a3f3ca83a29e6ae29c38ca03fb5012b368909d7e8706504df3
+  metadata.gz: bb48d50e2800e8fb0f43b61dc0cf4b241990a1221ca1d841160a3a845d7fbb47
+  data.tar.gz: 6374ac7daac72c68a035ff51bf97803e0ed080f3c0ceed8d4848729773bd6a41
 SHA512:
-  metadata.gz: 409337f24f2d2fbe1837632d86211767acb73fbdb84bcaba35f5352ec713b81955a784a59385c37c892d468ee978e57419fa54406c3bb0907a0c84372890fbe5
-  data.tar.gz: 6f2988ab65ed1c8b7af248ab4ce0ed2ce2d1989bd5bd4a01f1af412297401cbc901557fd8f1057c0d502c2fc9a4b97328ab68138260cb03c4beb663a67bded1e
+  metadata.gz: 1239724ca7603400fd5a6cf7952e542e363fee75b8a58b53018fc6eeffbf8436fe79100da13f84278452d5f1101ec51f4508a8efc334fb222f04f4b96b5c9cd2
+  data.tar.gz: 53264a47eb958f1a7c90aa6d1255174cebe37f3c4cf43bc63019b46cc39b91b7cdde961ddc1bc38f8036209cefe418e1ab89f49a0391f529101bbfaea252020e

data/README.md

@@ -16,13 +16,18 @@
 
 # Caffeinate
 
-
 Caffeinate is a drip email engine for managing, creating, and sending scheduled email sequences from your Ruby on Rails application.
 
 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).
 
+## Is this thing dead?
+
+No! Not at all!
+
+There's not a lot of activity here because it's stable and working! I am more than happy to entertain new features.
+
 ## Do you suffer from ActionMailer tragedies?
 
 If you have _anything_ like this is your codebase, **you need Caffeinate**:

data/app/models/caffeinate/campaign.rb

@@ -14,6 +14,7 @@ module Caffeinate
   # Campaign ties together subscribers and mailings, and provides one core model for handling your Drippers.
   class Campaign < ApplicationRecord
     self.table_name = 'caffeinate_campaigns'
+    class NoSubscription < ::ActiveRecord::RecordInvalid; end
 
     has_many :caffeinate_campaign_subscriptions, class_name: 'Caffeinate::CampaignSubscription', foreign_key: :caffeinate_campaign_id
     has_many :subscriptions, class_name: 'Caffeinate::CampaignSubscription', foreign_key: :caffeinate_campaign_id
@@ -66,7 +67,7 @@ module Caffeinate
     def unsubscribe!(subscriber, **args)
       reason = args.delete(:reason)
       subscription = subscriber(subscriber, **args)
-      raise ::ActiveRecord::RecordInvalid, subscription if subscription.nil?
+      raise NoSubscription, subscription if subscription.nil?
 
       subscription.unsubscribe!(reason)
     end
@@ -74,12 +75,12 @@ module Caffeinate
     # Creates a `CampaignSubscription` object for the present Campaign. Allows passing `**args` to
     # delegate additional arguments to the record. Uses `find_or_create_by`.
     def subscribe(subscriber, **args)
-      caffeinate_campaign_subscriptions.create(subscriber: subscriber, **args)
+      caffeinate_campaign_subscriptions.find_or_create_by(subscriber: subscriber, **args)
     end
 
     # Subscribes an object to a campaign. Raises `ActiveRecord::RecordInvalid` if the record was invalid.
     def subscribe!(subscriber, **args)
-      caffeinate_campaign_subscriptions.create!(subscriber: subscriber, **args)
+      caffeinate_campaign_subscriptions.find_or_create_by!(subscriber: subscriber, **args)
     end
   end
 end

data/app/models/caffeinate/campaign_subscription.rb

@@ -55,7 +55,7 @@ module Caffeinate
 
     before_validation :call_dripper_before_subscribe_blocks!, on: :create
 
-    after_commit :create_mailings!, on: :create
+    after_create :create_mailings!
 
     after_commit :on_complete, if: :completed?
 
@@ -131,18 +131,7 @@ module Caffeinate
       true
     end
 
-    # Updates `unsubscribed_at` to nil and runs `on_subscribe` callbacks.
-    # Use `force` to forcefully reset. Does not create the mailings.
-    def resubscribe!(force = false)
-      return false if ended? && !force
-      return false if unsubscribed? && !force
-
-      result = update(unsubscribed_at: nil, resubscribed_at: ::Caffeinate.config.time_now)
-
-      caffeinate_campaign.to_dripper.run_callbacks(:on_resubscribe, self)
-      result
-    end
-
+    # Checks if the record is not new and if mailings are all gone.
     def completed?
       caffeinate_mailings.unsent.count.zero?
     end

data/app/views/caffeinate/campaign_subscriptions/subscribe.html.erb

@@ -1,3 +1,3 @@
 <%= t("caffeinate.campaign_subscriptions.subscribe") %>
 <p><%= t("caffeinate.campaign_subscriptions.changed_your_mind")%></p>
-<p><%= link_to "Unsubscribe", caffeinate_subscribe_url %></p>
+<p><%= link_to "Unsubscribe", caffeinate_unsubscribe_url %></p>

data/lib/caffeinate/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caffeinate
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 2.0.4
 platform: ruby
 authors:
 - Josh Brody
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-15 00:00:00.000000000 Z
+date: 2021-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -200,7 +200,7 @@ homepage: https://github.com/joshmn/caffeinate
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -215,8 +215,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Create, manage, and send scheduled email sequences and drip campaigns from
   your Rails app.