maropost 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa4796e02a8b14d6dc9d9cfafa879a2a9ca193af
-  data.tar.gz: bf551e4b26579e0183ad891af2a3a4a4476f4daf
+  metadata.gz: 41defb7d262138dbba118f97eff436b079e10e2e
+  data.tar.gz: 76b093084e65ef9686eac90049407218934ee468
 SHA512:
-  metadata.gz: d32697c99f8768a40913ab4637fa1a64aa33a9c95e1f88c6fddfedcfaf5234d864fb6e8e8eed48cc82d7485ba1aa2de02f523508373bbada8a58606dbc1d3173
-  data.tar.gz: 300107e26493f99c40001b45a6454a3a91303c846c5525c9d51f0f08563c2c9868b0e7d62350e17c9011ece32e3d398e6c20c7e1b4b1534f49eec5b22fc18246
+  metadata.gz: ab2429412117bf810f855ee73d2261881a68149d79b3b2419f9d9ac9b09eb369327e863b83146b8d182136adc01b6b99371132a515227d3e91a516117a7c5c64
+  data.tar.gz: a6934327a2cd254863573f4132fef86ff446477342a2f90d6f43c28fa139f19477284f8474e59bd708d1ca5a3bd9b699fb8de674be96c8cf426060a7292d0033

data/README.md

@@ -32,6 +32,7 @@ To create or update a contact in Maropost:
   Maropost::Api.update_subscriptions(
     Maropost::Contact.new(
       email: email,
+      do_not_contact: false, # or possibly true to opt in to the DoNotMailList
       ama_rewards: ama_rewards,
       ama_membership: ama_membership,
       ama_insurance: ama_insurance,
@@ -45,7 +46,7 @@ To create or update a contact in Maropost:
       ama_vr_reminder_email: ama_vr_reminder_email,
       ama_vr_reminder_sms: ama_vr_reminder_sms,
       ama_vr_reminder_autocall: ama_vr_reminder_autocall,
-      cell_phone_number: cell_phone_number.present? ? "1#{cell_phone_number}" : '',
+      cell_phone_number: cell_phone_number,
       phone: phone_number
     )
   )
@@ -65,4 +66,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/amaabc
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/lib/maropost/api.rb

@@ -20,11 +20,11 @@ module Maropost
       end
 
       def update_subscriptions(contact)
+        update_do_not_mail_list(contact)
         to_maropost(
           find(contact.email),
           contact
         )
-        update_do_not_mail_list(contact)
       end
 
       def create(contact)
@@ -75,7 +75,7 @@ module Maropost
       end
 
       def update_do_not_mail_list(contact)
-        if contact.subscribed_to_any_lists?
+        if contact.allow_emails? && contact.subscribed_to_any_lists?
           DoNotMailList.delete(contact)
         else
           DoNotMailList.create(contact)

data/lib/maropost/contact.rb

@@ -3,6 +3,7 @@
 module Maropost
   class Contact
     ATTRIBUTES = %i[
+      do_not_contact
       id
       email
       phone_number
@@ -34,11 +35,16 @@ module Maropost
       self.email = data[:email]
       self.phone_number = data[:phone]
       self.cell_phone_number = data[:cell_phone_number]
+      self.do_not_contact = data.fetch(:do_not_contact, false)
       self.errors = []
       self.lists = {}
       initialize_lists(data)
     end
 
+    def allow_emails?
+      @allow_emails ||= email.present? && !do_not_contact && !DoNotMailList.exists?(self)
+    end
+
     def subscribed_to_any_lists?
       lists.values.any? { |v| v == '1' }
     end

data/lib/maropost/version.rb

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

metadata

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