mailjet 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e5aca2e6992e3629225e95b54f92c345b9a425a
-  data.tar.gz: eb1f16741cb17b0a1db5303e29fd57fc853c44ae
+  metadata.gz: ce7a69f28969e1a632cc70e07a8a04b973576f5f
+  data.tar.gz: 3a7bf17b3fd83efeb88427b6bc09f184d41b9996
 SHA512:
-  metadata.gz: 48c6bd96487aa123c5a201157e4d1d199325ebe582c54423bad89b0ad58c5c9d1f3f5d692ff94257ecd6745625ab1939dfb908cf81f55258a6081125a9d0747b
-  data.tar.gz: 54836996f885ea2286b23ff127d09913722fac7819764436e9f757cbd93bd8d4f0374fd207615438ef417acc1199d575896c8b91688198057abad0c81d43bf30
+  metadata.gz: 3043cf5a15c67cb008677ea98b439ef656e5ce5f6bcad3f3fba3497ea1dae6f8f99e637d7a27cb07c11ee1f12d46e4e30b573ea01258e1901f32cdc6a4c7a5c2
+  data.tar.gz: 672355e584024830232f12dcbea25e1d6e5ac543ddf56476cd2a64b55e45b9a920eb4f667a7e08ae6f9ca5f0a7bf6f0d22812013705ecf49bac69ad70e344e5d

data/lib/mailjet/configuration.rb

@@ -2,18 +2,17 @@ require 'active_support/core_ext/module/attribute_accessors'
 
 module Mailjet
   module Configuration
-    mattr_accessor :api_key
-    mattr_accessor :secret_key
-    mattr_accessor :default_from
-    mattr_accessor :api_version do
-      'v3'
-    end
-    mattr_accessor :end_point do
-      'https://api.mailjet.com'
-    end
-    mattr_accessor :perform_api_call do
-      true
-    end
+    mattr_accessor :api_key, :secret_key, :default_from
 
+    DEFAULT = {
+      api_version: 'v3',
+      end_point: 'https://api.mailjet.com',
+      perform_api_call: true,
+    }
+
+    DEFAULT.each do |param, default_value|
+      mattr_accessor param
+      self.send("#{param}=", default_value)
+    end
   end
 end

data/lib/mailjet/connection.rb

@@ -69,7 +69,7 @@ module Mailjet
           @adapter.send(method, formatted_payload, additional_headers, &block)
         end
       else
-        return {'Count': 0, 'Data': [mock_api_call: true], 'Total': 0}.to_json
+        return {'Count' => 0, 'Data' => [mock_api_call: true], 'Total' => 0}.to_json
       end
     rescue RestClient::Exception => e
       handle_exception(e, additional_headers, formatted_payload)

data/lib/mailjet/mailer.rb

@@ -49,8 +49,7 @@ class Mailjet::APIMailer
     )
   end
 
-  def deliver!(mail, options = nil)
-#    p mail.header.fields
+  def deliver!(mail, options = {})
 
     if (options && options.kind_of?(Object) && options['version'].present?)
       @version = options['version']
@@ -66,20 +65,27 @@ class Mailjet::APIMailer
     end
 
     if (@version == 'v3.1')
-      Mailjet::Send.create({:Messages => [setContentV3_1(mail)]})
+      Mailjet::Send.create({:Messages => [setContentV3_1(mail)]}, options)
     else
-      Mailjet::Send.create(setContentV3_0(mail))
+      Mailjet::Send.create(setContentV3_0(mail), options)
     end
   end
 
   def setContentV3_1(mail)
     content = {}
+
     content[:TextPart] = mail.text_part.try(:decoded) if !mail.text_part.blank?
     content[:HTMLPart] = mail.html_part.try(:decoded) if !mail.html_part.blank?
 
+    # try message `body` as fallback if no content found
+    unless content[:TextPart] || content[:HTMLPart] || mail.body.try(:raw_source).empty?
+      content[mail.content_type.try(:include?,'text/html') ? :HTMLPart : :TextPart] = mail.body.raw_source
+    end
+
+
     if mail.attachments.any?
       content[:Attachments] = []
-      content[:InlineAttachments] = []
+      content[:InlinedAttachments] = []
 
       mail.attachments.each do |attachment|
         mailjet_attachment = {
@@ -90,7 +96,7 @@ class Mailjet::APIMailer
 
         if attachment.inline?
           mailjet_attachment['ContentId'] = attachment.content_id
-          content[:InlineAttachments].push(mailjet_attachment)
+          content[:InlinedAttachments].push(mailjet_attachment)
         else
           content[:Attachments].push(mailjet_attachment)
         end
@@ -108,14 +114,14 @@ class Mailjet::APIMailer
       end
     end
 
-    # Reply-To is not a property in Mailjet Send API
+    # ReplyTo property was added in v3.1
     # Passing it as an header if mail.reply_to
 
     if mail.reply_to
-      if mail.reply_to.display_names.first
-        content[:Headers]['Reply-To'] = {:Email=> mail[:reply_to].addresses.first, :Name=> mail[:reply_to].display_names.first}
+      if mail.reply_to.respond_to?(:display_names) && mail.reply_to.display_names.first
+        content[:ReplyTo] = {:Email=> mail[:reply_to].addresses.first, :Name=> mail[:reply_to].display_names.first}
       else
-        content[:Headers]['Reply-To'] = {:Email=> mail[:reply_to].addresses.first}
+        content[:ReplyTo] = {:Email=> mail[:reply_to].addresses.first}
       end
     end
 
@@ -199,6 +205,11 @@ class Mailjet::APIMailer
     content[:text_part] = mail.text_part.try(:decoded) if !mail.text_part.blank?
     content[:html_part] = mail.html_part.try(:decoded) if !mail.html_part.blank?
 
+    # try message `body` as fallback if no content found
+    unless content[:text_part] || content[:html_part] || mail.body.try(:raw_source).empty?
+      content[mail.content_type.try(:include?,'text/html') ? :html_part : :text_part] = mail.body.raw_source
+    end
+
     # Formatting attachments (inline + regular)
     unless mail.attachments.empty?
       content[:attachments] = []

data/lib/mailjet/resources/newsletter_schedule.rb

@@ -3,7 +3,7 @@ module Mailjet
     include Mailjet::Resource
     self.action = "schedule"
     self.resource_path = "REST/newsletter/id/#{self.action}"
-    self.public_operations = [:post, :delete]
+    self.public_operations = [:get, :post, :delete]
     self.filters = []
     self.resourceprop = [:date]
 

data/lib/mailjet/version.rb

@@ -1,3 +1,3 @@
 module Mailjet
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailjet
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Tyler Nappy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport