effective_mailchimp 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 535f050cd4e6f5a4419ddecb931c864f2f0461b936a822db66631619ba1ed3f1
-  data.tar.gz: 7410b8b797f397bdecbcad0bddb78fe43a7779f07aa858ec710a5489063c2ac7
+  metadata.gz: 42b138c379e2bef73c47ff7dfdf53ed004505b0e892ff407a16558cfa2deac4b
+  data.tar.gz: 199f1d58e6f32d182c80cfd5be9d4ca970bbf828944820563af7319126ce6ea0
 SHA512:
-  metadata.gz: 59c142b817e13988549b669eb9c73419f090e751c106b6b50e9d0978e810161dcba11dffd0fdc22220de93754dd38e1bedf890905d640f988c8485b882749d2a
-  data.tar.gz: 0643a72575207d3e4e0a5aa5f78e92c0e46386e617b3a2c400764b99f8a5a8f501891dc6ace45c373c702d18da5fad3af53b018ee0a314890457766e23bfb9d9
+  metadata.gz: 55ffa0423f7a02d94d3f74113b9139f44e71943b9748a82106d54c3ddf93abf26057c86755fec0a1a058e1706052aad79e4100066e7cc8fe0c3c9560331c61d5
+  data.tar.gz: 6306b88940c840bf58f099436362e0c386e440ac1e511e42c088a163f8cdc322b8597e30c9554b95f54e0a93fccf0f639c7b63f323475a7a19e7e6ca63aaa412

data/app/models/concerns/effective_mailchimp_user.rb

@@ -188,12 +188,20 @@ module EffectiveMailchimpUser
     assign_attributes(mailchimp_user_form_action: nil)
 
     mailchimp_list_members.each do |member|
-      if member.mailchimp_id.blank? && member.subscribed?
-        list_member = api.list_member_add(member)
-        member.assign_mailchimp_attributes(list_member) if list_member.present?
-      elsif member.mailchimp_id.present?
-        list_member = api.list_member_update(member)
+      begin
+        list_member = if member.mailchimp_id.blank? && member.subscribed?
+          api.list_member_add(member)
+        elsif member.mailchimp_id.present?
+          api.list_member_update(member)
+        end
+
         member.assign_mailchimp_attributes(list_member) if list_member.present?
+      rescue MailchimpMarketing::ApiError => e
+        if e.to_s.downcase.include?("cannot be subscribed") || e.to_s.downcase.include?('deleted')
+          member.assign_mailchimp_cannot_be_subscribed
+        else
+          raise(e)
+        end
       end
     end
 

data/app/models/effective/mailchimp_api.rb

@@ -94,13 +94,7 @@ module Effective
         merge_fields: merge_fields.delete_if { |k, v| v.blank? }
       }
 
-      begin
-        client.lists.add_list_member(member.mailchimp_list.mailchimp_id, payload)
-      rescue MailchimpMarketing::ApiError => e
-        return false if e.status == 400 && e.to_s.downcase.include?("member in compliance state")
-        raise(e)
-      end
-
+      client.lists.add_list_member(member.mailchimp_list.mailchimp_id, payload)
     end
 
     def list_member_update(member)

data/app/models/effective/mailchimp_list_member.rb

@@ -14,7 +14,12 @@ module Effective
       email_address   :string
       full_name       :string
 
-      subscribed      :boolean
+      # We set this on our side to update mailchimp and subscribe the user
+      subscribed              :boolean
+
+      # This one is generated by the MailchimpMarketing::ApiError
+      # They unsubscribed and there's nothing we can do about it.
+      cannot_be_subscribed    :boolean # Member is in Compliance State
 
       last_synced_at  :datetime
 
@@ -45,6 +50,14 @@ module Effective
       )
     end
 
+    def assign_mailchimp_cannot_be_subscribed
+      assign_attributes(
+        subscribed: false,
+        cannot_be_subscribed: true,
+        last_synced_at: Time.zone.now
+      )
+    end
+
     def synced?
       last_synced_at.present?
     end

data/app/views/effective/mailchimp_user/_fields.html.haml

@@ -9,8 +9,11 @@
 
   - if mailchimp_list.force_subscribe?
     %p
-      = fmlm.check_box :subscribed, label: fmlm.object.to_s, disabled: true, hint: 'required', checked: true
-      = fmlm.hidden_field :subscribed, value: true
+      - if fmlm.object.cannot_be_subscribed?
+        = fmlm.check_box :subscribed, label: fmlm.object.to_s, disabled: true, hint: 'required but unsubscribed', checked: false
+      - else
+        = fmlm.check_box :subscribed, label: fmlm.object.to_s, disabled: true, hint: 'required', checked: true
+        = fmlm.hidden_field :subscribed, value: true
 
   - elsif mailchimp_list.can_subscribe?
     %p

data/db/migrate/101_create_effective_mailchimp.rb

@@ -23,7 +23,8 @@ class CreateEffectiveMailchimp < ActiveRecord::Migration[6.0]
       t.string :email_address
       t.string :full_name
 
-      t.boolean :subscribed
+      t.boolean :subscribed, default: false
+      t.boolean :cannot_be_subscribed, default: false
 
       t.datetime :last_synced_at
 

data/lib/effective_mailchimp/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMailchimp
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.5.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-01 00:00:00.000000000 Z
+date: 2024-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Subscribe and unsubscribe to mailchimp lists.