effective_mailchimp 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97b4b38c36740c956c5a4451f76b467ea3847337782f7382775679fbc88c7328
-  data.tar.gz: 1c0009621964610dc09e07eb05f10bf6449639abe67e1832b2c24502e13d6176
+  metadata.gz: 66bc41e595203956e8013eed736d6664071e4d127f4c9e6cbe7ddeffa8767ab8
+  data.tar.gz: 10b66d021fd0a4fad1f1fdf99a3262cae368a67f71d66846e9513496157eb5b7
 SHA512:
-  metadata.gz: ab11764ba1468abb17b0a2538fe54358cb4a2b6685744a2e70e9967b14749856d5ef3dcfe1f75c86cdd2ffd71a4f6d5f45c4a29f36d7630bd0595bdce42f422c
-  data.tar.gz: d7ec09359013c47fa3cab0dbdb846e628406ae5bfad9ed7d8f9d9d26da992d73cfb5a9a69e08d5d82cc156a60c4d56ac10df8577c3d334e070aa057863b6d9e6
+  metadata.gz: 9bbee49aacdc23722219b5070cc536b3175a137802d06e63528145f4d039db06250d39fddda39e6b8ed26195fd5e65fc0a19c77c279034bea139aa0eec20f738
+  data.tar.gz: 1ab7156edf277c617c2a2810bb97e5f33293727c0fa4f30d1be33f95e949641873c241890cabc10df4dbebdc936797cf0d187a8cd0f3bcbcd5f95d4b90559305

data/app/models/concerns/effective_mailchimp_user.rb

@@ -16,7 +16,7 @@ module EffectiveMailchimpUser
     def effective_mailchimp_user?; true; end
 
     def require_mailchimp_update_fields
-      ['email', 'last_name', 'first_name']
+      ['id', 'email', 'last_name', 'first_name']
     end
   end
 
@@ -33,10 +33,14 @@ module EffectiveMailchimpUser
       includes(mailchimp_list_members: [:mailchimp_list])
     }
 
+    # A new user is created
+    after_commit(on: [:create], if: -> { EffectiveMailchimp.api_present? }, unless: -> { EffectiveMailchimp.supressed? || @mailchimp_member_update_enqueued }) do
+      mailchimp_subscribe_to_force_subscribe!
+    end
+
     # The user updated the form
-    after_commit(if: -> { mailchimp_member_update_required? }, unless: -> { EffectiveMailchimp.supressed? || @mailchimp_member_update_enqueued }) do
-      @mailchimp_member_update_enqueued = true
-      EffectiveMailchimpUpdateJob.perform_later(self) # This calls user.mailchimp_update! on the background
+    after_commit(on: [:update], if: -> { mailchimp_member_update_required? }, unless: -> { EffectiveMailchimp.supressed? || @mailchimp_member_update_enqueued }) do
+      mailchimp_update_async!
     end
   end
 
@@ -257,6 +261,14 @@ module EffectiveMailchimpUser
     save!
   end
 
+  # Subscribe to force_subscribe lists
+  def mailchimp_subscribe_to_force_subscribe!
+    mailchimp_lists = Effective::MailchimpList.where(force_subscribe: true).to_a
+    return unless mailchimp_lists.present?
+
+    mailchimp_subscribe!(mailchimp_lists)
+  end
+
   private
 
   def mailchimp_with_retries(retries: 3, wait: 2, &block)
@@ -274,6 +286,8 @@ module EffectiveMailchimpUser
   end
 
   def mailchimp_member_update_required?
+    return false unless EffectiveMailchimp.api_present?
+
     return false unless mailchimp_user_form_action
     return false if self.class.respond_to?(:effective_memberships_user) && membership&.mailchimp_membership_update_required?
 

data/app/models/effective/mailchimp_api.rb

@@ -159,7 +159,7 @@ module Effective
       payload = {
         email_address: member.user.email,
         status: (member.subscribed ? 'subscribed' : 'unsubscribed'),
-        merge_fields: merge_fields.delete_if { |k, v| v.blank? },
+        merge_fields: merge_fields.transform_values { |value| value || '' },
         interests: member.interests_hash.presence
       }.compact
     end

data/lib/effective_mailchimp/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMailchimp
-  VERSION = '0.10.0'.freeze
+  VERSION = '0.11.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-11 00:00:00.000000000 Z
+date: 2024-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails