effective_memberships 0.3.11 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8200c84934681ed1e13ce23e75bf061f58e0f83f4549be02de3efdadf4f31c6e
-  data.tar.gz: e09fda17565f145d34ccc7c18674159b943170a150a6798da453884fecc61372
+  metadata.gz: fa55f7742a08e8756e0b3db669d79875ac368f92c0b0363a04975ce1aa201b13
+  data.tar.gz: 5b664867bf6a689067f160141f0718b376b5b98f03be4dfa927ee285f295111e
 SHA512:
-  metadata.gz: 15f1850e5b6aa9cc4124f49a1dd2ea8599222d2fbe54053d63b5bcc6171a3abfd9f551932d72eef79232024d7a04b93390c16fed8a57836e04ea3fea85011511
-  data.tar.gz: 4a317ace51abee560000072f05426b38175900a56a2f0c31eede63207fa3b4edf6845608093b1d77eb47c9118c7f641031e68806e2b96c76b9f4edba6525440d
+  metadata.gz: 4a9dbe5ec6aec0b9fd1a5e446aa36cede071772da8bc2ac801316224b92c61fcd4807704da4c69ae65135ef48861abf82328d3ed2113970b5cf6a7a6015e3493
+  data.tar.gz: 3b94e9838b8a70f9e18f0924ff6d8d67d9554a2c091181114d09e8a5bd714712a3daabc23a243bc3a1e373083f15c861557bcbd1a915b009225518b158daf195

data/app/mailers/effective/memberships_mailer.rb

@@ -1,41 +1,61 @@
 module Effective
   class MembershipsMailer < EffectiveMemberships.parent_mailer_class
-    include EffectiveEmailTemplatesMailer
 
-    default from: -> { EffectiveMemberships.mailer_sender }
-    layout -> { EffectiveMemberships.mailer_layout || 'effective_memberships_mailer_layout' }
+    include EffectiveMailer
+    include EffectiveEmailTemplatesMailer if EffectiveMemberships.use_effective_email_templates
 
     def applicant_completed(resource, opts = {})
       @assigns = assigns_for(resource)
-      mail(to: resource.owner.email, **headers_for(resource, opts))
+      @applicant = resource
+
+      subject = subject_for(__method__, 'Applicant Completed', resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: resource.owner.email, subject: subject, **headers)
     end
 
     def applicant_missing_info(resource, opts = {})
       @assigns = assigns_for(resource)
-      mail(to: resource.owner.email, **headers_for(resource, opts))
+      @applicant = resource
+
+      subject = subject_for(__method__, 'Applicant Missing Info', resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: resource.owner.email, subject: subject, **headers)
     end
 
     def applicant_approved(resource, opts = {})
       @assigns = assigns_for(resource)
-      mail(to: resource.owner.email, **headers_for(resource, opts))
+      @applicant = resource
+
+      subject = subject_for(__method__, 'Applicant Approved', resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: resource.owner.email, subject: subject, **headers)
     end
 
     def applicant_declined(resource, opts = {})
       @assigns = assigns_for(resource)
-      mail(to: resource.owner.email, **headers_for(resource, opts))
+      @applicant = resource
+
+      subject = subject_for(__method__, 'Applicant Declined', resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: resource.owner.email, subject: subject, **headers)
     end
 
     def applicant_reference_notification(resource, opts = {})
       @assigns = assigns_for(resource)
-      mail(to: resource.email, **headers_for(resource, opts))
-    end
+      @applicant_reference = resource
 
-    protected
+      subject = subject_for(__method__, 'Reference Requested', resource, opts)
+      headers = headers_for(resource, opts)
 
-    def headers_for(resource, opts = {})
-      resource.respond_to?(:log_changes_datatable) ? opts.merge(log: resource) : opts
+      mail(to: resource.email, subject: subject, **headers)
     end
 
+    protected
+
     def assigns_for(resource)
       if resource.class.respond_to?(:effective_memberships_applicant?)
         return applicant_assigns(resource).merge(user_assigns(resource.owner))

data/app/models/concerns/effective_memberships_owner.rb

@@ -56,7 +56,9 @@ module EffectiveMembershipsOwner
     owners = organizations if self.class.respond_to?(:effective_organizations_user?)
     owners = users if self.class.respond_to?(:effective_organizations_organization?)
 
-    owners = Array(owners).reject { |owner| owner.try(:archived?) }
+    owners = Array(owners)
+      .select { |owner| owner.class.respond_to?(:effective_memberships_owner?) }
+      .reject { |owner| owner.try(:archived?) }
 
     owners.presence || [self]
   end
@@ -73,7 +75,11 @@ module EffectiveMembershipsOwner
 
   def organization_membership_present?(except: nil)
     return false unless self.class.respond_to?(:effective_organizations_user?)
-    organizations.any? { |organization| organization != except && organization.membership_present? }
+
+    organizations
+      .select { |organization| organization.class.respond_to?(:effective_memberships_owner?) }
+      .reject { |organization| organization.try(:archived?) }
+      .any? { |organization| organization != except && organization.membership_present? }
   end
 
   def assign_member_role

data/config/effective_memberships.rb

@@ -26,27 +26,21 @@ EffectiveMemberships.setup do |config|
   # When false, hide the reviewed state entirely
   # config.applicant_reviews = false
 
-  # Mailer Configuration
+  # Mailer Settings
+  # Please see config/initializers/effective_resources.rb for default effective_* gem mailer settings
+  #
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Effective::MembershipsMailer'
-
-  # Configure the parent class responsible to send e-mails.
-  # config.parent_mailer = 'ActionMailer::Base'
-
-  # Default deliver method
-  # config.deliver_method = :deliver_later
-
-  # Default layout
-  # config.mailer_layout = 'effective_memberships_mailer_layout'
-
-  # Default From
-  config.mailer_sender = "no-reply@example.com"
-
-  # Send Admin correspondence To
-  config.mailer_admin = "admin@example.com"
-
-  # Will work with effective_email_templates gem:
-  # - The audit and audit review email content will be preopulated based off the template
-  # - Uses an EmailTemplatesMailer mailer instead of ActionMailer::Base for default parent_mailer
-  config.use_effective_email_templates = false
+  #
+  # Override effective_resource mailer defaults
+  #
+  # config.parent_mailer = nil      # The parent class responsible for sending emails
+  # config.deliver_method = nil     # The deliver method, deliver_later or deliver_now
+  # config.mailer_layout = nil      # Default mailer layout
+  # config.mailer_sender = nil      # Default From value
+  # config.mailer_admin = nil       # Default To value for Admin correspondence
+  # config.mailer_subject = nil     # Proc.new method used to customize Subject
+
+  # Will work with effective_email_templates gem
+  config.use_effective_email_templates = true
 end

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.3.11'
+  VERSION = '0.3.14'
 end

data/lib/effective_memberships.rb

@@ -10,7 +10,7 @@ module EffectiveMemberships
       :category_class_name, :applicant_class_name, :applicant_review_class_name, :fee_payment_class_name, :registrar_class_name, :membership_card_class_name,
       :additional_fee_types, :applicant_reviews,
       :layout,
-      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :use_effective_email_templates
+      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject, :use_effective_email_templates
     ]
   end
 
@@ -50,17 +50,6 @@ module EffectiveMemberships
     mailer&.constantize || Effective::MembershipsMailer
   end
 
-  def self.parent_mailer_class
-    return parent_mailer.constantize if parent_mailer.present?
-
-    if use_effective_email_templates
-      require 'effective_email_templates'
-      Effective::EmailTemplatesMailer
-    else
-      ActionMailer::Base
-    end
-  end
-
   def self.fee_types
     required = ['Applicant', 'Prorated', 'Discount', 'Renewal', 'Late', 'Admin']
     additional = Array(additional_fee_types)
@@ -73,21 +62,4 @@ module EffectiveMemberships
     ['Admin']
   end
 
-  def self.send_email(email, *args)
-    raise('expected args to be an Array') unless args.kind_of?(Array)
-
-    if defined?(Tenant)
-      tenant = Tenant.current || raise('expected a current tenant')
-      args.last.kind_of?(Hash) ? args.last.merge!(tenant: tenant) : args << { tenant: tenant }
-    end
-
-    deliver_method = EffectiveMemberships.deliver_method || EffectiveResources.deliver_method
-
-    begin
-      EffectiveMemberships.mailer_class.send(email, *args).send(deliver_method)
-    rescue => e
-      raise if Rails.env.development? || Rails.env.test?
-    end
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.14
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2022-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -410,7 +410,6 @@ files:
 - app/views/effective/memberships_mailer/applicant_declined.liquid
 - app/views/effective/memberships_mailer/applicant_missing_info.liquid
 - app/views/effective/memberships_mailer/applicant_reference_notification.liquid
-- app/views/layouts/effective_memberships_mailer_layout.html.haml
 - config/effective_memberships.rb
 - config/routes.rb
 - db/migrate/01_create_effective_memberships.rb.erb

data/app/views/layouts/effective_memberships_mailer_layout.html.haml

@@ -1,7 +0,0 @@
-!!!
-%html{style: 'background: #fff;'}
-  %head
-    %meta{:content => 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type'}
-
-  %body{style: 'background: #fff;'}
-    = yield