effective_mailchimp 0.10.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97b4b38c36740c956c5a4451f76b467ea3847337782f7382775679fbc88c7328
-  data.tar.gz: 1c0009621964610dc09e07eb05f10bf6449639abe67e1832b2c24502e13d6176
+  metadata.gz: ed0d9672a777f604ae9fabd3de41d47c623a8285bc20f406cd24cb03f363ecd0
+  data.tar.gz: 3f82c087cd92d5522dac3a3f10368199add11f848cf51ff4e9a83f1ec6b0ea2f
 SHA512:
-  metadata.gz: ab11764ba1468abb17b0a2538fe54358cb4a2b6685744a2e70e9967b14749856d5ef3dcfe1f75c86cdd2ffd71a4f6d5f45c4a29f36d7630bd0595bdce42f422c
-  data.tar.gz: d7ec09359013c47fa3cab0dbdb846e628406ae5bfad9ed7d8f9d9d26da992d73cfb5a9a69e08d5d82cc156a60c4d56ac10df8577c3d334e070aa057863b6d9e6
+  metadata.gz: 1a9f05f7d1d363360809299def2d0c57bf9c220bc0000d2a2ed2ae9c7cd864a10560b9ab48cbe56b7f6c8f2bb6726cc11648d297abac45633513afe84882eea4
+  data.tar.gz: cc246424d5db654a52aa8831a78b916e16096ab2dd780117d33817a60cbf032f6436a09074ffb29053892113d3e1c89261d86387964271ed4c8d1412515c5c5a

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
 
@@ -233,6 +237,8 @@ module EffectiveMailchimpUser
   def mailchimp_update!(api: EffectiveMailchimp.api, only: [], except: [])
     assign_attributes(mailchimp_user_form_action: nil)
 
+    return if mailchimp_member_update_blocked?
+
     mailchimp_list_members.each do |member|
       next if only.present? && Array(only).exclude?(member.mailchimp_list)
       next if except.present? && Array(except).include?(member.mailchimp_list)
@@ -257,6 +263,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)
@@ -273,7 +287,14 @@ module EffectiveMailchimpUser
     end
   end
 
+  def mailchimp_member_update_blocked?
+    return false if try(:email).to_s.start_with?('user') && try(:email).to_s.end_with?('.site')
+    true
+  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.1'.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.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-11 00:00:00.000000000 Z
+date: 2025-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails