effective_mailchimp 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b79356ccea893a1ee2ccc083ed29b747eabace0b22cda9bc78763ac9eff0874f
-  data.tar.gz: c5d7f907fdb4e8c7e038df057c8e3917a7f6aa85c12570cd81fed6c45b84f31d
+  metadata.gz: b1080e126c3adae745b754f92a4d54345e6d7b758c26d0b3bb96848a6776fe5f
+  data.tar.gz: 1e9e4262626919069be09aabe1b22cae71a1347441f6b7dce5c8d03edbad8c27
 SHA512:
-  metadata.gz: b1836f0b24aca7f3e1e46ee820ecf89b5755a892e64ddf96932c6d6098c3179af88ece786f46b7831e3eec8235b98eeb61baeec5d9d79e3c67f25db86a27cacd
-  data.tar.gz: 40d8c3c96f42ef42ce8876069440f541c38122aa833cbe127251fcc567603e184829b66c81a1582c3a91f949d5a7e270c3fc6e6bbbf2f59a0b5913ceaa4bdfe7
+  metadata.gz: cc048e3944864ecb187be8855c010bdd50f87f85f97c7a59f9e6e44261a507ffc7e81a96eb08967a96a8b92a3bc37dc0da2cb7b666a3b980d51d2be34db49253
+  data.tar.gz: 6cf8f0e6d611bdf1d57c1ea2312588622cbb14f121039a94e8d336ee5ef9ad9f6b21abf7768fabc65057267538b14b262cd9648e141bae85094c4c98ca2969ed

data/app/jobs/effective_mailchimp_update_job.rb

@@ -0,0 +1,8 @@
+class EffectiveMailchimpUpdateJob < ApplicationJob
+
+  def perform(user)
+    raise('expected an effective_mailchimp_user') unless user.class.try(:effective_mailchimp_user?)
+    user.mailchimp_update!(force: true)
+  end
+
+end

data/app/models/concerns/effective_mailchimp_user.rb

@@ -26,7 +26,9 @@ module EffectiveMailchimpUser
     accepts_nested_attributes_for :mailchimp_lists, allow_destroy: true
 
     # The user updated the form
-    after_commit(if: -> { mailchimp_user_form_action }) { mailchimp_update!(force: false) }
+    after_commit(if: -> { mailchimp_user_form_action }) do
+      EffectiveMailchimpUpdateJob.perform_later(self)
+    end
   end
 
   # Intended for app to extend
@@ -107,11 +109,13 @@ module EffectiveMailchimpUser
 
     return if lists.length == mailchimp_list_members.length && !(force || mailchimp_sync_required?)
 
-    lists.each do |mailchimp_list|
-      member = build_mailchimp_list_member(mailchimp_list: mailchimp_list)
+    Timeout::timeout(lists.length * 2) do
+      lists.each do |mailchimp_list|
+        member = build_mailchimp_list_member(mailchimp_list: mailchimp_list)
 
-      list_member = api.list_member(mailchimp_list, email) || {}
-      member.assign_mailchimp_attributes(list_member)
+        list_member = api.list_member(mailchimp_list, email) || {}
+        member.assign_mailchimp_attributes(list_member)
+      end
     end
 
     mailchimp_list_members.each do |member|

data/app/models/effective/mailchimp_api.rb

@@ -76,7 +76,7 @@ module Effective
       payload = {
         email_address: member.user.email,
         status: (member.subscribed ? 'subscribed' : 'unsubscribed'),
-        merge_fields: merge_fields
+        merge_fields: merge_fields.delete_if { |k, v| v.blank? }
       }
 
       client.lists.add_list_member(member.mailchimp_list.mailchimp_id, payload)
@@ -91,7 +91,7 @@ module Effective
       payload = {
         email_address: member.user.email,
         status: (member.subscribed ? 'subscribed' : 'unsubscribed'),
-        merge_fields: merge_fields.compact
+        merge_fields: merge_fields.delete_if { |k, v| v.blank? }
       }
 
       client.lists.update_list_member(member.mailchimp_list.mailchimp_id, member.email, payload)

data/lib/effective_mailchimp/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMailchimp
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-17 00:00:00.000000000 Z
+date: 2023-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -197,6 +197,7 @@ files:
 - app/controllers/admin/mailchimp_lists_controller.rb
 - app/datatables/admin/effective_mailchimp_lists_datatable.rb
 - app/helpers/effective_mailchimp_helper.rb
+- app/jobs/effective_mailchimp_update_job.rb
 - app/models/concerns/effective_mailchimp_user.rb
 - app/models/effective/mailchimp_api.rb
 - app/models/effective/mailchimp_list.rb