ahoy_email 1.1.1 → 2.0.0

data/lib/ahoy_email/tracker.rb

@@ -9,9 +9,15 @@ module AhoyEmail
     def perform
       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)
+        if message.perform_deliveries
+          if message.ahoy_data
+            data = message.ahoy_data.merge(message: message)
+            message.ahoy_message = AhoyEmail.track_method.call(data)
+          end
+
+          if message.ahoy_options && message.ahoy_options[:click]
+            Utils.publish(:send, message.ahoy_options.slice(:campaign))
+          end
         end
       end
     end

data/lib/ahoy_email/utils.rb

@@ -0,0 +1,35 @@
+module AhoyEmail
+  class Utils
+    OPTION_KEYS = {
+      message: %i(message mailer user extra),
+      utm_params: %i(utm_source utm_medium utm_term utm_content utm_campaign),
+      click: %i(campaign url_options unsubscribe_links)
+    }
+
+    class << self
+      def signature(token:, campaign:, url:)
+        # encode and join with a character outside encoding
+        data = [token, campaign, url].map { |v| Base64.strict_encode64(v.to_s) }.join("|")
+
+        Base64.urlsafe_encode64(OpenSSL::HMAC.digest("SHA256", secret_token, data), padding: false)
+      end
+
+      def publish(name, event)
+        method_name = "track_#{name}"
+        AhoyEmail.subscribers.each do |subscriber|
+          subscriber = subscriber.new if subscriber.is_a?(Class)
+          if subscriber.respond_to?(method_name)
+            subscriber.send(method_name, event.dup)
+          elsif name == :click && subscriber.respond_to?(:click)
+            # legacy
+            subscriber.send(:click, event.dup)
+          end
+        end
+      end
+
+      def secret_token
+        AhoyEmail.secret_token || (raise "Secret token is empty")
+      end
+    end
+  end
+end

data/lib/ahoy_email/version.rb

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

data/lib/generators/ahoy/messages/activerecord_generator.rb

@@ -0,0 +1,40 @@
+require "rails/generators/active_record"
+
+module Ahoy
+  module Generators
+    module Messages
+      class ActiverecordGenerator < Rails::Generators::Base
+        include ActiveRecord::Generators::Migration
+        source_root File.join(__dir__, "templates")
+
+        class_option :unencrypted, type: :boolean
+
+        def copy_migration
+          migration_template "migration.rb", "db/migrate/create_ahoy_messages.rb", migration_version: migration_version
+        end
+
+        def copy_template
+          if encrypted?
+            template "model_encrypted.rb", "app/models/ahoy/message.rb"
+          end
+        end
+
+        def migration_version
+          "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
+        end
+
+        def to_column
+          if encrypted?
+            "t.text :to_ciphertext\n      t.string :to_bidx, index: true"
+          else
+            "t.string :to, index: true"
+          end
+        end
+
+        def encrypted?
+          !options[:unencrypted]
+        end
+      end
+    end
+  end
+end

data/lib/generators/ahoy/messages/mongoid_generator.rb

@@ -0,0 +1,21 @@
+require "rails/generators"
+
+module Ahoy
+  module Generators
+    module Messages
+      class MongoidGenerator < Rails::Generators::Base
+        source_root File.join(__dir__, "templates")
+
+        class_option :unencrypted, type: :boolean
+
+        def copy_templates
+          if options[:unencrypted]
+            template "mongoid.rb", "app/models/ahoy/message.rb"
+          else
+            template "mongoid_encrypted.rb", "app/models/ahoy/message.rb"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/generators/{ahoy_email/templates/install.rb.tt → ahoy/messages/templates/migration.rb.tt}

@@ -2,7 +2,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version
   def change
     create_table :ahoy_messages do |t|
       t.references :user, polymorphic: true
-      t.text :to
+      <%= to_column %>
       t.string :mailer
       t.text :subject
       t.datetime :sent_at

data/lib/generators/ahoy/messages/templates/model_encrypted.rb.tt

@@ -0,0 +1,8 @@
+class Ahoy::Message < ActiveRecord::Base
+  self.table_name = "ahoy_messages"
+
+  belongs_to :user, polymorphic: true, optional: true
+
+  encrypts :to
+  blind_index :to
+end

data/lib/generators/ahoy/messages/templates/mongoid.rb.tt

@@ -0,0 +1,12 @@
+class Ahoy::Message
+  include Mongoid::Document
+
+  belongs_to :user, polymorphic: true, optional: true, index: true
+
+  field :to, type: String
+  field :mailer, type: String
+  field :subject, type: String
+  field :sent_at, type: Time
+
+  index({to: 1})
+end

data/lib/generators/ahoy/messages/templates/mongoid_encrypted.rb.tt

@@ -0,0 +1,16 @@
+class Ahoy::Message
+  include Mongoid::Document
+
+  belongs_to :user, polymorphic: true, optional: true, index: true
+
+  field :to_ciphertext, type: String
+  field :to_bidx, type: String
+  field :mailer, type: String
+  field :subject, type: String
+  field :sent_at, type: Time
+
+  index({to_bidx: 1})
+
+  encrypts :to
+  blind_index :to
+end

data/lib/generators/ahoy/messages_generator.rb

@@ -0,0 +1,41 @@
+require "rails/generators"
+
+module Ahoy
+  module Generators
+    class MessagesGenerator < Rails::Generators::Base
+      source_root File.join(__dir__, "templates")
+
+      class_option :unencrypted, type: :boolean
+
+      def copy_templates
+        activerecord = defined?(ActiveRecord)
+        mongoid = defined?(Mongoid)
+
+        selection =
+          if activerecord && mongoid
+            puts <<-MSG
+
+Which data store would you like to use?
+ 1. Active Record (default)
+ 2. Mongoid
+            MSG
+
+            ask(">")
+          elsif activerecord
+            "1"
+          else
+            "2"
+          end
+
+        case selection
+        when "", "1"
+          invoke "ahoy:messages:activerecord"
+        when "2"
+          invoke "ahoy:messages:mongoid"
+        else
+          abort "Error: must enter a number [1-2]"
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_email
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Andrew Kane
@@ -66,90 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: bundler
-  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: rake
-  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: minitest
-  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: activerecord
-  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: combustion
-  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
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description:
 email: andrew@ankane.org
 executables: []
@@ -166,12 +82,20 @@ files:
 - lib/ahoy_email.rb
 - lib/ahoy_email/engine.rb
 - lib/ahoy_email/mailer.rb
+- lib/ahoy_email/message_subscriber.rb
 - lib/ahoy_email/observer.rb
 - lib/ahoy_email/processor.rb
+- lib/ahoy_email/redis_subscriber.rb
 - lib/ahoy_email/tracker.rb
+- lib/ahoy_email/utils.rb
 - lib/ahoy_email/version.rb
-- lib/generators/ahoy_email/install_generator.rb
-- lib/generators/ahoy_email/templates/install.rb.tt
+- lib/generators/ahoy/messages/activerecord_generator.rb
+- lib/generators/ahoy/messages/mongoid_generator.rb
+- lib/generators/ahoy/messages/templates/migration.rb.tt
+- lib/generators/ahoy/messages/templates/model_encrypted.rb.tt
+- lib/generators/ahoy/messages/templates/mongoid.rb.tt
+- lib/generators/ahoy/messages/templates/mongoid_encrypted.rb.tt
+- lib/generators/ahoy/messages_generator.rb
 homepage: https://github.com/ankane/ahoy_email
 licenses:
 - MIT
@@ -184,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/generators/ahoy_email/install_generator.rb

@@ -1,18 +0,0 @@
-require "rails/generators/active_record"
-
-module AhoyEmail
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      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
-        "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
-      end
-    end
-  end
-end