effective_memberships 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32668e9dd393f60b922e5133dccf0204b0506f6a6fcff74f955be98e417b9398
-  data.tar.gz: 9b15d17b3e60142c3db939e1ecedd92a028540fb20234443a2c46be8e7427dea
+  metadata.gz: 38134acc9619d9ea0404332803f0c17535fee985688ddcc628db39c1cbf9987c
+  data.tar.gz: 781c42e6cdeb6c501aa696c1a13bc9917db90c5090b05a845754b2547b4a9689
 SHA512:
-  metadata.gz: b91b4b36706dce52f0fb43962a87977163364adcc0fb453d494f1e05895bf9e8edc737cf8a10df51d6cf5cf8da415957f0239ae1ef57de5425471bb68dc35e04
-  data.tar.gz: 14f41d1145244e763dab621c0db7cbfbea2e0ee2a5ad88eceaf953da5634a19ba562e44aff38557561a5ed60a6aee6d758b1c980180652fbba9d673f4b56241e
+  metadata.gz: 6ea602b5671e84066f96d77d996c08f6524ff46659ff1ede3b0b730a133c95693aa83b1e4dbf837b06f271c8d01ee73fa9c1c44528a2fd4bb3b3e10123e60888
+  data.tar.gz: dc6909b2b20ef4db2200be6cd8bcbf2bcc2ea5492e2c745ae64b48158b4092b78db8305b43d0ae46f2fa800e41767bbb1faf9ad13a9547b0676b3dd8ff283520

data/app/mailers/effective/memberships_mailer.rb

@@ -1,9 +1,10 @@
 module Effective
   class MembershipsMailer < EffectiveMemberships.parent_mailer_class
-    include EffectiveEmailTemplatesMailer
+
+    include EffectiveEmailTemplatesMailer if EffectiveMemberships.use_effective_email_templates
 
     default from: -> { EffectiveMemberships.mailer_sender }
-    layout -> { EffectiveMemberships.mailer_layout || 'effective_memberships_mailer_layout' }
+    layout -> { EffectiveMemberships.mailer_layout }
 
     def applicant_completed(resource, opts = {})
       @assigns = assigns_for(resource)

data/config/effective_memberships.rb

@@ -26,27 +26,20 @@ 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
+
+  # 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.12'
+  VERSION = '0.3.13'
 end

data/lib/effective_memberships.rb

@@ -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.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-02 00:00:00.000000000 Z
+date: 2022-03-03 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