lib/ahoy_email/processor.rb in ahoy_email-0.0.2 vs lib/ahoy_email/processor.rb in ahoy_email-0.1.0

@@ -5,35 +5,34 @@
     attr_reader :message, :options, :ahoy_message
 
     def initialize(message, options = {})
       @message = message
       @options = options
-      @ahoy_message = Ahoy::Message.new
     end
 
-    def process!
-      if options[:create_message]
+    def process
+      if options[:message]
+        @ahoy_message = AhoyEmail.message_model.new
         ahoy_message.token = generate_token
         ahoy_message.user = options[:user]
 
-        track_utm_parameters!
-        track_open! if options[:track_open]
-        track_click! if options[:track_click]
+        track_open if options[:open]
+        track_links if options[:utm_params] or options[:click]
 
         # save
         ahoy_message.subject = message.subject if ahoy_message.respond_to?(:subject=)
         ahoy_message.content = message.to_s if ahoy_message.respond_to?(:content=)
-        ahoy_message.sent_at = Time.now
         ahoy_message.save
+        message["Ahoy-Message-Id"] = ahoy_message.id
       end
     rescue => e
       report_error(e)
     end
 
-    def mark_sent!
+    def track_send
       if (message_id = message["Ahoy-Message-Id"])
-        ahoy_message = Ahoy::Message.where(id: message_id).first
+        ahoy_message = AhoyEmail.message_model.where(id: message_id.to_s).first
         if ahoy_message
           ahoy_message.sent_at = Time.now
           ahoy_message.save
         end
         message["Ahoy-Message-Id"] = nil
@@ -46,32 +45,12 @@
 
     def generate_token
       SecureRandom.urlsafe_base64(32).gsub(/[\-_]/, "").first(32)
     end
 
-    def track_utm_parameters!
+    def track_open
       if html_part?
-        body = (message.html_part || message).body
-
-        doc = Nokogiri::HTML(body.raw_source)
-        doc.css("a").each do |link|
-          uri = Addressable::URI.parse(link["href"])
-          params = uri.query_values || {}
-          %w[utm_source utm_medium utm_term utm_content utm_campaign].each do |key|
-            params[key] ||= options[key.to_sym] if options[key.to_sym]
-          end
-          uri.query_values = params
-          link["href"] = uri.to_s
-        end
-
-        # hacky
-        body.raw_source.sub!(body.raw_source, doc.to_s)
-      end
-    end
-
-    def track_open!
-      if html_part?
         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(
@@ -90,21 +69,28 @@
           raw_source << pixel
         end
       end
     end
 
-    def track_click!
+    def track_links
       if html_part?
         body = (message.html_part || message).body
 
         doc = Nokogiri::HTML(body.raw_source)
         doc.css("a").each do |link|
-          key = "data-disable-tracking"
-          if link[key]
-            # remove attribute
-            link.remove_attribute(key)
-          else
+          # utm params first
+          if options[:utm_params] and !skip_attribute?(link, "utm-params")
+            uri = Addressable::URI.parse(link["href"])
+            params = uri.query_values || {}
+            %w[utm_source utm_medium utm_term utm_content utm_campaign].each do |key|
+              params[key] ||= options[key.to_sym] if options[key.to_sym]
+            end
+            uri.query_values = params
+            link["href"] = uri.to_s
+          end
+
+          if options[:click] and !skip_attribute?(link, "click")
             signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::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",
@@ -124,9 +110,20 @@
       end
     end
 
     def html_part?
       (message.html_part || message).content_type =~ /html/
+    end
+
+    def skip_attribute?(link, suffix)
+      attribute = "data-skip-#{suffix}"
+      if link[attribute]
+        # remove it
+        link.remove_attribute(attribute)
+        true
+      else
+        false
+      end
     end
 
     # not a fan of quiet errors
     # but tracking should *not* break
     # email delivery in production
\ No newline at end of file