Implement click tracking for individual message

lib/sparkpost_rails/delivery_method.rb

@@ -160,8 +160,7 @@ def prepare_options_from mail, sparkpost_data
 
       prepare_sandbox_mode_from sparkpost_data
       prepare_open_tracking_from sparkpost_data
-
-      @data[:options][:click_tracking] = SparkPostRails.configuration.track_clicks
+      prepare_click_tracking_from sparkpost_data
 
       unless SparkPostRails.configuration.campaign_id.nil?
         @data[:campaign_id] = SparkPostRails.configuration.campaign_id
@@ -193,7 +192,14 @@ def prepare_open_tracking_from sparkpost_data
       if sparkpost_data.has_key?(:track_opens)
         @data[:options][:open_tracking] = sparkpost_data[:track_opens]
       end
+    end
 
+    def prepare_click_tracking_from sparkpost_data
+      @data[:options][:click_tracking] = SparkPostRails.configuration.track_clicks
+
+      if sparkpost_data.has_key?(:track_clicks)
+        @data[:options][:click_tracking] = sparkpost_data[:track_clicks]
+      end
     end
 
     def prepare_headers

spec/click_tracking_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe SparkPostRails::DeliveryMethod do
+
+  before(:each) do
+    SparkPostRails.configuration.set_defaults
+    @delivery_method = SparkPostRails::DeliveryMethod.new
+  end
+
+  context "Click Tracking" do
+    it "handles click tracking enabled in the configuration" do
+      SparkPostRails.configure do |c|
+        c.track_clicks = true
+      end
+
+      test_email = Mailer.test_email
+
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data[:options][:click_tracking]).to eq(true)
+    end
+
+    it "handles click tracking enabled on an individual message" do
+      test_email = Mailer.test_email sparkpost_data: {track_clicks: true}
+
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data[:options][:click_tracking]).to eq(true)
+    end
+
+    it "handles the value on an individual message overriding configuration" do
+      SparkPostRails.configure do |c|
+        c.track_clicks = true
+      end
+
+      test_email = Mailer.test_email sparkpost_data: {track_clicks: false}
+
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data[:options][:click_tracking]).to eq(false)
+    end
+
+    it "handles a default setting of 'false'" do
+      test_email = Mailer.test_email
+
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data[:options][:click_tracking]).to eq(false)
+    end
+
+  end
+end
+
+

spec/options_spec.rb

@@ -8,17 +8,6 @@
 
   context "Options" do
 
-    it "handles track_clicks option" do
-      SparkPostRails.configure do |c|
-        c.track_clicks = true
-      end
-
-      test_email = Mailer.test_email
-      @delivery_method.deliver!(test_email)
-
-      expect(@delivery_method.data[:options][:click_tracking]).to eq(true)
-    end
-
     it "does not contain unset campaign_id" do
       test_email = Mailer.test_email
       @delivery_method.deliver!(test_email)