mailjet 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71dd59616eccc89d2d9e16c1d3e09568196ab009
-  data.tar.gz: 6b05a66df8ccfd31b490d4ca4d5eb6185828cbdc
+  metadata.gz: 533bf20d607d738f31988d3b98f42e7d19b715ec
+  data.tar.gz: 9e4e6f7b922eb63ddf244dd1f55cc20639c996a5
 SHA512:
-  metadata.gz: 785c7961b92f6f65b1eb9aafc318b15e73ba9fa3cf6b13b0d12c0612ab880171d6c99b9cc734a756f9664f02d767cf295cb768f1b33baeb0611423c9bceba690
-  data.tar.gz: 259b2e8b67b99cdcd029c7fe6d195325a33ec51d1e5e6ef0635c49baa1e27d057fb6d1dd1181ac56ce61f4e1ba47a41bf38af981ec9f11c5e594237d38a76643
+  metadata.gz: 51fcfca09fd37d58abde540f9b5c7f04babe9a9866e95ea04f771eef8751e2e9d3cb87ab7372540450cc389babf39cea8bf49de1711ea90a646bc568a27ff1e0
+  data.tar.gz: de2594137792aecce2fd7e96967f626d89f67683b4758e281c78fb8c75a87a80199e12a173566949014c4555fad67ac29d8edcb8950af4d7d3bc384269216c0d

data/lib/mailjet/resource.rb

@@ -84,6 +84,14 @@ 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
+          default_attributes = { :from_email => Mailjet.config.default_from }
+        else
+          default_attributes = {}
+        end
+
+        attributes = default_attributes.merge(attributes)
+
         self.new(attributes).tap do |resource|
           resource.save!
           resource.persisted = true
@@ -252,7 +260,7 @@ module Mailjet
 
     def formatted_payload
       payload = attributes.reject { |k,v| v.blank? }
-      payload = payload.slice(*resourceprop)
+      # payload = payload.slice(*resourceprop)
       payload = camelcase_keys(payload)
       payload.inject({}) do |h, (k, v)|
         v = v.utc.as_json if v.respond_to? :utc

data/lib/mailjet/version.rb

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

metadata

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