effective_mailchimp 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeb420fedb9cb1cd9ef0454773d4daf4e1b738e472ad5154226bb3ba299f7010
-  data.tar.gz: 35faa4bdbd56036558bf3ebf5c3bce35a8eb37eb3eab17b123449fc56f60dd16
+  metadata.gz: 57f2e87a71e74c97178552f620fa255eb992d7ba6329681f283c140205c7b991
+  data.tar.gz: 0b4a7b098353735f7aae1dbf7cb857477fdd780f1fef3f15ea1318f4383ff434
 SHA512:
-  metadata.gz: 6c888569b99ed7d9474706235698af874c54edca6a3b13a53e449f0a03ca9d2e64099b642b640959ad5100b5964ef06f873739c853f6e11daeb05a33b99ef93f
-  data.tar.gz: f50fc3d24091a2f58a2361b015e4329c21be5846081f9d660b9e6c00c017171952324a3e7f37c56b00f49b012e80ea97a1127f5ae7c26bd51c64d6cf7f6534e8
+  metadata.gz: ac169326fba074be7af97f386d93edb215220bce91750fa8e410487d601ae7f91e496aa7b4bdcda0a290d216a0cf0ef0e80639cdd8176d2f62c7fc7690891e1f
+  data.tar.gz: 06edb4d4261b098133462d263fe1ec6f12d327668eba7d81a8eb765d2b8dc53352d4e71ebd5317c08a7f3d5c95c0c67ebefd5d95c08279550ad0e51063820cf0

data/app/models/concerns/effective_mailchimp_user.rb

@@ -50,18 +50,21 @@ module EffectiveMailchimpUser
 
   # Api method to just subscribe this user to this list right now
   # Pass one list or an Array of lists
-  def mailchimp_subscribe!(mailchimp_list)
+  def mailchimp_subscribe!(mailchimp_list, subscribed: true, now: false)
     mailchimp_lists = Array(mailchimp_list)
     raise('expected a MailchimpList') unless mailchimp_lists.all? { |list| list.kind_of?(Effective::MailchimpList) }
 
     mailchimp_lists.each do |mailchimp_list|
       member = build_mailchimp_list_member(mailchimp_list: mailchimp_list)
-      member.assign_attributes(subscribed: true)
+      member.assign_attributes(subscribed: subscribed)
     end
 
     # This sets up the after_commit to run the mailchimp_update! job
     assign_attributes(mailchimp_user_form_action: true)
 
+    # For use in a rake task. Run the update right now
+    mailchimp_update! if now
+
     save!
   end
 
@@ -113,6 +116,8 @@ module EffectiveMailchimpUser
     end
 
     if respond_to?(:membership)
+      membership = memberships.first() # Individual or organization membership
+
       atts.merge!(
         'CATEGORY': membership&.categories&.to_sentence,
         'STATUS': membership&.statuses&.to_sentence,
@@ -121,6 +126,13 @@ module EffectiveMailchimpUser
       )
     end
 
+    if self.class.respond_to?(:effective_memberships_organization_user?)
+      atts.merge!(
+        'COMPANY': representatives.map { |rep| rep.organization.to_s }.join(', ').presence,
+        'ROLES': representatives.flat_map { |rep| rep.roles }.compact.join(', ').presence,
+      )
+    end
+
     atts
   end
 
@@ -197,7 +209,7 @@ module EffectiveMailchimpUser
 
         member.assign_mailchimp_attributes(list_member) if list_member.present?
       rescue MailchimpMarketing::ApiError => e
-        if e.to_s.downcase.include?("cannot be subscribed")
+        if e.to_s.downcase.include?("cannot be subscribed") || e.to_s.downcase.include?('deleted')
           member.assign_mailchimp_cannot_be_subscribed
         else
           raise(e)

data/lib/effective_mailchimp/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMailchimp
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-15 00:00:00.000000000 Z
+date: 2024-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails