mail_spy 0.0.9 → 0.0.10

data/app/controllers/mail_spy/tracking_controller.rb

@@ -14,7 +14,22 @@ module MailSpy
         }
       )
 
-      redirect_to params[:url]
+
+      # Add in the GA tokens if present
+
+      ga_hash = {}
+      ga_hash[:utm_source] = email.utm_source if email.utm_source.present?
+      ga_hash[:utm_medium] = email.utm_medium if email.utm_medium.present?
+      ga_hash[:utm_campaign] = email.utm_campaign if email.utm_campaign.present?
+      ga_hash[:utm_term] = email.utm_term if email.utm_term.present?
+      ga_hash[:utm_content] = email.utm_content if email.utm_content.present?
+
+      #TODO this is not fool proof, it breaks on bad urls (like missing http://)
+      #TODO this also breaks when a param is already present it isn;t smart
+      uri =  URI.parse(params[:url])
+      uri.query = [uri.query, ga_hash.to_param].compact.join('&')
+
+      redirect_to uri.to_s
     end
 
     def bug

data/app/helpers/mail_spy/email_helper.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module MailSpy
   module EmailHelper
 
@@ -21,6 +23,7 @@ module MailSpy
         tag_options = tag_options(html_options)
 
         # Inject our tracking url, and pass in the redirect_url
+
         hash = {
           :controller => "mail_spy/tracking",
           :action => :link,
@@ -31,16 +34,8 @@ module MailSpy
           :eid => @_email.id
         }
 
-        # Add in the GA tokens if present
-        hash[:utm_source] = @_email.utm_source if @_email.utm_source.present?
-        hash[:utm_medium] = @_email.utm_medium if @_email.utm_medium.present?
-        hash[:utm_campaign] = @_email.utm_campaign if @_email.utm_campaign.present?
-        hash[:utm_term] = @_email.utm_term if @_email.utm_term.present?
-        hash[:utm_content] = @_email.utm_content if @_email.utm_content.present?
-
         url = url_for(hash)
 
-
         href_attr = "href=\"#{ERB::Util.html_escape(url)}\"" unless href
         "<a #{href_attr}#{tag_options}>#{ERB::Util.html_escape(name || url)}</a>".html_safe
       end

data/config/routes.rb

@@ -9,5 +9,5 @@ MailSpy::Engine.routes.draw do
 
   # Sendgrid notification api
   post "sendgrid/notification", :controller => :sendgrid, :action => :notification
-  
+
 end

data/lib/mail_spy/manager.rb

@@ -20,7 +20,8 @@ module MailSpy
       [:campaign, :stream, :component].each { |key| raise "##{key} can't be blank" if options[key].blank? }
 
       # Make sure we have someone to send to
-      has_sender = options.keys.select { |option| to_options.include? option.intern }.present?
+      # TODO need to test setting the options but filling with nil
+      has_sender = to_options.select { |option| options[option].present? }.present?
       raise "Email instance has no sender (to,cc,bcc were all blank)" unless has_sender
 
       # Make sure that all options passed map to a accessor so we don't errantly
@@ -96,8 +97,8 @@ module MailSpy
             sent += 1
           rescue Exception => e
             email.failed = true
-            email.error_message = e.message
-            email.error_backtrace = e.backtrace
+            email.error_message = e.try(:message)
+            email.error_backtrace = e.try(:backtrace)
             email.save!
           end
         end

data/lib/mail_spy/version.rb

@@ -1,3 +1,3 @@
 module MailSpy
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/test/dummy/log/development.log

@@ -222,3 +222,49 @@ MONGODB [WARNING] Please note that logging negatively impacts client-side perfor
 MONGODB admin['$cmd'].find({:ismaster=>1}).limit(-1)
 MONGODB [WARNING] Please note that logging negatively impacts client-side performance. You should set your logging level no lower than :info in production.
 MONGODB admin['$cmd'].find({:ismaster=>1}).limit(-1)
+MONGODB [WARNING] Please note that logging negatively impacts client-side performance. You should set your logging level no lower than :info in production.
+MONGODB admin['$cmd'].find({:ismaster=>1}).limit(-1)
+MONGODB [WARNING] Please note that logging negatively impacts client-side performance. You should set your logging level no lower than :info in production.
+MONGODB admin['$cmd'].find({:ismaster=>1}).limit(-1)
+
+
+Started GET "/mail/test?url=www.google.com" for 127.0.0.1 at 2012-02-02 08:16:52 -0800
+Processing by MailSpy::TrackingController#test as HTML
+  Parameters: {"url"=>"www.google.com"}
+Redirected to http://localhost:3000www.google.com
+Completed 302 Found in 1ms (ActiveRecord: 0.0ms)
+
+
+Started GET "/mail/test?url=http://www.google.com" for 127.0.0.1 at 2012-02-02 08:17:18 -0800
+Processing by MailSpy::TrackingController#test as HTML
+  Parameters: {"url"=>"http://www.google.com"}
+Redirected to http://www.google.com
+Completed 302 Found in 0ms (ActiveRecord: 0.0ms)
+
+
+Started GET "/mail/test?url=http://www.google.com" for 127.0.0.1 at 2012-02-02 08:32:03 -0800
+Processing by MailSpy::TrackingController#test as HTML
+  Parameters: {"url"=>"http://www.google.com"}
+Redirected to http://www.google.com?id=1&wee=3
+Completed 302 Found in 1ms (ActiveRecord: 0.0ms)
+
+
+Started GET "/mail/test?url=http://www.google.com?dft=1" for 127.0.0.1 at 2012-02-02 08:32:33 -0800
+Processing by MailSpy::TrackingController#test as HTML
+  Parameters: {"url"=>"http://www.google.com?dft=1"}
+Redirected to http://www.google.com?dft=1&id=1&wee=3
+Completed 302 Found in 1ms (ActiveRecord: 0.0ms)
+
+
+Started GET "/mail/test?url=www.google.com" for 127.0.0.1 at 2012-02-02 08:32:59 -0800
+Processing by MailSpy::TrackingController#test as HTML
+  Parameters: {"url"=>"www.google.com"}
+Redirected to http://localhost:3000www.google.com?id=1&wee=3
+Completed 302 Found in 1ms (ActiveRecord: 0.0ms)
+
+
+Started GET "/mail/test?url=www.google.com" for 127.0.0.1 at 2012-02-02 08:32:59 -0800
+Processing by MailSpy::TrackingController#test as HTML
+  Parameters: {"url"=>"www.google.com"}
+Redirected to http://localhost:3000www.google.com?id=1&wee=3
+Completed 302 Found in 1ms (ActiveRecord: 0.0ms)

metadata

@@ -2,7 +2,7 @@
 name: mail_spy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Timothy Cardenas