ahoy_email 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 415951e068121b2192e3dbf6eb9c275bd2995ca9
-  data.tar.gz: b1069426b1f037dd19b607befd21333bac1b511c
+  metadata.gz: c93fae59edb3ef7d69664769d7706673c09955ca
+  data.tar.gz: d4fcf110e9b0d31f27df464426c5b98ecd8c68a5
 SHA512:
-  metadata.gz: 367f11ab4b6d77cdc985dd9036a42a18a3d024c489550e5335b615ba64497c2f52406373c1bc891fd546bc160639f6baf52533bd07ad193b972d4d472d033b8a
-  data.tar.gz: d8016ae2167f7167be759f7c1a3850df9b5a905994186813c0ef037b247211f8421d9ce95c86595fd358640924ffd5f678318b25ea725bd1c8cea01c2739da7e
+  metadata.gz: 3c3be760d8cd4b4bbbb4d7f7c82124f0243b3234a0019a9bd041241cb0ca04c2880ed539e9f0868f248c2c1d6c45cc4cf06845e97c563b26b8d19ca6ebb91a28
+  data.tar.gz: e76a54879f082d10651fed3e82c3dcb969eb1fd7ca3bcca9b7ab46214e73152a244ce598ecd5b71165ace8b1867bc4baa65577537a1e998db2458c58df325025

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.0
+
+- Enable tracking when track is called by default
+
 ## 0.1.5
 
 - Rails 3 fix

data/lib/ahoy_email/mailer.rb

@@ -12,12 +12,12 @@ module AhoyEmail
 
     module ClassMethods
       def track(options)
-        self.ahoy_options = ahoy_options.merge(options)
+        self.ahoy_options = ahoy_options.merge(message: true).merge(options)
       end
     end
 
     def track(options)
-      @ahoy_options = (@ahoy_options || {}).merge(options)
+      @ahoy_options = (@ahoy_options || {}).merge(message: true).merge(options)
     end
 
     def mail_with_ahoy(headers = {}, &block)

data/lib/ahoy_email/processor.rb

@@ -1,7 +1,5 @@
 module AhoyEmail
   class Processor
-    include ActionView::Helpers::AssetTagHelper
-
     attr_reader :message, :options, :ahoy_message
 
     def initialize(message, options = {})
@@ -54,15 +52,13 @@ module AhoyEmail
         raw_source = (message.html_part || message).body.raw_source
         regex = /<\/body>/i
         url =
-          AhoyEmail::Engine.routes.url_helpers.url_for(
-            Rails.application.config.action_mailer.default_url_options.merge(
-              controller: "ahoy/messages",
-              action: "open",
-              id: ahoy_message.token,
-              format: "gif"
-            )
+          url_for(
+            controller: "ahoy/messages",
+            action: "open",
+            id: ahoy_message.token,
+            format: "gif"
           )
-        pixel = image_tag(url, size: "1x1", alt: nil)
+        pixel = ActionController::Base.helpers.image_tag(url, size: "1x1", alt: nil)
 
         # try to add before body tag
         if raw_source.match(regex)
@@ -92,18 +88,14 @@ module AhoyEmail
 
           if options[:click] and !skip_attribute?(link, "click")
             signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new("sha1"), AhoyEmail.secret_token, link["href"])
-            url =
-              AhoyEmail::Engine.routes.url_helpers.url_for(
-                Rails.application.config.action_mailer.default_url_options.merge(
-                  controller: "ahoy/messages",
-                  action: "click",
-                  id: ahoy_message.token,
-                  url: link["href"],
-                  signature: signature
-                )
+            link["href"] =
+              url_for(
+                controller: "ahoy/messages",
+                action: "click",
+                id: ahoy_message.token,
+                url: link["href"],
+                signature: signature
               )
-
-            link["href"] = url
           end
         end
 
@@ -130,6 +122,10 @@ module AhoyEmail
       end
     end
 
+    def url_for(options)
+      AhoyEmail::Engine.routes.url_helpers.url_for((ActionMailer::Base.default_url_options || {}).merge(options))
+    end
+
     # not a fan of quiet errors
     # but tracking should *not* break
     # email delivery in production
@@ -142,4 +138,4 @@ module AhoyEmail
     end
 
   end
-end
+end

data/lib/ahoy_email/version.rb

@@ -1,3 +1,3 @@
 module AhoyEmail
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_email
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails