mailjet 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 533bf20d607d738f31988d3b98f42e7d19b715ec
-  data.tar.gz: 9e4e6f7b922eb63ddf244dd1f55cc20639c996a5
+  metadata.gz: 1a96fc421d38fb0763333e7505844d89f1baabca
+  data.tar.gz: 319850f793bb6e53605fe3e31b929e847f9a59bd
 SHA512:
-  metadata.gz: 51fcfca09fd37d58abde540f9b5c7f04babe9a9866e95ea04f771eef8751e2e9d3cb87ab7372540450cc389babf39cea8bf49de1711ea90a646bc568a27ff1e0
-  data.tar.gz: de2594137792aecce2fd7e96967f626d89f67683b4758e281c78fb8c75a87a80199e12a173566949014c4555fad67ac29d8edcb8950af4d7d3bc384269216c0d
+  metadata.gz: 7f5fda8463ae6aa86bfee17b3b541037df3561663ab66bfe6ede97833d25006fb6e2ec2df52d8bcd4f9462635323f722dfa1d9dc21d2108096628d8482fad3d3
+  data.tar.gz: 96b06a33da62dcd994450eca10961692d4788359d9eff7a3798234cc0503f875365b2d773c3787ffb8cdb2a9d5a9b95459a1fe40ae343cbba03b34c79258ae7e

data/lib/mailjet/resource.rb

@@ -84,7 +84,7 @@ module Mailjet
         # if action method, ammend url to appropriate id
         self.resource_path = create_action_resource_path(attributes[:id]) if self.action
 
-        if Mailjet.config.default_from
+        if Mailjet.config.default_from and self.resource_path == 'v3/send/'
           default_attributes = { :from_email => Mailjet.config.default_from }
         else
           default_attributes = {}
@@ -260,8 +260,11 @@ module Mailjet
 
     def formatted_payload
       payload = attributes.reject { |k,v| v.blank? }
-      # payload = payload.slice(*resourceprop)
+      if persisted?
+        payload = payload.slice(*resourceprop)
+      end
       payload = camelcase_keys(payload)
+      payload.tap { |hs| hs.delete("Persisted") }
       payload.inject({}) do |h, (k, v)|
         v = v.utc.as_json if v.respond_to? :utc
         h.merge!({k => v})

data/lib/mailjet/resources/send.rb

@@ -5,6 +5,5 @@ module Mailjet
     include Mailjet::Resource
     self.resource_path = 'v3/send/'
     self.public_operations = [:post]
-    self.resourceprop = [:from_email, :from_name, :recipients, :subject, :vars, :text_part, :html_part, :attachments, :inline_attachments, :headers, 'Mj-TemplateID', 'Mj-CustomID', :message_id, :messages, :to, :cc, :bcc, 'Mj-TemplateLanguage', 'MJ-TemplateErrorReporting', 'MJ-TemplateErrorDeliver', 'Mj-Campaign', 'Mj-DeduplicateCampaign', 'Mj-TrackOpen', 'Mj-TrackClick', 'Mj-EventPayLoad']
   end
 end

data/lib/mailjet/version.rb

@@ -1,3 +1,3 @@
 module Mailjet
-  VERSION = "1.3.6"
+  VERSION = "1.3.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailjet
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors:
 - Tyler Nappy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport