mailjet 1.3.6 → 1.3.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/mailjet/resource.rb +5 -2
- data/lib/mailjet/resources/send.rb +0 -1
- data/lib/mailjet/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1a96fc421d38fb0763333e7505844d89f1baabca
|
|
4
|
+
data.tar.gz: 319850f793bb6e53605fe3e31b929e847f9a59bd
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7f5fda8463ae6aa86bfee17b3b541037df3561663ab66bfe6ede97833d25006fb6e2ec2df52d8bcd4f9462635323f722dfa1d9dc21d2108096628d8482fad3d3
|
|
7
|
+
data.tar.gz: 96b06a33da62dcd994450eca10961692d4788359d9eff7a3798234cc0503f875365b2d773c3787ffb8cdb2a9d5a9b95459a1fe40ae343cbba03b34c79258ae7e
|
data/lib/mailjet/resource.rb
CHANGED
|
@@ -84,7 +84,7 @@ module Mailjet
|
|
|
84
84
|
# if action method, ammend url to appropriate id
|
|
85
85
|
self.resource_path = create_action_resource_path(attributes[:id]) if self.action
|
|
86
86
|
|
|
87
|
-
if Mailjet.config.default_from
|
|
87
|
+
if Mailjet.config.default_from and self.resource_path == 'v3/send/'
|
|
88
88
|
default_attributes = { :from_email => Mailjet.config.default_from }
|
|
89
89
|
else
|
|
90
90
|
default_attributes = {}
|
|
@@ -260,8 +260,11 @@ module Mailjet
|
|
|
260
260
|
|
|
261
261
|
def formatted_payload
|
|
262
262
|
payload = attributes.reject { |k,v| v.blank? }
|
|
263
|
-
|
|
263
|
+
if persisted?
|
|
264
|
+
payload = payload.slice(*resourceprop)
|
|
265
|
+
end
|
|
264
266
|
payload = camelcase_keys(payload)
|
|
267
|
+
payload.tap { |hs| hs.delete("Persisted") }
|
|
265
268
|
payload.inject({}) do |h, (k, v)|
|
|
266
269
|
v = v.utc.as_json if v.respond_to? :utc
|
|
267
270
|
h.merge!({k => v})
|
|
@@ -5,6 +5,5 @@ module Mailjet
|
|
|
5
5
|
include Mailjet::Resource
|
|
6
6
|
self.resource_path = 'v3/send/'
|
|
7
7
|
self.public_operations = [:post]
|
|
8
|
-
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']
|
|
9
8
|
end
|
|
10
9
|
end
|
data/lib/mailjet/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: mailjet
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.3.
|
|
4
|
+
version: 1.3.7
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Tyler Nappy
|
|
@@ -11,7 +11,7 @@ authors:
|
|
|
11
11
|
autorequire:
|
|
12
12
|
bindir: bin
|
|
13
13
|
cert_chain: []
|
|
14
|
-
date: 2016-03-
|
|
14
|
+
date: 2016-03-22 00:00:00.000000000 Z
|
|
15
15
|
dependencies:
|
|
16
16
|
- !ruby/object:Gem::Dependency
|
|
17
17
|
name: activesupport
|