effective_email_templates 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b61c8d36a7412e96eef80c03fb75480a8da1de2156b67587d7fb88b24e85e7bd
-  data.tar.gz: dca4e0ccafebf84a7b19f78797854fbb98d1547e18d7a593b408f69ef6e3658c
+  metadata.gz: 8d32e71af524fb3658debbf8210a4239b4bbd98f7a806f0a743735e62bc135dc
+  data.tar.gz: f6064f01a1a679b3c4bf1abca99222ab4ba191d4bb0ee16a1ac23ddad644c368
 SHA512:
-  metadata.gz: 65426e9861152f2794e2817f70983fed0c9c918f3c24fd819f92aa1353fc28d122c4573b0c4e68ce8953d7dcb7ff5de170d38b6eab6969c71d77fa0ad6b0d75c
-  data.tar.gz: 9754add70dac2088baf9ee4c8b2fdb4e9f3f290043db9a9af358c323655e4f11d7f6aa0073506f4fe11b421c6f04fc650dd31ce58175d298cd1cbeb7664b4d57
+  metadata.gz: 360328a697866d2d802d7c882bcfbd9c0be6e148c0b6d98114417088af72b9ea74cc935d275b6396a8be64becd88749536f491b1cfcb0f953e8ab1c739ba276e
+  data.tar.gz: 5cad8e018ad138e6050278c36e39a69a631a06773bc8d87aeee9986a96b56de9ab3f491198634eea514126f30241a0536b2b8ccceb9721f5e6a7da928e7f0b63

data/app/mailers/concerns/effective_email_templates_mailer.rb

@@ -15,10 +15,11 @@ module EffectiveEmailTemplatesMailer
 
     # Parse subject content if explicitly given
     # Otherwise the :subject key is a default and should be ignored in favor of the email template subject instead
-    subject = assigns.delete(:subject)
-    subject ||= (headers[:subject] || headers['subject']) if (headers[:custom_subject] || headers['custom_subject'])
+    subject = assigns.delete(:subject) || headers[:subject] || headers['subject']
     email_template.subject = subject if subject.present?
 
+    # If the body or subject are nil, they will be populated from the email_template
+
     # Add any _url helpers
     assigns = route_url_assigns(email_template, assigns).merge(assigns)
 
@@ -26,7 +27,20 @@ module EffectiveEmailTemplatesMailer
     rendered = email_template.render(assigns)
 
     # Merge any other passed values
-    merged = rendered.merge(headers.except(:body, :subject, :custom_subject, 'body', 'subject', 'custom_subject'))
+    merged = rendered.merge(headers.except(:body, :subject, 'body', 'subject'))
+
+    # Finalize the subject_for Proc
+    if respond_to?(:subject_for) # EffectiveResourcesMailer
+      if (prefix = EffectiveResources.mailer_subject_prefix_hint).present?
+        subject = subject_for(action_name, merged[:subject], email_template, merged)
+
+        if subject.start_with?("#{prefix}#{prefix}") || subject.start_with?("#{prefix} #{prefix}")
+          subject = subject.sub(prefix, '')
+        end
+
+        merged[:subject] = subject
+      end
+    end
 
     super(merged)
   end

data/app/models/effective/email_template.rb

@@ -23,6 +23,7 @@ module Effective
 
     before_validation do
       self.content_type ||= CONTENT_TYPES.first
+      self.from ||= EffectiveEmailTemplates.mailer_froms.first
     end
 
     validates :body, liquid: true

data/app/views/admin/email_templates/_form.html.haml

@@ -4,11 +4,15 @@
   - if EffectiveEmailTemplates.select_content_type
     = f.select :content_type, Effective::EmailTemplate::CONTENT_TYPES
 
-  = f.select :from, EffectiveEmailTemplates.mailer_froms, hint: 'Please contact us to add additional sender addresses.'
+  = f.select :from, mailer_froms_collection(), hint: 'Please contact us to add additional sender addresses. Please refresh the page if this from address looks weird.'
   = f.text_field :cc
   = f.text_field :bcc
 
-  = f.text_field :subject, hint: 'The subject of your email'
+  - prefix_hint = EffectiveResources.mailer_subject_prefix_hint.to_s.strip.presence
+
+  = f.text_field :subject,
+    hint: (prefix_hint ? "The subject of your email. It will be automatically prefixed with #{prefix_hint}." : 'The subject of your email')
+
   = f.text_area :body, hint: 'The content of your email template', rows: 10
 
   .card

data/lib/effective_email_templates/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEmailTemplates
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_email_templates
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-25 00:00:00.000000000 Z
+date: 2023-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails