effective_mailchimp 0.13.3 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dbffbf79bcfa6f22f1fd8599abc18a84537380ae16bbf8da55368912d7308ca
-  data.tar.gz: 2bafa384fc879e4444e51710569eb5e91337d7d46228b7de4927d3f257a27a48
+  metadata.gz: 90147038e4ce23be0ac4eb2b378ffa9e7cc6fd062c6edfe9fb347d5ea54d3cae
+  data.tar.gz: facdabf1858a42c52610ae372e45ac1e7690a9e0ca81aea49783fd160ce7b119
 SHA512:
-  metadata.gz: '018a4244123fc004b0983d6bcd8aa658c6ca0ba3778b9959c373478af51d473ebc4634b912f5935db96afad46910efd46fe51b35b3956c246e8a07224f6197c8'
-  data.tar.gz: 66a53fc0e6142b267a323874712f859145720624f2ea9375867d024f0156ace6acaaf70b168bd712463bf56ec74de0d066870c1f452202577636a56042a7a15d
+  metadata.gz: 5574df9502656c67d8a2c3b4c5a42efe58b3000f4b35a50491db5edaf560888ad07ebdb4835e143f9fa203b1c861afdb483148b548be3a6013cb293ee4446a0f
+  data.tar.gz: 9e7f4438f4d049e0a729b7bbb3fa89bac38755f065f5ca50374c5a0f750a65077462bdd8f3601e4b273f7dc2b27acc12b680ba4eccd1e484a706fa08d19f27c3

data/app/datatables/admin/effective_mailchimp_list_members_datatable.rb

@@ -29,7 +29,7 @@ module Admin
       col :last_synced_at
 
       actions_col do |member|
-        dropdown_link_to('Edit', "/admin/users/#{member.user.to_param}/edit#tab-mailchimp", 'data-turbolinks': false)
+        dropdown_link_to('Edit', "/admin/users/#{member.user.to_param}/edit#tab-mailchimp", 'data-turbolinks': false, 'data-turbo': false)
       end
     end
 

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

@@ -76,14 +76,14 @@ module Effective
     def categories(list_id)
       Rails.logger.info "[effective_mailchimp] Index Interest Categories" if debug?
 
-      response = client.lists.get_list_interest_categories(list_id.try(:mailchimp_id) || list_id, count: 1000)
+      response = client.lists.get_list_interest_categories(list_id.try(:mailchimp_id) || list_id)
       Array(response['categories']) - [nil, '', {}]
     end
 
     def interests(list_id, category_id)
       Rails.logger.info "[effective_mailchimp] Index Interest Category Interests" if debug?
 
-      response = client.lists.list_interest_category_interests(list_id, category_id, count: 1000)
+      response = client.lists.list_interest_category_interests(list_id, category_id)
       Array(response['interests']) - [nil, '', {}]
     end
 
@@ -95,6 +95,7 @@ module Effective
       begin
         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,9 +129,18 @@ module Effective
       Rails.logger.info "[effective_mailchimp] Add List Member" if debug?
       return if sandbox_mode?
 
-      # Actually add or update. set_list_member applies status_if_new when the contact is new
-      payload = list_member_payload(member).merge(status_if_new: list_member_status(member))
-      client.lists.set_list_member(member.mailchimp_list.mailchimp_id, subscriber_hash(member.user.email), payload)
+      # Actually add or update
+      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)
@@ -152,21 +162,16 @@ module Effective
 
       payload = {
         email_address: member.user.email,
-        status: list_member_status(member),
+        status: (member.subscribed ? 'subscribed' : 'unsubscribed'),
         merge_fields: merge_fields.transform_values { |value| value || '' },
         interests: member.interests_hash.presence
       }.compact
     end
 
-    # Mailchimp identifies a list member by the MD5 hash of their lowercase email address
     def subscriber_hash(email)
       raise('expected an email') unless email.to_s.include?('@')
 
-      Digest::MD5.hexdigest(email.to_s.downcase.strip)
-    end
-
-    def list_member_status(member)
-      member.subscribed ? 'subscribed' : 'unsubscribed'
+      Digest::MD5.hexdigest(email.to_s.strip.downcase)
     end
 
   end

data/lib/effective_mailchimp/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: effective_mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.15.0
 platform: ruby
 authors:
 - Code and Effect
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -253,7 +252,6 @@ homepage: https://github.com/code-and-effect/effective_mailchimp
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -268,8 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 4.0.17
 specification_version: 4
 summary: Subscribe and unsubscribe to mailchimp lists.
 test_files: []