effective_email_templates 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70659c858db00ba3550202875f36f68c3fdc8f955cc0ec6c9c804d82cc45f809
-  data.tar.gz: bcbc544fa37ab446f1a8bc2ddaa88e6aceb96596018bb1b4fa30ade686fdbd7f
+  metadata.gz: b61c8d36a7412e96eef80c03fb75480a8da1de2156b67587d7fb88b24e85e7bd
+  data.tar.gz: dca4e0ccafebf84a7b19f78797854fbb98d1547e18d7a593b408f69ef6e3658c
 SHA512:
-  metadata.gz: c1f5c5322dfd9717ccd295e175c1406368398b6afa67454c9b568f80cad139924e4f8d0851c73e786edd1d80f81a08786c9b1ad3107620209b942c5463f8c671
-  data.tar.gz: b7c81a31ec4a001c626e0d586e98fc4f22c37b844f359f01578cc0148b69d6834788c4a16a3f739d4d3cec60f109d4d40eeca592ff551b04e418c8a18429be9c
+  metadata.gz: 65426e9861152f2794e2817f70983fed0c9c918f3c24fd819f92aa1353fc28d122c4573b0c4e68ce8953d7dcb7ff5de170d38b6eab6969c71d77fa0ad6b0d75c
+  data.tar.gz: 9754add70dac2088baf9ee4c8b2fdb4e9f3f290043db9a9af358c323655e4f11d7f6aa0073506f4fe11b421c6f04fc650dd31ce58175d298cd1cbeb7664b4d57

data/app/mailers/concerns/effective_email_templates_mailer.rb

@@ -9,21 +9,26 @@ module EffectiveEmailTemplatesMailer
 
     assigns = (@assigns || {})
 
-    # Parse assigns. Special keys for body and subject.
+    # Parse body content if given
     body = assigns.delete(:body) || headers[:body] || headers['body']
     email_template.body = body if body.present?
 
-    # Ignore the subject when passed in via mail method subject: key.
+    # 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'])
     email_template.subject = subject if subject.present?
 
     # Add any _url helpers
     assigns = route_url_assigns(email_template, assigns).merge(assigns)
 
-    # Render from the template, possibly with updated body
+    # Render from the template, possibly with updated body and subject
     rendered = email_template.render(assigns)
 
-    super(rendered.merge(headers.except(:body, :subject, 'body', 'subject')))
+    # Merge any other passed values
+    merged = rendered.merge(headers.except(:body, :subject, :custom_subject, 'body', 'subject', 'custom_subject'))
+
+    super(merged)
   end
 
   private

data/lib/effective_email_templates/importer.rb

@@ -53,7 +53,8 @@ module EffectiveEmailTemplates
         content.gsub(match[1], '').strip if match
       end
 
-      from = froms.find { |from| from.include?(attributes['from']) } || froms.first
+      from = froms.find { |from| from.include?(attributes['from']) } if attributes['from'].present?
+      from ||= froms.first
 
       email_template.assign_attributes(attributes)
       email_template.assign_attributes(from: from)

data/lib/effective_email_templates/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_email_templates
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Code and Effect