maropost 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41defb7d262138dbba118f97eff436b079e10e2e
-  data.tar.gz: 76b093084e65ef9686eac90049407218934ee468
+  metadata.gz: a96b51fcc2cf29e3e393dee5c3e94b577add066b
+  data.tar.gz: e66ccd7a68abf57ad2e6e790884ef7f0278c2807
 SHA512:
-  metadata.gz: ab2429412117bf810f855ee73d2261881a68149d79b3b2419f9d9ac9b09eb369327e863b83146b8d182136adc01b6b99371132a515227d3e91a516117a7c5c64
-  data.tar.gz: a6934327a2cd254863573f4132fef86ff446477342a2f90d6f43c28fa139f19477284f8474e59bd708d1ca5a3bd9b699fb8de674be96c8cf426060a7292d0033
+  metadata.gz: 64d0a1efc1f82d8ba7ad4df2bb8cf6338c3f2d122bc9ebb4317c81e01af3fd1ae74ecda850c01f9863839a4849e37410e4b696dddc73d1130b63d25cd5d03cf7
+  data.tar.gz: d4c377258d87e1af223709719538b1fcd5b24eaa618d944d799d7b29ab35952f09a3eff21a6a2177d28d29ddba569c43fb7d1eca74086161d5b142322e3e7f3d

data/lib/maropost/api.rb

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

data/lib/maropost/contact.rb

@@ -3,7 +3,7 @@
 module Maropost
   class Contact
     ATTRIBUTES = %i[
-      do_not_contact
+      allow_emails
       id
       email
       phone_number
@@ -35,14 +35,14 @@ 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.allow_emails = data.fetch(:allow_emails) { !DoNotMailList.exists?(self) }
       self.errors = []
       self.lists = {}
       initialize_lists(data)
     end
 
     def allow_emails?
-      @allow_emails ||= email.present? && !do_not_contact && !DoNotMailList.exists?(self)
+      allow_emails
     end
 
     def subscribed_to_any_lists?

data/lib/maropost/do_not_mail_list.rb

@@ -14,9 +14,8 @@ module Maropost
         )
         response = JSON.parse(service.execute!.body)
         response['id'].present?
-      rescue RestClient::ResourceNotFound, RestClient::BadRequest => e
-        contact.errors << "Unexpected error occurred. Error: #{e.message}"
-        contact
+      rescue RestClient::ResourceNotFound, RestClient::BadRequest
+        false
       end
 
       def create(contact)
@@ -27,10 +26,8 @@ module Maropost
           payload: payload
         )
         service.execute!
-        contact
-      rescue RestClient::UnprocessableEntity, RestClient::BadRequest => e
-        contact.errors << "Unable to subscribe contact. Error: #{e.message}"
-        contact
+      rescue RestClient::UnprocessableEntity, RestClient::BadRequest
+        false
       end
 
       def delete(contact)
@@ -42,10 +39,8 @@ module Maropost
           }
         )
         service.execute!
-        contact
-      rescue RestClient::UnprocessableEntity, RestClient::BadRequest => e
-        contact.errors << "Unable to unsubscribe contact. Error: #{e.message}"
-        contact
+      rescue RestClient::UnprocessableEntity, RestClient::BadRequest
+        false
       end
     end
   end

data/lib/maropost/version.rb

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

metadata

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