ahoy_email 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acb3c3744cff970d75c695f1c79edec32e7dd7a9bea7342576b7fc87be2d3e4a
-  data.tar.gz: 1cd08f10de1fa686aa09312cdee054694debe9f7835bb97fd9eb35aa9fc09c01
+  metadata.gz: 042ad39e2a371bd33d437f9187d691b665ae267c664703656baa3f7c40612fac
+  data.tar.gz: bf6e213b94b8002cd53767272cbdd1a2ea16ac24008c47439e9376615cde04db
 SHA512:
-  metadata.gz: 3eb7a246d87edfec081d873c8a464c90a682b81acd5d38877c8551770ba911f0c222bf778b03c2abf390fadf5bf48edabe863187627740c673b86718e082a9e4
-  data.tar.gz: 15c5a59995db66c0d76bfa5273e8a7f4404b11d80078fbf73765fcfb157d8ed3ff744b7bc694e75c8eb8fc2b4afc5494727fa68fb2f60769f91cf2d1f86e7dec
+  metadata.gz: f7d589c0b45ac51efaaf7045d4578810c47524ec43a6ea8a82e65c1d975e86aba45abd8e73d0f6c6a0b7d999cd1e352ffae8113df347de81ecda3108982fd4c2
+  data.tar.gz: '0598b1f93fde1645f490e8ab4f02032520f707045b651dfb857b02bad78573b26d1b84f9e317a86c2c9e1126e078d43b1f2e0bc93db3e5fee14db60c6afd08e0'

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.1
+
+- Use observer instead of interceptor
+
 ## 1.0.0
 
 - Removed support for Rails < 4.2

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)
@@ -58,6 +58,8 @@ module AhoyEmail
 
     ahoy_message.sent_at = Time.now
     ahoy_message.save!
+
+    ahoy_message
   end
 
   self.subscribers = []
@@ -73,5 +75,6 @@ end
 
 ActiveSupport.on_load(:action_mailer) do
   include AhoyEmail::Mailer
-  register_interceptor AhoyEmail::Interceptor
+  register_observer AhoyEmail::Observer
+  Mail::Message.attr_accessor :ahoy_data, :ahoy_message
 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

@@ -51,7 +51,7 @@ module AhoyEmail
         end
       end
 
-      mailer.message["Ahoy-Message"] = data.to_json
+      mailer.message.ahoy_data = data
     end
 
     def track_open

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.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_email
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Andrew Kane
@@ -179,8 +179,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

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