customerio-rails 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5adee29125bb8586d4fda950db62af40292c31a993a1690b839ca4e24f17671a
-  data.tar.gz: 92f387d08d78fdd31a460687a29f28c1e019d954c590da6b2390f1f1b5962215
+  metadata.gz: f61734cc94dee78031fa7d1737b8fc4add5d600924714a54dd0dffeeb3d79922
+  data.tar.gz: 16e2e3011627b8331a6efac3452390b46736bf8d164177f5208eb3edf16da1c1
 SHA512:
-  metadata.gz: a28b9efc02aa6df47a7cafdaa332ad6f4afa858c14ee6d7ce435a4d275f099120e9c9211605f721d2d3ec75ef9d4268a2de235cb8fdc9af822dc25f35a865d4a
-  data.tar.gz: 5f287d2ca36b4bfef0f163b600a603d0369d761f85b8dc35a57ef8c69b3465e57955fedf6e7df8a9257a0c62ee90a4c6309044c2c58b2f352a24e8daab53075a
+  metadata.gz: '0849f2c2c8dfd524e203c7cfae32fd7a81d76069b3b5cac94f9c5080be83319aecafca309fc072d0b72aef932805029687659152cbb53b4579481ecc26731ac9'
+  data.tar.gz: '079842f178dc0042cea0fc27e0c43720437957056b2f807e54cae3260f84f8ba673b6ddf99a2a477caaec1cb3a3026f73b257cc75939e966785d7fdd74372d72'

data/lib/customerio-rails/mail.rb

@@ -21,15 +21,23 @@ module CustomerioRails
             reply_to: mail.reply_to,
             bcc: mail.bcc,
             headers: mail.headers,
-            identifiers: { email: to } 
+            identifiers: { email: to }
           }
+          params[:tracked] = mail[:tracked].unparsed_value == true unless mail[:tracked].nil?
           if mail[:transactional_message_id]
             params[:transactional_message_id] = mail[:transactional_message_id].unparsed_value
             params[:message_data] = mail[:message_data]&.unparsed_value || {}
           else
             params[:body] = mail.html_part.body.to_s if mail.html_part
             params[:body_plain] = mail.text_part.body.to_s if mail.text_part
-            params[mail.text? ? :body_plain : :body] = mail.body.to_s if !mail.html_part && !mail.text_part
+            if params[:body].blank?
+              if mail.text?
+                params[:body] = ''
+                params[:body_plain] = mail.body.to_s if params[:body_plain].blank?
+              else
+                params[:body] = mail.body.to_s
+              end
+            end
           end
           request = ::Customerio::SendEmailRequest.new(params.compact)
           mail.attachments.each do |attachment|

data/lib/customerio-rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CustomerioRails
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/spec/delivery_spec.rb

@@ -19,7 +19,7 @@ describe 'Delivering messages with customerio-rails' do
   context 'when delivering a simple message' do
     let(:expected_body) do
       { 'to' => 'sheldon@bigbangtheory.com', 'from' => 'leonard@bigbangtheory.com', 'subject' => 'hello',
-        'body_plain' => "hello\n", 'headers' => {}, 'identifiers' => { 'email' => 'sheldon@bigbangtheory.com' }, 'attachments' => {} }
+        'body' => '', 'body_plain' => "hello\n", 'headers' => {}, 'identifiers' => { 'email' => 'sheldon@bigbangtheory.com' }, 'attachments' => {} }
     end
 
     let(:message) { TestMailer.simple_message }
@@ -65,7 +65,7 @@ describe 'Delivering messages with customerio-rails' do
   context 'when delivering with a nice from address' do
     let(:expected_body) do
       {"to" => "sheldon@bigbangtheory.com", "from" => "Leonard Hofstadter <leonard@bigbangtheory.com>",
-        "subject" => "hello", "headers" => {}, "identifiers" => {"email" => "sheldon@bigbangtheory.com"}, "body_plain" => "hello", "attachments" => {}}
+        "subject" => "hello", "headers" => {}, "identifiers" => {"email" => "sheldon@bigbangtheory.com"}, "body" => "", "body_plain" => "hello", "attachments" => {}}
     end
 
     it do
@@ -89,7 +89,7 @@ describe 'Delivering messages with customerio-rails' do
   context 'when delivering a single part message' do
     let(:expected_body) do
       { 'to' => 'sheldon@bigbangtheory.com', 'from' => 'leonard@bigbangtheory.com',
-        'subject' => 'Your invitation to join Mixlr.', "body_plain" => "hello\n", 'headers' => {}, 'identifiers' => { 'email' => 'sheldon@bigbangtheory.com' }, 'attachments' => {} }
+        'subject' => 'Your invitation to join Mixlr.', "body" => "", "body_plain" => "hello\n", 'headers' => {}, 'identifiers' => { 'email' => 'sheldon@bigbangtheory.com' }, 'attachments' => {} }
     end
 
     it do
@@ -135,4 +135,31 @@ describe 'Delivering messages with customerio-rails' do
       message.deliver!
     end
   end
+
+  context 'when delivering a message without tracking' do
+    let(:message) { TestMailer.message_without_tracked }
+
+    let(:expected_body) do
+      { "to" => "sheldon@bigbangtheory.com", "from" => "leonard@bigbangtheory.com", "subject" => "Message without tracking.", "headers" => {},
+        "identifiers" => {"email" => "sheldon@bigbangtheory.com"}, "tracked" => false, "body" => "", "body_plain" => "whatever", "attachments" => {} }
+    end
+
+    it do
+      message.deliver!
+    end
+  end
+
+
+  context 'when delivering a message with tracking' do
+    let(:message) { TestMailer.message_with_tracked }
+
+    let(:expected_body) do
+      { "to" => "sheldon@bigbangtheory.com", "from" => "leonard@bigbangtheory.com", "subject" => "Message without tracking.", "headers" => {},
+        "identifiers" => {"email" => "sheldon@bigbangtheory.com"}, "tracked" => true, "body" => "", "body_plain" => "whatever", "attachments" => {} }
+    end
+
+    it do
+      message.deliver!
+    end
+  end
 end

data/spec/fixtures/models/test_mailer.rb

@@ -41,6 +41,14 @@ class TestMailer < ActionMailer::Base
     mail(subject: 'Message with template.', transactional_message_id: '123', message_data: { foo: 'bar' })
   end
 
+  def message_with_tracked
+    mail(subject: 'Message without tracking.', tracked: true, body: 'whatever')
+  end
+
+  def message_without_tracked
+    mail(subject: 'Message without tracking.', tracked: false, body: 'whatever')
+  end
+
   protected
 
   def image_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: customerio-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Sylvain Utard