mailjet 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97d0fd939a2c9ce129ce2dc69ceacfa1e74927b0
-  data.tar.gz: 6fe2384a9d5142a6641e6246fa4cd78456464efe
+  metadata.gz: 0caf5b8f84f19dcfddd140a77d3912e0e6ee1672
+  data.tar.gz: a5cd66471eb7a399882b33ac4fd347c2f16698a6
 SHA512:
-  metadata.gz: 915c0bcff51e94b47fffb16699326a765fb186a850f0763a0684c35c3def3288a87df4a859d885bf2d7cd5f187285f09aa552dd1e2af87ca0e8a95d018c887d5
-  data.tar.gz: 219fd219da5b8bdf8d3dae8931e21f3d4c600e71e2240d76e1bb02b100897646d05a8eaa85fac7e38a30923011112cf416c4028a49e7bf0419e6de5e855159af
+  metadata.gz: 38c9e20e47f52baf3746f61e898c579692801d05a13c1dc69c8991bae21573c6f2a4c07da87eb580bec8beab52eb044cda671e108b605fcbc7aae130f4215309
+  data.tar.gz: 2d96779dee5a705fd311fa3a9502f9fa1c502b67348d0fd85c45211c45553d9cb81a04d30ab8f297248cdff78a74f64ab6cf135f7d85ab119fa1ebb6f7269dde

data/lib/mailjet/resource.rb

@@ -245,22 +245,24 @@ module Mailjet
 
     def save(options)
       if persisted?
+        # case where the entity is updated
         response = connection(options)[attributes[:id]].put(formatted_payload, default_headers, options[:perform_api_call])
       else
+        # case where the entity is created
         response = connection(options).post(formatted_payload, default_headers, options[:perform_api_call])
       end
 
-      if options[:perform_api_call]
-        if self.resource_path == 'send/'
-          self.attributes = ActiveSupport::JSON.decode(response)
-          return true
+      if options[:perform_api_call] && !persisted?
+        # get attributes only for entity creation
+        self.attributes = if self.resource_path == 'send'
+          ActiveSupport::JSON.decode(response)
+        else
+          parse_api_json(response).first
         end
-
-        self.attributes = parse_api_json(response).first
-        return true
-      else
-        return true
       end
+
+      return true
+
     rescue Mailjet::ApiError => e
       if e.code.to_s == "304"
         return true # When you save a record twice it should not raise error
@@ -280,8 +282,19 @@ module Mailjet
     end
 
     def update_attributes(attribute_hash = {}, options = {})
-      self.attributes = attribute_hash
-      save(options)
+      self.attributes.deep_merge!(attribute_hash) do |key, old, new|
+        if old.is_a?(Array) && new.is_a?(Array)
+          # uniqueness of hashes based on their value of "Name"
+          (new + old).uniq do |data|
+            data["Name"]
+          end
+        else
+          new
+        end
+      end
+
+      opts = self.class.change_resource_path(options)
+      save(opts)
     end
 
     def delete(call)

data/lib/mailjet/version.rb

@@ -1,3 +1,3 @@
 module Mailjet
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

metadata

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