ahoy_email 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 042ad39e2a371bd33d437f9187d691b665ae267c664703656baa3f7c40612fac
-  data.tar.gz: bf6e213b94b8002cd53767272cbdd1a2ea16ac24008c47439e9376615cde04db
+  metadata.gz: e39b9c6d5b1c32cc0a7a1bcc5da1e08205d6187e8eb5aec1505295ac1de36c64
+  data.tar.gz: c8f94cc014a6ab2cebe9c718a02989505fa9086d4b6bdbaed1e35a13bf269259
 SHA512:
-  metadata.gz: f7d589c0b45ac51efaaf7045d4578810c47524ec43a6ea8a82e65c1d975e86aba45abd8e73d0f6c6a0b7d999cd1e352ffae8113df347de81ecda3108982fd4c2
-  data.tar.gz: '0598b1f93fde1645f490e8ab4f02032520f707045b651dfb857b02bad78573b26d1b84f9e317a86c2c9e1126e078d43b1f2e0bc93db3e5fee14db60c6afd08e0'
+  metadata.gz: fc2721f83dc1eb2098d4d16166c3e78a07184007b61fd320ab4e50b26dc8dcc34583482baf8af1154d1b12e904c9113a69f4f3d24b18c1efc5dc26cf88e19aa2
+  data.tar.gz: 20f100d9f5c34ed8553ef778e4330df5cf35458d50f1bcfb2a28cdf3e6b8750d59b65b1dc153b23c773db4959ae10e051a28828852b0da06064c18a10f8c685c

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.2
+
+- Fixed error with Ruby < 2.5
+- Fixed UTM parameters storage on model
+
 ## 1.0.1
 
 - Use observer instead of interceptor

data/README.md

@@ -38,7 +38,7 @@ rails db:migrate
 Ahoy 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
 ```
@@ -58,7 +58,7 @@ By default, Ahoy tries `@user` then `params[:user]` then `User.find_by(email: me
 You can pass a specific user with:
 
 ```ruby
-class UserMailer < ApplicationMailer
+class CouponMailer < ApplicationMailer
   track user: -> { params[:some_user] }
 end
 ```
@@ -168,7 +168,7 @@ AhoyEmail.api = true
 And add to mailers you want to track:
 
 ```ruby
-class UserMailer < ApplicationMailer
+class CouponMailer < ApplicationMailer
   track open: true, click: true # use only/except to limit actions
 end
 ```
@@ -265,6 +265,23 @@ AhoyEmail.track_method = lambda do |data|
 end
 ```
 
+## Mongoid
+
+If you prefer to use Mongoid instead of ActiveRecord, create `app/models/ahoy/message.rb` with:
+
+```ruby
+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
+end
+```
+
 ## Upgrading
 
 ### 1.0

data/lib/ahoy_email.rb

@@ -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]
 
     ahoy_message.mailer = data[:mailer] if ahoy_message.respond_to?(:mailer=)
     ahoy_message.subject = message.subject if ahoy_message.respond_to?(:subject=)
@@ -76,5 +75,5 @@ end
 ActiveSupport.on_load(:action_mailer) do
   include AhoyEmail::Mailer
   register_observer AhoyEmail::Observer
-  Mail::Message.attr_accessor :ahoy_data, :ahoy_message
+  Mail::Message.send(:attr_accessor, :ahoy_data, :ahoy_message)
 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,8 +48,8 @@ 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
 

data/lib/ahoy_email/version.rb

@@ -1,3 +1,3 @@
 module AhoyEmail
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_email
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer