sparkpost_rails_eu 1.5.1

data/spec/recipient_specific_data_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe SparkPostRails::DeliveryMethod do
+
+  before(:each) do
+    @delivery_method = SparkPostRails::DeliveryMethod.new
+  end
+
+  context "Recipient Data" do
+
+    it "accepts data matching all recipients" do
+      recipients = ['recipient1@email.com', 'recipient2@email.com']
+      recipients_data = [
+        {substitution_data: {name: "Recipient1"}}, 
+        {substitution_data: {name: "Recipient2"}} 
+      ]
+
+      test_email = Mailer.test_email to: recipients, sparkpost_data: {recipients: recipients_data}
+
+      @delivery_method.deliver!(test_email)
+
+      actual_recipients = @delivery_method.data[:recipients]
+      expect(actual_recipients.length).to eq(recipients.length)
+      expect(actual_recipients).to match(recipients.each_with_index.map { |recipient, index| recipients_data[index].merge(address: {email: recipient, header_to: anything}) })
+    end
+
+  end
+end
+
+

data/spec/recipients_list_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe SparkPostRails::DeliveryMethod do
+
+  before(:each) do
+    @delivery_method = SparkPostRails::DeliveryMethod.new
+  end
+
+  context "Recipients List" do
+
+    it "handles a list_id" do
+      test_email = Mailer.test_email sparkpost_data: {recipient_list_id: "List1"}
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data[:recipients]).to eq({list_id: "List1"})
+    end
+
+    it "ignores any CC addresses" do
+      test_email = Mailer.test_email cc: "cc@example.com", sparkpost_data: {recipient_list_id: "List1"}
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data[:recipients]).to eq({list_id: "List1"})
+      expect(@delivery_method.data[:content].has_key?(:headers)).to eq(false)
+    end
+
+    it "ignores any BCC addresses" do
+      test_email = Mailer.test_email bcc: "cc@example.com", sparkpost_data: {recipient_list_id: "List1"}
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data[:recipients]).to eq({list_id: "List1"})
+    end
+  end
+
+end

data/spec/recipients_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+describe SparkPostRails::DeliveryMethod do
+
+  before(:each) do
+    @delivery_method = SparkPostRails::DeliveryMethod.new
+  end
+
+  context "Recipients" do
+
+    context "single recipient" do
+      it "handles email only" do
+        test_email = Mailer.test_email
+        @delivery_method.deliver!(test_email)
+
+        expect(@delivery_method.data[:recipients]).to match([a_hash_including({address: {email: "to@example.com", header_to: anything}})])
+      end
+
+      it "handles name and email" do
+        test_email = Mailer.test_email to: "Joe Test <to@example.com>"
+        @delivery_method.deliver!(test_email)
+
+        expect(@delivery_method.data[:recipients]).to match([a_hash_including({address: {email: "to@example.com", name: "Joe Test", header_to: anything}})])
+      end
+    end
+
+    context "multiple recipients" do
+      it "handles email only" do
+        test_email = Mailer.test_email to: "to1@example.com, to2@example.com"
+        @delivery_method.deliver!(test_email)
+
+        expect(@delivery_method.data[:recipients]).to match([a_hash_including({address: {email: "to1@example.com", header_to: anything}}),
+                                                             a_hash_including({address: {email: "to2@example.com", header_to: anything}})])
+      end
+
+      it "handles name and email" do
+        test_email = Mailer.test_email to: "Sam Test <to1@example.com>, Joe Test <to2@example.com>"
+        @delivery_method.deliver!(test_email)
+
+        expect(@delivery_method.data[:recipients]).to match([a_hash_including({:address=>{:email=>"to1@example.com", :name=>"Sam Test", header_to: anything}}),
+                                                             a_hash_including({:address=>{:email=>"to2@example.com", :name=>"Joe Test", header_to: anything}})])
+      end
+
+      it "handles mix of email only and name/email" do
+        test_email = Mailer.test_email to: "Sam Test <to1@example.com>, to2@example.com"
+        @delivery_method.deliver!(test_email)
+
+        expect(@delivery_method.data[:recipients]).to match_array([a_hash_including({:address=>{:email=>"to1@example.com", :name=>"Sam Test", header_to: anything}}),
+                                                                   a_hash_including({:address=>{:email=>"to2@example.com", header_to: anything}})])
+      end
+
+      it "compiles list of email addresses to populate :header_to for each recipient" do
+        expected_header_to = "a@a.com,b@b.com"
+        test_email = Mailer.test_email to: "a <a@a.com>, b@b.com"
+        @delivery_method.deliver!(test_email)
+
+        expect(@delivery_method.data[:recipients].first[:address][:header_to]).to eql(expected_header_to)
+        expect(@delivery_method.data[:recipients].second[:address][:header_to]).to eql(expected_header_to)
+      end
+    end
+  end
+end

data/spec/reply_to_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe SparkPostRails::DeliveryMethod do
+
+  before(:each) do
+    @delivery_method = SparkPostRails::DeliveryMethod.new
+  end
+
+  context "Reply To" do
+    it "handles supplied value" do
+      test_email = Mailer.test_email reply_to: "reply_to@example.com"
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data[:content][:reply_to]).to eq("reply_to@example.com")
+    end
+
+    it "handles no value supplied" do
+      test_email = Mailer.test_email
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data[:content].has_key?(:reply_to)).to eq(false)
+    end
+  end
+end
+

data/spec/response_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe SparkPostRails::DeliveryMethod do
+
+  before(:each) do
+    @delivery_method = SparkPostRails::DeliveryMethod.new
+  end
+
+  context "API Response Handling" do
+    it "returns result data on success" do
+      test_email = Mailer.test_email
+      response = @delivery_method.deliver!(test_email)
+
+      expect(response).to eq({"total_rejected_recipients"=>0, "total_accepted_recipients"=>1, "id"=>"00000000000000000"})
+    end
+
+    it "raises exception on error" do
+      stub_request(:any, "https://api.sparkpost.com/api/v1/transmissions").
+        to_return(body: "{\"errors\":[{\"message\":\"required field is missing\",\"description\":\"recipients or list_id required\",\"code\":\"1400\"}]}", status: 403)
+
+      test_email = Mailer.test_email
+
+      expect {@delivery_method.deliver!(test_email)}.to raise_exception(SparkPostRails::DeliveryException)
+    end
+  end
+end

data/spec/return_path_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe SparkPostRails::DeliveryMethod do
+
+  before(:each) do
+    SparkPostRails.configuration.set_defaults
+    @delivery_method = SparkPostRails::DeliveryMethod.new
+  end
+
+  context "Return Path" do
+    it "handles return path set in the configuration" do
+      SparkPostRails.configure do |c|
+        c.return_path = "BOUNCE-EMAIL@EXAMPLE.COM"
+      end
+
+      test_email = Mailer.test_email
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data[:return_path]).to eq('BOUNCE-EMAIL@EXAMPLE.COM')
+    end
+
+    it "handles return path on an individual message" do
+      test_email = Mailer.test_email return_path: "bounce@example.com"
+
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data[:return_path]).to eq('bounce@example.com')
+    end
+
+    it "handles the value on an individual message overriding configuration" do
+      SparkPostRails.configure do |c|
+        c.return_path = "BOUNCE-EMAIL@EXAMPLE.COM"
+      end
+
+      test_email = Mailer.test_email return_path: "bounce@example.com"
+
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data[:return_path]).to eq('bounce@example.com')
+    end
+
+    it "handles a default setting of none" do
+      test_email = Mailer.test_email
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data.has_key?(:return_path)).to eq(false)
+    end
+
+  end
+end

data/spec/sandbox_mode_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe SparkPostRails::DeliveryMethod do
+
+  before(:each) do
+    SparkPostRails.configuration.set_defaults
+    @delivery_method = SparkPostRails::DeliveryMethod.new
+  end
+
+  context "Sandbox Mode" do
+    it "handles sandbox mode enabled in the configuration" do
+      SparkPostRails.configure do |c|
+        c.sandbox = true
+      end
+
+      test_email = Mailer.test_email
+
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data[:options][:sandbox]).to eq(true)
+    end
+
+    it "handles sandbox mode enabled on an individual message" do
+      test_email = Mailer.test_email sparkpost_data: {sandbox: true}
+
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data[:options][:sandbox]).to eq(true)
+    end
+
+    it "handles the value on an individual message overriding configuration" do
+      SparkPostRails.configure do |c|
+        c.sandbox = true
+      end
+
+      test_email = Mailer.test_email sparkpost_data: {sandbox: false}
+
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data[:options].has_key?(:sandbox)).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].has_key?(:sandbox)).to eq(false)
+    end
+
+  end
+end
+

data/spec/skip_suppression_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe SparkPostRails::DeliveryMethod do
+
+  before(:each) do
+    @delivery_method = SparkPostRails::DeliveryMethod.new
+  end
+
+  context "Skip Suppression" do
+    it "handles value from message" do
+      test_email = Mailer.test_email sparkpost_data: {skip_suppression: true}
+
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data[:options][:skip_suppression]).to eq(true)
+    end
+
+    it "does not include skip_suppression element if not supplied" do
+      test_email = Mailer.test_email
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.data[:options].has_key?(:skip_suppression)).to eq(false)
+    end
+
+  end
+end
+

data/spec/spec_helper.rb

@@ -0,0 +1,91 @@
+require 'webmock/rspec'
+require 'rails'
+require 'action_mailer'
+require "sparkpost_rails"
+
+RSpec.configure do |config|
+
+  config.before(:all) do
+    ActionMailer::Base.send :include, SparkPostRails::DataOptions
+  end
+
+  config.before(:each) do |example|
+    if example.metadata[:skip_configure]
+      SparkPostRails.configuration = nil # Reset configuration
+    else
+      SparkPostRails.configure do |c|
+        c.api_key = "TESTKEY1234"
+      end
+    end
+
+    stub_request(:any, "https://api.sparkpost.com/api/v1/transmissions").
+      to_return(body: "{\"results\":{\"total_rejected_recipients\":0,\"total_accepted_recipients\":1,\"id\":\"00000000000000000\"}}", status: 200)
+  end
+
+end
+
+#A default mailer to generate the mail object
+class Mailer < ActionMailer::Base
+  def test_email options = {}
+    data = {
+      from: "from@example.com",
+      to: options[:to] || "to@example.com",
+      subject: "Test Email",
+      text_part: "Hello, Testing!"
+    }
+
+    if options.has_key?(:attachments)
+      options[:attachments].times do |i|
+        attachments["file_#{i}.txt"] = "This is file #{i}"
+      end
+
+      options.delete(:attachments)
+    end
+
+    if options.has_key?(:images)
+      options[:images].times do |i|
+        attachments["image_#{i}.png"] = sparkpost_logo_contents
+      end
+
+      options.delete(:images)
+    end
+
+    if options.has_key?(:inline_attachments)
+      options[:inline_attachments].times do |i|
+        attachments.inline["image_#{i}.png"] = sparkpost_logo_contents
+      end
+
+      options.delete(:inline_attachments)
+    end
+
+    if options.has_key?(:headers)
+      if options[:headers].class == Hash
+        headers options[:headers]
+      end
+
+      options.delete(:headers)
+    end
+
+    data.merge! options
+
+    if data.has_key?(:html_part)
+
+      mail(data) do |format|
+        format.text {render text: data[:text_part]}
+        format.html {render text: data[:html_part]}
+      end
+
+    else
+
+      mail(data) do |format|
+        format.text {render text: data[:text_part]}
+      end
+
+    end
+  end
+
+  def sparkpost_logo_contents
+    encoded_contents = "iVBORw0KGgoAAAANSUhEUgAAAfIAAACCCAMAAACKGrqXAAAAY1BMVEX////6\nZCNVVVr6ZCP6ZCNVVVr6ZCNVVVr6ZCP6ZCNVVVpVVVr6ZCNVVVpVVVr6ZCNV\nVVpVVVr6ZCNVVVpVVVpVVVpVVVr6ZCP6ZCNVVVr6ZCP6ZCP6ZCP6ZCNVVVpV\nVVr6ZCO+CfRXAAAAH3RSTlMAgMBAEPBgoDAg4NBwkIDAUBDwQLBgMOCgIFCQ\n0LBwPgQxPgAADDFJREFUeF7s2kGLnEAYhOFqbERhSROHZFzXWer//8rAJo17\n2jklhK73OXsrKItP9Q/hmBQGZ1EWLD6roqB4W5QEdbNnJUFxWOaoTssce1rm\nOGznbTia3VtVDJy27aYYePjDi1KgOLPaidy7whC5V4Uh8l1hiNxVEdDcvSgC\nTnenIsCXVQEw+TIrBOstarPjtKNe5lj9mbLQ6/ak4eEeFjkOf+ai0aGFRY7J\nYZGjhUWOyWGRo4VFjsNhkeMeFjmKsyLHurnLuL7h4dTI2W4Zv8Wg3t1drHHh\nzV3iLxLc3bqmLNS6i6JQ6/asKNS6vSgKtW5raNQ6641a95uGRa2z3qj1rPXG\nbb3TiFA3+9l6WzQQPOwn662ehyJQ6z7+JO6qBNR6/1jefNc4sNtP1luJuMhw\nhLnW2+qIyDnCXOutBUTOEaYrvQY2DQKLvzT1d72rxoD2NPLqD4eGgNlfux7Z\nNTQurd11mts0NLZbJ2nz/9Hs328/vv32fnvV3/N6u/zUaH61d4bLjatIFLZJ\nCL4owsKScEgm8n3/p9zazexi6yC6Wz2pqbo752diLBUfNN3QtP/6m9LdZ85t\nHkv40jB+B4fUd7cHmVB/Tm+2FQJnrPjbnYjPz6apPsyJ17RGx61fn/FcF5Yx\nynw3RP5OX1QanX/A4d0Q18iMSI8dFRd/q8i6CnVza8u7oU1xeGgQ2sjDjda0\nZLppjfjtUV3kPrfrk2DfDRMkjlQx17nKY4VjvIn00Hi22wDnCMhJ+VAaUWPG\nKpAXTaMc+bwe4EnyXL9E7iTHNKi39n3EwW/hMOMvQR7bEO0CxGjZ7cmbVw1m\nDfIik4TI0xpiEj7XLsJJXmb2uXVvJbryCPMfPUDPeuTJkgN6BOS0uoKAMKc6\n5EVBhDxbGHrQ2IW1jDEWuh8mOaHLc0GOv5oWu5+47xbvOPYdLoU5VOTKi6+U\n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\nYII=\n"
+    Base64.decode64(encoded_contents)
+  end
+end

data/spec/subaccount_api_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+describe SparkPostRails::DeliveryMethod do
+
+  before(:each) do
+    SparkPostRails.configuration.set_defaults
+    @delivery_method = SparkPostRails::DeliveryMethod.new
+  end
+
+  context "Message-Specific API Key" do
+    it "uses supplied API key instead of default" do
+      SparkPostRails.configure do |c|
+        c.api_key = 'NEW_DEFAULT_API_KEY'
+      end
+
+      test_email = Mailer.test_email sparkpost_data: {api_key: 'SUBACCOUNT_API_KEY'}
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.headers).to include("Authorization" => "SUBACCOUNT_API_KEY")
+    end
+
+    it "uses default API if no message-specific API key applied" do
+      SparkPostRails.configure do |c|
+        c.api_key = 'NEW_DEFAULT_API_KEY'
+      end
+      
+      test_email = Mailer.test_email
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.headers).to include("Authorization" => "NEW_DEFAULT_API_KEY")
+    end
+  end
+
+  context "Subaccount ID" do
+    it "accepts a subaccount ID in the configuration" do
+      SparkPostRails.configure do |c|
+        c.subaccount = 123
+      end
+
+      test_email = Mailer.test_email
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.headers).to include("X-MSYS-SUBACCOUNT" => "123")
+    end
+
+    it "defaults to no subaccount ID in the configuration" do
+      expect(SparkPostRails.configuration.subaccount).to eq(nil)
+    end
+
+    it "accepts subaccount ID for an individual message" do
+      test_email = Mailer.test_email sparkpost_data: {subaccount: 456}
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.headers).to include("X-MSYS-SUBACCOUNT" => "456")
+    end
+
+    it "uses subaccount ID on message instead of value in configuration" do
+      SparkPostRails.configure do |c|
+        c.subaccount = 123
+      end
+
+      test_email = Mailer.test_email sparkpost_data: {subaccount: 456}
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.headers).to include("X-MSYS-SUBACCOUNT" => "456")
+    end
+    
+    it "does not include the subaccount header when none is specified" do
+      test_email = Mailer.test_email
+      @delivery_method.deliver!(test_email)
+
+      expect(@delivery_method.headers.has_key?("X-MSYS-SUBACCOUNT")).to eq(false)
+    end
+  end
+end