effective_mailchimp 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a07cfa0848bd0afa0554d8b0e28cd0693d1313c96fc71f389e6004271a3c15c5
-  data.tar.gz: 6ee97205509d1245c04a35a9bc5f0d403ba80f010b1199aa7abcdee174b5b951
+  metadata.gz: 90147038e4ce23be0ac4eb2b378ffa9e7cc6fd062c6edfe9fb347d5ea54d3cae
+  data.tar.gz: facdabf1858a42c52610ae372e45ac1e7690a9e0ca81aea49783fd160ce7b119
 SHA512:
-  metadata.gz: 45a62c470f53e14ae07423aed2384d4123470f268d2af736182618888bd7cc65c0b54a69c9972a16ef2d026e1b82230a80ad79029bcbabba6598bb9bffcb350b
-  data.tar.gz: 1af0cf34cb91cd0041573647b5d67ea9d4439fe0c74e9bb2543a6c93c0cd8b59c8f840dc3d1722bcef598ba10eec5486097e1dcdea0b6a030235eb9534b58332
+  metadata.gz: 5574df9502656c67d8a2c3b4c5a42efe58b3000f4b35a50491db5edaf560888ad07ebdb4835e143f9fa203b1c861afdb483148b548be3a6013cb293ee4446a0f
+  data.tar.gz: 9e7f4438f4d049e0a729b7bbb3fa89bac38755f065f5ca50374c5a0f750a65077462bdd8f3601e4b273f7dc2b27acc12b680ba4eccd1e484a706fa08d19f27c3

data/app/models/concerns/effective_mailchimp_user.rb

@@ -248,19 +248,17 @@ module EffectiveMailchimpUser
         member.assign_mailchimp_attributes(list_member) if list_member.present?
       rescue MailchimpMarketing::ApiError => e
         message = e.to_s.downcase
+        compliance_error = e.status == 400 && message.include?('member in compliance state')
 
-        if message.include?("cannot be subscribed") || message.include?("deleted") || message.include?("unsubscribed") || message.include?("archived") || message.include?("cleaned")
+        if compliance_error || message.include?("cannot be subscribed") || message.include?("deleted") || message.include?("unsubscribed") || message.include?("archived") || message.include?("cleaned")
           member.assign_mailchimp_cannot_be_subscribed
-        elsif message.include?("already a list member") || message.include?("already in this list")
-          existing = api.list_member(member.mailchimp_list, member.user.email)
-          member.assign_mailchimp_attributes(existing) if existing.present?
         elsif message.include?("could not be found")
           # Nothing to do
         else
           # Nothing to do.
         end
 
-        if !EffectiveMailchimp.silence_api_errors?
+        if !EffectiveMailchimp.silence_api_errors? && !compliance_error
           EffectiveResources.send_error(e, user_id: id || 'nil')
         end
 

data/app/models/effective/mailchimp_api.rb

@@ -3,6 +3,7 @@
 # https://mailchimp.com/developer/marketing/api/
 
 require 'MailchimpMarketing'
+require 'digest'
 
 module Effective
   class MailchimpApi
@@ -92,8 +93,9 @@ module Effective
       Rails.logger.info "[effective_mailchimp] Get List Member" if debug?
 
       begin
-        client.lists.get_list_member(id.try(:mailchimp_id) || id, email)
+        client.lists.get_list_member(id.try(:mailchimp_id) || id, subscriber_hash(email))
       rescue MailchimpMarketing::ApiError => e
+        raise unless e.status == 404
         {}
       end
     end
@@ -128,8 +130,17 @@ module Effective
       return if sandbox_mode?
 
       # Actually add or update
-      payload = list_member_payload(member)
-      client.lists.set_list_member(member.mailchimp_list.mailchimp_id, member.email, payload)
+      payload = list_member_payload(member).merge(status_if_new: (member.subscribed? ? 'subscribed' : 'unsubscribed'))
+      list_id = member.mailchimp_list.mailchimp_id
+      hash = subscriber_hash(member.user.email)
+
+      begin
+        client.lists.set_list_member(list_id, hash, payload)
+      rescue MailchimpMarketing::ApiError => e
+        raise unless e.status == 400 && e.to_s.include?('Member Exists')
+
+        client.lists.update_list_member(list_id, hash, payload.except(:status_if_new))
+      end
     end
 
     def list_member_update(member)
@@ -139,7 +150,8 @@ module Effective
       return if sandbox_mode?
 
       payload = list_member_payload(member)
-      client.lists.update_list_member(member.mailchimp_list.mailchimp_id, member.email, payload)
+      hash = member.mailchimp_id.presence || subscriber_hash(member.email)
+      client.lists.update_list_member(member.mailchimp_list.mailchimp_id, hash, payload)
     end
 
     def list_member_payload(member)
@@ -156,5 +168,11 @@ module Effective
       }.compact
     end
 
+    def subscriber_hash(email)
+      raise('expected an email') unless email.to_s.include?('@')
+
+      Digest::MD5.hexdigest(email.to_s.strip.downcase)
+    end
+
   end
 end

data/lib/effective_mailchimp/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMailchimp
-  VERSION = '0.14.0'.freeze
+  VERSION = '0.15.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Code and Effect