Support track_opens on an individual message

lib/sparkpost_rails/delivery_method.rb

@@ -158,7 +158,9 @@ def prepare_attachments_from mail
     def prepare_options_from mail, sparkpost_data
       @data[:options] = Hash.new
 
-      @data[:options][:open_tracking] = SparkPostRails.configuration.track_opens
+      prepare_sandbox_mode_from sparkpost_data
+      prepare_open_tracking_from sparkpost_data
+
       @data[:options][:click_tracking] = SparkPostRails.configuration.track_clicks
 
       unless SparkPostRails.configuration.campaign_id.nil?
@@ -169,7 +171,6 @@ def prepare_options_from mail, sparkpost_data
         @data[:return_path] = SparkPostRails.configuration.return_path
       end
 
-      prepare_sandbox_mode_from sparkpost_data
     end
 
     def prepare_sandbox_mode_from sparkpost_data
@@ -186,6 +187,15 @@ def prepare_sandbox_mode_from sparkpost_data
       end
     end
 
+    def prepare_open_tracking_from sparkpost_data
+      @data[:options][:open_tracking] = SparkPostRails.configuration.track_opens
+
+      if sparkpost_data.has_key?(:track_opens)
+        @data[:options][:open_tracking] = sparkpost_data[:track_opens]
+      end
+
+    end
+
     def prepare_headers
       @headers = {
         "Authorization" => SparkPostRails.configuration.api_key,

spec/open_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 "Open Tracking" do
+    it "handles open tracking enabled in the configuration" do
+      SparkPostRails.configure do |c|
+        c.track_opens = true
+      end
+
+      test_email = Mailer.test_email
+
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data[:options][:open_tracking]).to eq(true)
+    end
+
+    it "handles open tracking enabled on an individual message" do
+      test_email = Mailer.test_email sparkpost_data: {track_opens: true}
+
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data[:options][:open_tracking]).to eq(true)
+    end
+
+    it "handles the value on an individual message overriding configuration" do
+      SparkPostRails.configure do |c|
+        c.track_opens = true
+      end
+
+      test_email = Mailer.test_email sparkpost_data: {track_opens: false}
+
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data[:options][:open_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][:open_tracking]).to eq(false)
+    end
+
+  end
+end
+
+

spec/options_spec.rb

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