effective_email_templates 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4928f9db162ceb9b1b35fcbe367f38689be1f8977f75e46bff4e734c15f7ec90
-  data.tar.gz: 9129d4a60362284332fc2ab16685f0c325846dfe6f199cdd1e3924c974e3fb6e
+  metadata.gz: 1ea4dc4be1510a05879a7ff2c084a17126b4d8bcaa228c693a7cb8a4093a2ffc
+  data.tar.gz: 74936efb073fc46f09e04d8543858c2a667e4737eeccc86b64882d1f5d9cf402
 SHA512:
-  metadata.gz: 963de88d3ca0956517777a2445018ecf36bece45bf40165007403b49c347ed4a217d3d6438518318cedb25354694473639da50845cab41cd29173575192acd8c
-  data.tar.gz: 06f6f69fea13c1405bb5e93576ed5779ca412db1955b7543effa2ced254a4af7e781154df370ae97cba887dfb962f29ca424d140040213b3442388f17e640d39
+  metadata.gz: 9cefe7ba9a4d3da5a15e4f1e7429167e7ff1d3570f2b381f5ca2c4a2f1379066748a6b0436868099badf1eb3ea178ba347f2d7889ea170b1108e14c80f0d1d61
+  data.tar.gz: d1e69f8c657c791cc2af22be8ef22fb5a0c4acecb1670727fc9e83b6e6de0ad0f3c9972f8990c3251b0b569148a23c763d64157a55a2ccb6c850bc11f969b200

data/app/mailers/effective/email_templates_mailer.rb

@@ -3,20 +3,22 @@ module Effective
 
     def mail(headers = {}, &block)
       email_template = Effective::EmailTemplate.where(template_name: action_name).first!
-
-      # Parse Assigns. :body is a special key
       assigns = (@assigns || {})
 
-      if (body = assigns.delete(:body))
-        email_template.body = body
-      end
+      # Parse assigns. Special keys for body and subject.
+      body = assigns.delete(:body) || headers[:body] || headers['body']
+      email_template.body = body if body.present?
+
+      subject = assigns.delete(:subject) || headers[:subject] || headers['subject']
+      email_template.subject = subject if subject.present?
 
+      # Add any _url helpers
       assigns = route_url_assigns(email_template).merge(assigns)
 
       # Render from the template, possibly with updated body
       rendered = email_template.render(assigns)
 
-      super(rendered.merge(headers))
+      super(rendered.merge(headers.except(:body, :subject, 'body', 'subject')))
     end
 
     private

data/app/models/effective/email_template.rb

@@ -73,11 +73,11 @@ module Effective
     private
 
     def template_body
-      Liquid::Template.parse(body_was || body)
+      Liquid::Template.parse(body)
     end
 
     def template_subject
-      Liquid::Template.parse(subject_was || subject)
+      Liquid::Template.parse(subject)
     end
 
     def deep_stringify_assigns(assigns)

data/lib/effective_email_templates/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEmailTemplates
-  VERSION = '1.0.12'.freeze
+  VERSION = '1.0.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_email_templates
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails