maropost 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 959764ab2655a270baa41118e055d4aa0dbf3793
-  data.tar.gz: 6ab1aa5bade2a4a01811d0a0c404f04e1734d5a3
+  metadata.gz: ab774a3e10205f14b11eb4d32cd6a0f6f90fd47e
+  data.tar.gz: b4141781b430fe4b4d2549db902c87d41de05d5c
 SHA512:
-  metadata.gz: a7a86cd7b151395ca9a03342879058ebd048bc40377c6237c32307cf0c68420917c7a790f1da8d4c930eecf13263eaef07ad92b6943af1d2573ae12ac1e448b1
-  data.tar.gz: 4a60abc715f41ebb41c66927e6a5a3b930c14859c37210df40eef4814fe57e7391cdf9e70e54cd23214ed11c423daf456a684fee8c43df0c618e70aa13f1b114
+  metadata.gz: 0364c6faffd676812f234bc804537969a9f975e8a4fbe9de74f635268f670ec93b7343f2ae149f057f8a80e2dcb5f37925193c7bc4178f9f90b43f0a6f3d192c
+  data.tar.gz: 0d72e7397284499d31c21c99ab640b14f70a0e83e1f079b013c50f86541788ad8db5fe0813bcf6ebe71e808e1aea066202fb9722d3824115ec21de0ee20922b8

data/lib/maropost/api.rb

@@ -54,18 +54,35 @@ module Maropost
       end
 
       def change_email(old_email, new_email)
-        contact = find(old_email)
+        old_email_contact = find(old_email)
+        new_email_contact = find(new_email)
 
-        if contact.present?
-          contact.email = new_email
-          contact = update(contact)
-        end
+        contact = update_email(old_email_contact, new_email_contact, new_email)
+
+        update_do_not_mail_list(contact) if contact
 
         contact
       end
 
       private
 
+      def update_email(old_contact, new_contact, new_email)
+        contact = nil
+
+        if old_contact.present? && new_contact.present?
+          new_contact = new_contact.merge_settings(old_contact)
+          contact = update(new_contact)
+          Maropost::DoNotMailList.create(old_contact)
+        elsif old_contact.present?
+          old_contact.email = new_email
+          contact = update(old_contact)
+        elsif new_contact.present?
+          contact = update(new_contact)
+        end
+
+        contact
+      end
+
       def create_or_update_payload(contact)
         {
           contact: {

data/lib/maropost/contact.rb

@@ -53,6 +53,18 @@ module Maropost
       { cell_phone_number: cell_phone_number }.merge(lists)
     end
 
+    def merge_settings(old_contact)
+      self.phone_number = old_contact.phone_number
+      self.cell_phone_number = old_contact.cell_phone_number
+      self.allow_emails = old_contact.allow_emails
+
+      lists.each do |list|
+        lists[list] == '1' ? list : old_contact.lists[list]
+      end
+
+      self
+    end
+
     private
 
     def initialize_lists(opts = {})

data/lib/maropost/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Maropost
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maropost
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Michael van den Beuken
@@ -19,7 +19,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-09 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client