ahoy_email 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acb3c3744cff970d75c695f1c79edec32e7dd7a9bea7342576b7fc87be2d3e4a
-  data.tar.gz: 1cd08f10de1fa686aa09312cdee054694debe9f7835bb97fd9eb35aa9fc09c01
+  metadata.gz: 2998bcf65131bcbb1ae5d6b5c2d0e1bf21496571a8c8c3e96230f21c9b3b2a74
+  data.tar.gz: 4e0291a50f134fcc95cdf8626aaf368bf2cb7c4ce763bbc008691d88421abba3
 SHA512:
-  metadata.gz: 3eb7a246d87edfec081d873c8a464c90a682b81acd5d38877c8551770ba911f0c222bf778b03c2abf390fadf5bf48edabe863187627740c673b86718e082a9e4
-  data.tar.gz: 15c5a59995db66c0d76bfa5273e8a7f4404b11d80078fbf73765fcfb157d8ed3ff744b7bc694e75c8eb8fc2b4afc5494727fa68fb2f60769f91cf2d1f86e7dec
+  metadata.gz: 9fd0fd7d531e72f1c4d930cf35d398747ec7052b3f940597f80010e07f45d37c70ddb52f9d60d2c3b9bdb49a6760ed28a353e381f87e8849c57f7a5a6b6f8871
+  data.tar.gz: 04616042077a12cea5b86dd682339f91104c201bc0ce35a95716a45bf71cad4e80c964b0b57d813090d464d7cf66e7f4edc4f2c214c00723214342e00c9eccfd

data/CHANGELOG.md

@@ -1,4 +1,29 @@
-## 1.0.0
+## 1.1.1 (2021-03-06)
+
+- Added support for classes for subscribers
+- Use `datetime` type in migration
+
+## 1.1.0 (2019-07-15)
+
+- Made `opened_at` optional with click tracking
+- Fixed secret token for environment variables
+- Removed support for Rails 4.2
+
+## 1.0.3 (2019-02-18)
+
+- Fixed custom message model
+- Fixed `message` option with proc
+
+## 1.0.2 (2018-10-02)
+
+- Fixed error with Ruby < 2.5
+- Fixed UTM parameters storage on model
+
+## 1.0.1 (2018-09-27)
+
+- Use observer instead of interceptor
+
+## 1.0.0 (2018-09-27)
 
 - Removed support for Rails < 4.2
 
@@ -11,91 +36,91 @@ Breaking changes
 - `AhoyEmail.track` was removed in favor of `AhoyEmail.default_options`
 - The `heuristic_parse` option was removed and is now the default
 
-## 0.5.2
+## 0.5.2 (2018-04-26)
 
 - Fixed secret token for Rails 5.2
 - Added `heuristic_parse` option
 
-## 0.5.1
+## 0.5.1 (2018-04-19)
 
 - Fixed deprecation warning in Rails 5.2
 - Added `unsubscribe_links` option
 - Allow `message_model` to accept a proc
 - Use `references` in migration
 
-## 0.5.0
+## 0.5.0 (2017-05-01)
 
 - Added support for Rails 5.1
 - Added `invalid_redirect_url`
 
-## 0.4.0
+## 0.4.0 (2016-09-01)
 
 - Fixed `belongs_to` error in Rails 5
 - Include `safely_block` gem without polluting global namespace
 
-## 0.3.2
+## 0.3.2 (2016-07-27)
 
 - Fixed deprecation warning for Rails 5
 - Do not track content by default on fresh installations
 
-## 0.3.1
+## 0.3.1 (2016-05-11)
 
 - Fixed deprecation warnings
 - Fixed `stack level too deep` error
 
-## 0.3.0
+## 0.3.0 (2015-12-16)
 
 - Added safely for error reporting
 - Fixed error with `to`
 - Prevent duplicate records when mail called multiple times
 
-## 0.2.4
+## 0.2.4 (2015-07-29)
 
 - Added `extra` option for extra attributes
 
-## 0.2.3
+## 0.2.3 (2015-03-22)
 
 - Save utm parameters
 - Added `url_options`
 - Skip tracking for `mailto` links
 - Only set secret token if not already set
 
-## 0.2.2
+## 0.2.2 (2014-08-31)
 
 - Fixed secret token for Rails 4.1
 - Fixed links with href
 - Fixed message id for Rails 3.1
 
-## 0.2.1
+## 0.2.1 (2014-05-26)
 
 - Added `only` and `except` options
 
-## 0.2.0
+## 0.2.0 (2014-05-10)
 
 - Enable tracking when track is called by default
 
-## 0.1.5
+## 0.1.5 (2014-05-09)
 
 - Rails 3 fix
 
-## 0.1.4
+## 0.1.4 (2014-05-04)
 
 - Try not to rewrite unsubscribe links
 
-## 0.1.3
+## 0.1.3 (2014-05-03)
 
 - Added `to` and `mailer` fields
 - Added subscribers for open and click events
 
-## 0.1.2
+## 0.1.2 (2014-05-01)
 
 - Added `AhoyEmail.track` (fix)
 
-## 0.1.1
+## 0.1.1 (2014-04-30)
 
 - Use secure compare for signature verification
 - Fixed deprecation warnings
 
-## 0.1.0
+## 0.1.0 (2014-04-29)
 
 - First major release

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2018 Andrew Kane
+Copyright (c) 2014-2021 Andrew Kane
 
 MIT License
 

data/README.md

@@ -1,20 +1,12 @@
 # Ahoy Email
 
-:postbox: Email analytics for Rails
+First-party email analytics for Rails
 
-You get:
-
-- A history of emails sent to each user
-- Easy UTM tagging
-- Optional open and click tracking
-
-**Ahoy Email 1.0 was recently released!** See [how to upgrade](#upgrading)
+:fire: For web and native app analytics, check out [Ahoy](https://github.com/ankane/ahoy)
 
 :bullettrain_side: To manage unsubscribes, check out [Mailkick](https://github.com/ankane/mailkick)
 
-:fire: To track visits and events, check out [Ahoy](https://github.com/ankane/ahoy)
-
-[![Build Status](https://travis-ci.org/ankane/ahoy_email.svg?branch=master)](https://travis-ci.org/ankane/ahoy_email)
+[![Build Status](https://github.com/ankane/ahoy_email/workflows/build/badge.svg?branch=master)](https://github.com/ankane/ahoy_email/actions)
 
 ## Installation
 
@@ -31,14 +23,20 @@ rails generate ahoy_email:install
 rails db:migrate
 ```
 
-## How It Works
+## Getting Started
+
+There are three main features:
 
-### Message History
+- [Message history](#message-history)
+- [UTM tagging](#utm-tagging)
+- [Open & click analytics](#open--click-analytics)
 
-Ahoy creates an `Ahoy::Message` record for each email sent by default. You can disable history for a mailer:
+## Message History
+
+Ahoy Email creates an `Ahoy::Message` record for each email sent by default. You can disable history for a mailer:
 
 ```ruby
-class UserMailer < ApplicationMailer
+class CouponMailer < ApplicationMailer
   track message: false # use only/except to limit actions
 end
 ```
@@ -51,14 +49,14 @@ AhoyEmail.default_options[:message] = false
 
 ### Users
 
-Ahoy records the user a message is sent to - not just the email address. This gives you a full history of messages for each user, even if he or she changes addresses.
+Ahoy Email records the user a message is sent to - not just the email address. This gives you a history of messages for each user, even if they change addresses.
 
-By default, Ahoy tries `@user` then `params[:user]` then `User.find_by(email: message.to.first)` to find the user.
+By default, Ahoy tries `@user` then `params[:user]` then `User.find_by(email: message.to)` to find the user.
 
 You can pass a specific user with:
 
 ```ruby
-class UserMailer < ApplicationMailer
+class CouponMailer < ApplicationMailer
   track user: -> { params[:some_user] }
 end
 ```
@@ -86,7 +84,7 @@ Record extra attributes on the `Ahoy::Message` model.
 Create a migration to add extra attributes to the `ahoy_messages` table. For example:
 
 ```ruby
-class AddCouponIdToAhoyMessages < ActiveRecord::Migration[5.2]
+class AddCouponIdToAhoyMessages < ActiveRecord::Migration[6.1]
   def change
     add_column :ahoy_messages, :coupon_id, :integer
   end
@@ -109,9 +107,15 @@ class CouponMailer < ApplicationMailer
 end
 ```
 
-### UTM Tagging
+## UTM Tagging
 
-Automatically add UTM parameters to links.
+Use UTM tagging to attribute a conversion (like an order) to an email campaign. If you use [Ahoy](https://github.com/ankane/ahoy) for web analytics:
+
+1. Send an email with UTM parameters
+2. When a user visits the site, Ahoy will create a visit with the UTM parameters
+3. When a user orders, the visit will be associated with the order (if [configured](https://github.com/ankane/ahoy#associated-models))
+
+Add UTM parameters to links with:
 
 ```ruby
 class CouponMailer < ApplicationMailer
@@ -139,22 +143,25 @@ Skip specific links with:
 <%= link_to "Go", some_url, data: {skip_utm_params: true} %>
 ```
 
-### Opens & Clicks
+## Open & Click Analytics
 
-#### Setup
+While it’s nice to get feedback on the performance of your emails, we discourage the use of open tracking. If you do decide to use open or click tracking, be sure to get consent from your users and consider a short retention period. Check out [this article](https://www.eff.org/deeplinks/2019/01/stop-tracking-my-emails) for more best practices.
 
-Additional setup is required to track opens and clicks.
+### Setup
 
 Create a migration with:
 
 ```ruby
-class AddTokenToAhoyMessages < ActiveRecord::Migration[5.2]
+class AddTokenToAhoyMessages < ActiveRecord::Migration[6.1]
   def change
     add_column :ahoy_messages, :token, :string
+    add_index :ahoy_messages, :token
+
+    # for opens
     add_column :ahoy_messages, :opened_at, :timestamp
-    add_column :ahoy_messages, :clicked_at, :timestamp
 
-    add_index :ahoy_messages, :token
+    # for clicks
+    add_column :ahoy_messages, :clicked_at, :timestamp
   end
 end
 ```
@@ -168,12 +175,28 @@ AhoyEmail.api = true
 And add to mailers you want to track:
 
 ```ruby
-class UserMailer < ApplicationMailer
-  track open: true, click: true # use only/except to limit actions
+class CouponMailer < ApplicationMailer
+  track open: true, click: true
+end
+```
+
+Use only and except to limit actions
+
+```ruby
+class CouponMailer < ApplicationMailer
+  track click: true, only: [:welcome]
 end
 ```
 
-#### How It Works
+Or make it conditional
+
+```ruby
+class CouponMailer < ApplicationMailer
+  track click: -> { params[:user].opted_in? }
+end
+```
+
+### How It Works
 
 For opens, an invisible pixel is added right before the `</body>` tag in HTML emails. If the recipient has images enabled in their email client, the pixel is loaded and the open time recorded.
 
@@ -209,7 +232,7 @@ You can specify the domain to use with:
 AhoyEmail.default_options[:url_options] = {host: "mydomain.com"}
 ```
 
-#### Events
+### Events
 
 Subscribe to open and click events by adding to the initializer:
 
@@ -243,6 +266,36 @@ end
 AhoyEmail.subscribers << EmailSubscriber.new
 ```
 
+## Data Protection
+
+We recommend encrypting the `to` field (as well as the `subject` if it’s sensitive). [Lockbox](https://github.com/ankane/lockbox) is great for this. Use [Blind Index](https://github.com/ankane/blind_index) if you need to query by the `to` field.
+
+Create `app/models/ahoy/message.rb` with:
+
+```ruby
+class Ahoy::Message < ApplicationRecord
+  self.table_name = "ahoy_messages"
+  belongs_to :user, polymorphic: true, optional: true
+
+  encrypts :to
+  blind_index :to
+end
+```
+
+## Data Retention
+
+Delete older data with:
+
+```ruby
+Ahoy::Message.where("created_at < ?", 1.year.ago).in_batches.delete_all
+```
+
+Delete data for a specific user with:
+
+```ruby
+Ahoy::Message.where(user_id: 1).in_batches.delete_all
+```
+
 ## Reference
 
 Set global options
@@ -265,36 +318,22 @@ AhoyEmail.track_method = lambda do |data|
 end
 ```
 
-## Upgrading
-
-### 1.0
-
-Breaking changes
-
-- UTM tagging, open tracking, and click tracking are no longer enabled by default. To enable, create an initializer with:
-
-  ```ruby
-  AhoyEmail.api = true
-
-  AhoyEmail.default_options[:open] = true
-  AhoyEmail.default_options[:click] = true
-  AhoyEmail.default_options[:utm_params] = true
-  ```
+## Mongoid
 
-- Only sent emails are recorded
-- Proc options are now executed in the context of the mailer and take no arguments
+If you prefer to use Mongoid instead of Active Record, create `app/models/ahoy/message.rb` with:
 
-  ```ruby
-  # old
-  user: ->(mailer, message) { User.find_by(email: message.to.first) }
+```ruby
+class Ahoy::Message
+  include Mongoid::Document
 
-  # new
-  user: -> { User.find_by(email: message.to.first) }
-  ```
+  belongs_to :user, polymorphic: true, optional: true, index: true
 
-- Invalid options now throw an `ArgumentError`
-- `AhoyEmail.track` was removed in favor of `AhoyEmail.default_options`
-- The `heuristic_parse` option was removed and is now the default
+  field :to, type: String
+  field :mailer, type: String
+  field :subject, type: String
+  field :sent_at, type: Time
+end
+```
 
 ## History
 
@@ -308,3 +347,12 @@ Everyone is encouraged to help improve this project. Here are a few ways you can
 - Fix bugs and [submit pull requests](https://github.com/ankane/ahoy_email/pulls)
 - Write, clarify, or fix documentation
 - Suggest or add new features
+
+To get started with development:
+
+```sh
+git clone https://github.com/ankane/ahoy_email.git
+cd ahoy_email
+bundle install
+bundle exec rake test
+```

data/app/controllers/ahoy/messages_controller.rb

@@ -1,17 +1,14 @@
 module Ahoy
   class MessagesController < ApplicationController
     filters = _process_action_callbacks.map(&:filter) - AhoyEmail.preserve_callbacks
-    if Rails::VERSION::MAJOR >= 5
-      skip_before_action(*filters, raise: false)
-      skip_after_action(*filters, raise: false)
-      skip_around_action(*filters, raise: false)
-    else
-      skip_action_callback *filters
-    end
+    skip_before_action(*filters, raise: false)
+    skip_after_action(*filters, raise: false)
+    skip_around_action(*filters, raise: false)
 
     before_action :set_message
 
     def open
+      # TODO move to MessageSubscriber in 2.0
       if @message && !@message.opened_at
         @message.opened_at = Time.now
         @message.save!
@@ -23,9 +20,10 @@ module Ahoy
     end
 
     def click
+      # TODO move to MessageSubscriber in 2.0
       if @message && !@message.clicked_at
         @message.clicked_at = Time.now
-        @message.opened_at ||= @message.clicked_at
+        @message.opened_at ||= @message.clicked_at if @message.respond_to?(:opened_at=)
         @message.save!
       end
 
@@ -41,6 +39,7 @@ module Ahoy
 
         redirect_to url
       else
+        # TODO show link expired page with link to invalid redirect url in 2.0
         redirect_to AhoyEmail.invalid_redirect_url || main_app.root_url
       end
     end
@@ -48,14 +47,22 @@ module Ahoy
     protected
 
     def set_message
-      @message = AhoyEmail.message_model.where(token: params[:id]).first
+      @token =  params[:id]
+
+      model = AhoyEmail.message_model
+
+      return if model.respond_to?(:column_names) && !model.column_names.include?("token")
+
+      @message = model.where(token: @token).first
     end
 
     def publish(name, event = {})
       AhoyEmail.subscribers.each do |subscriber|
+        subscriber = subscriber.new if subscriber.is_a?(Class) && !subscriber.respond_to?(name)
         if subscriber.respond_to?(name)
           event[:message] = @message
           event[:controller] = self
+          event[:token] = @token
           subscriber.send name, event
         end
       end

data/app/models/ahoy/message.rb

@@ -2,6 +2,6 @@ module Ahoy
   class Message < ActiveRecord::Base
     self.table_name = "ahoy_messages"
 
-    belongs_to :user, (ActiveRecord::VERSION::MAJOR >= 5 ? {optional: true} : {}).merge(polymorphic: true)
+    belongs_to :user, polymorphic: true, optional: true
   end
 end

data/lib/ahoy_email.rb

@@ -8,7 +8,7 @@ require "safely/core"
 # modules
 require "ahoy_email/processor"
 require "ahoy_email/tracker"
-require "ahoy_email/interceptor"
+require "ahoy_email/observer"
 require "ahoy_email/mailer"
 require "ahoy_email/version"
 require "ahoy_email/engine" if defined?(Rails)
@@ -29,7 +29,7 @@ module AhoyEmail
     utm_term: nil,
     utm_content: nil,
     utm_campaign: -> { action_name },
-    user: -> { @user || (respond_to?(:params) && params && params[:user]) || (message.to.size == 1 ? (User.find_by(email: message.to.first) rescue nil) : nil) },
+    user: -> { (defined?(@user) && @user) || (respond_to?(:params) && params && params[:user]) || (message.to.try(:size) == 1 ? (User.find_by(email: message.to.first) rescue nil) : nil) },
     mailer: -> { "#{self.class.name}##{action_name}" },
     url_options: {},
     extra: {},
@@ -41,8 +41,7 @@ module AhoyEmail
 
     ahoy_message = AhoyEmail.message_model.new
     ahoy_message.to = Array(message.to).join(", ") if ahoy_message.respond_to?(:to=)
-    ahoy_message.user_type = data[:user_type]
-    ahoy_message.user_id = data[:user_id]
+    ahoy_message.user = data[:user] if ahoy_message.respond_to?(:user=)
 
     ahoy_message.mailer = data[:mailer] if ahoy_message.respond_to?(:mailer=)
     ahoy_message.subject = message.subject if ahoy_message.respond_to?(:subject=)
@@ -58,14 +57,18 @@ module AhoyEmail
 
     ahoy_message.sent_at = Time.now
     ahoy_message.save!
+
+    ahoy_message
   end
 
   self.subscribers = []
 
   self.preserve_callbacks = []
 
+  self.message_model = -> { ::Ahoy::Message }
+
   def self.message_model
-    model = (defined?(@message_model) && @message_model) || ::Ahoy::Message
+    model = defined?(@@message_model) && @@message_model
     model = model.call if model.respond_to?(:call)
     model
   end
@@ -73,5 +76,6 @@ end
 
 ActiveSupport.on_load(:action_mailer) do
   include AhoyEmail::Mailer
-  register_interceptor AhoyEmail::Interceptor
+  register_observer AhoyEmail::Observer
+  Mail::Message.send(:attr_accessor, :ahoy_data, :ahoy_message)
 end

data/lib/ahoy_email/engine.rb

@@ -13,7 +13,9 @@ module AhoyEmail
             app.config
           end
 
-        creds.respond_to?(:secret_key_base) ? creds.secret_key_base : creds.secret_token
+        token = creds.respond_to?(:secret_key_base) ? creds.secret_key_base : creds.secret_token
+        token ||= app.secret_key_base # should come first, but need to maintain backward compatibility
+        token
       end
     end
   end

data/lib/ahoy_email/mailer.rb

@@ -24,10 +24,14 @@ module AhoyEmail
     end
 
     def save_ahoy_options
-      if ahoy_options[:message]
-        Safely.safely do
+      Safely.safely do
+        # do message first for performance
+        message = ahoy_options[:message]
+        message = message.respond_to?(:call) ? instance_exec(&message) : message
+
+        if message
           options = {}
-          ahoy_options.each do |k, v|
+          ahoy_options.except(:message).each do |k, v|
             # execute options in mailer content
             options[k] = v.respond_to?(:call) ? instance_exec(&v) : v
           end

data/lib/ahoy_email/observer.rb

@@ -0,0 +1,7 @@
+module AhoyEmail
+  class Observer
+    def self.delivered_email(message)
+      AhoyEmail::Tracker.new(message).perform
+    end
+  end
+end

data/lib/ahoy_email/processor.rb

@@ -31,9 +31,11 @@ module AhoyEmail
     def track_message
       data = {
         mailer: options[:mailer],
-        extra: options[:extra]
+        extra: options[:extra],
+        user: options[:user]
       }
 
+      # legacy, remove in next major version
       user = options[:user]
       if user
         data[:user_type] = user.model_name.name
@@ -46,17 +48,19 @@ module AhoyEmail
       end
 
       if options[:utm_params]
-        UTM_PARAMETERS.each do |k|
-          data[k] = options[k.to_sym] if options[k.to_sym]
+        UTM_PARAMETERS.map(&:to_sym).each do |k|
+          data[k] = options[k] if options[k]
         end
       end
 
-      mailer.message["Ahoy-Message"] = data.to_json
+      mailer.message.ahoy_data = data
     end
 
     def track_open
       if html_part?
-        raw_source = (message.html_part || message).body.raw_source
+        part = message.html_part || message
+        raw_source = part.body.raw_source
+
         regex = /<\/body>/i
         url =
           url_for(
@@ -69,18 +73,19 @@ module AhoyEmail
 
         # try to add before body tag
         if raw_source.match(regex)
-          raw_source.gsub!(regex, "#{pixel}\\0")
+          part.body = raw_source.gsub(regex, "#{pixel}\\0")
         else
-          raw_source << pixel
+          part.body = raw_source + pixel
         end
       end
     end
 
     def track_links
       if html_part?
-        body = (message.html_part || message).body
+        part = message.html_part || message
 
-        doc = Nokogiri::HTML(body.raw_source)
+        # TODO use Nokogiri::HTML::DocumentFragment.parse in 2.0
+        doc = Nokogiri::HTML(part.body.raw_source)
         doc.css("a[href]").each do |link|
           uri = parse_uri(link["href"])
           next unless trackable?(uri)
@@ -96,6 +101,8 @@ module AhoyEmail
           end
 
           if options[:click] && !skip_attribute?(link, "click")
+            raise "Secret token is empty" unless AhoyEmail.secret_token
+
             # TODO sign more than just url and transition to HMAC-SHA256
             signature = OpenSSL::HMAC.hexdigest("SHA1", AhoyEmail.secret_token, link["href"])
             link["href"] =
@@ -109,8 +116,13 @@ module AhoyEmail
           end
         end
 
-        # hacky
-        body.raw_source.sub!(body.raw_source, doc.to_s)
+        # ampersands converted to &amp;
+        # https://github.com/sparklemotion/nokogiri/issues/1127
+        # not ideal, but should be equivalent in html5
+        # https://stackoverflow.com/questions/15776556/whats-the-difference-between-and-amp-in-html5
+        # escaping technically required before html5
+        # https://stackoverflow.com/questions/3705591/do-i-encode-ampersands-in-a-href
+        part.body = doc.to_s
       end
     end
 

data/lib/ahoy_email/tracker.rb

@@ -7,15 +7,13 @@ module AhoyEmail
     end
 
     def perform
-      if message.perform_deliveries && (data_header = message["Ahoy-Message"])
-        Safely.safely do
-          data = JSON.parse(data_header.to_s).symbolize_keys
-          data[:message] = message
-          AhoyEmail.track_method.call(data)
+      Safely.safely do
+        # perform_deliveries check still needed in observer
+        if message.perform_deliveries && message.ahoy_data
+          data = message.ahoy_data.merge(message: message)
+          message.ahoy_message = AhoyEmail.track_method.call(data)
         end
       end
-    ensure
-      message["Ahoy-Message"] = nil if message["Ahoy-Message"]
     end
   end
 end

data/lib/ahoy_email/version.rb

@@ -1,3 +1,3 @@
 module AhoyEmail
-  VERSION = "1.0.0"
+  VERSION = "1.1.1"
 end

data/lib/generators/ahoy_email/install_generator.rb

@@ -1,34 +1,17 @@
-# taken from https://github.com/collectiveidea/audited/blob/master/lib/generators/audited/install_generator.rb
-require "rails/generators"
-require "rails/generators/migration"
-require "active_record"
 require "rails/generators/active_record"
 
 module AhoyEmail
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      include Rails::Generators::Migration
-
-      source_root File.expand_path("../templates", __FILE__)
-
-      # Implement the required interface for Rails::Generators::Migration.
-      def self.next_migration_number(dirname) #:nodoc:
-        next_migration_number = current_migration_number(dirname) + 1
-        if ActiveRecord::Base.timestamped_migrations
-          [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
-        else
-          "%.3d" % next_migration_number
-        end
-      end
+      include ActiveRecord::Generators::Migration
+      source_root File.join(__dir__, "templates")
 
       def copy_migration
         migration_template "install.rb", "db/migrate/create_ahoy_messages.rb", migration_version: migration_version
       end
 
       def migration_version
-        if ActiveRecord::VERSION::MAJOR >= 5
-          "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
-        end
+        "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
       end
     end
   end

data/lib/generators/ahoy_email/templates/install.rb.tt

@@ -5,7 +5,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version
       t.text :to
       t.string :mailer
       t.text :subject
-      t.timestamp :sent_at
+      t.datetime :sent_at
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_email
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Andrew Kane
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2021-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -164,8 +150,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
-email: andrew@chartkick.com
+description:
+email: andrew@ankane.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -179,8 +165,8 @@ files:
 - config/routes.rb
 - lib/ahoy_email.rb
 - lib/ahoy_email/engine.rb
-- lib/ahoy_email/interceptor.rb
 - lib/ahoy_email/mailer.rb
+- lib/ahoy_email/observer.rb
 - lib/ahoy_email/processor.rb
 - lib/ahoy_email/tracker.rb
 - lib/ahoy_email/version.rb
@@ -190,7 +176,7 @@ homepage: https://github.com/ankane/ahoy_email
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -198,16 +184,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
-summary: Email analytics for Rails
+summary: First-party email analytics for Rails
 test_files: []

data/lib/ahoy_email/interceptor.rb

@@ -1,9 +0,0 @@
-module AhoyEmail
-  class Interceptor
-    class << self
-      def delivering_email(message)
-        AhoyEmail::Tracker.new(message).perform
-      end
-    end
-  end
-end