effective_email_templates 1.1.0 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42f8567bcf6351ab1762ee602ac678e4b63e8bbde2ae4e2c2858a7eff70a2a8d
-  data.tar.gz: df20ca47c9a70a8a4867dc961da769db6f49a490fe80756e3fe9948b75dba5cc
+  metadata.gz: 8ba53c8fd6aed111fca06838d4095c43968032cd0b99dc14cccefb4781c74678
+  data.tar.gz: c460758e1f9faace00d5aa93b75f9bb8ec1658a990490a2486f9e569c25a0d9a
 SHA512:
-  metadata.gz: c17a239840a85a12f9768b84be0315c7d0fddf924b435809af78bad8e203b145de905d40eef06d0473a18041e5483187deb4fc4db61df01428317d7c678a9974
-  data.tar.gz: f10cfa33b6973e58b2b9e82a33c019b5ef7b8f532f23048682a6367e8e654304d61556c2a3a4e5de9114536d8a36deff4150301f68a107d462b0b3d47d1fd1c8
+  metadata.gz: af09166b147429ab8e85aaa7b3774a3aee90b762a57286d368cb3c0e1076d696d0489ebe850c69d872da52307658286b6874e73b75d5713c1012e8d86ec2b2e1
+  data.tar.gz: deabb27642aa03325530cc440f448df8b8a12bb2db15de4dad5bfc473e7b588c305ac9f677a34e2b264d9fb8c6586478e142e5f82781d3209cbd20792fb1e061

data/app/datatables/effective_email_templates_datatable.rb

@@ -18,11 +18,15 @@ class EffectiveEmailTemplatesDatatable < Effective::Datatable
     end
 
     col :bcc do |email_template|
-      html_escape(email_template.cc)
+      html_escape(email_template.bcc)
     end
 
     col :subject
-    col :body
+
+    col :body do |email_template|
+      simple_format(email_template.body)
+    end
+
     col :content_type, visible: false
 
     actions_col

data/app/mailers/concerns/effective_email_templates_mailer.rb

@@ -0,0 +1,35 @@
+# Added to effective email templates mailers
+
+module EffectiveEmailTemplatesMailer
+  extend ActiveSupport::Concern
+
+  def mail(headers = {}, &block)
+    email_template = Effective::EmailTemplate.where(template_name: action_name).first!
+    assigns = (@assigns || {})
+
+    # Parse assigns. Special keys for body and subject.
+    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.
+    subject = assigns.delete(: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.except(:body, :subject, 'body', 'subject')))
+  end
+
+  private
+
+  def route_url_assigns(email_template)
+    email_template.template_variables.select { |name| name.ends_with?('_url') }.inject({}) do |h, name|
+      h[name] = public_send(name) if respond_to?(name); h
+    end
+  end
+
+end

data/app/mailers/effective/email_templates_mailer.rb

@@ -1,33 +1,5 @@
 module Effective
   class EmailTemplatesMailer < ::ActionMailer::Base
-
-    def mail(headers = {}, &block)
-      email_template = Effective::EmailTemplate.where(template_name: action_name).first!
-      assigns = (@assigns || {})
-
-      # 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.except(:body, :subject, 'body', 'subject')))
-    end
-
-    private
-
-    def route_url_assigns(email_template)
-      email_template.template_variables.select { |name| name.ends_with?('_url') }.inject({}) do |h, name|
-        h[name] = public_send(name) if respond_to?(name); h
-      end
-    end
-
+    include EffectiveEmailTemplatesMailer
   end
 end

data/app/models/effective/email_template.rb

@@ -29,7 +29,7 @@ module Effective
     validates :subject, liquid: true
 
     validates :subject, presence: true
-    validates :from, presence: true
+    validates :from, presence: true, email: true
     validates :body, presence: true
     validates :content_type, presence: true, inclusion: { in: CONTENT_TYPES }
     validates :template_name, presence: true

data/lib/effective_email_templates/importer.rb

@@ -1,15 +1,19 @@
 module EffectiveEmailTemplates
   class Importer
-    def self.import(quiet: false)
-      new().execute(overwrite: false, quiet: quiet)
+    def self.import(quiet: false, paths: nil)
+      new().execute(overwrite: false, paths: paths, quiet: quiet)
     end
 
-    def self.overwrite(quiet: false)
-      new().execute(overwrite: true, quiet: quiet)
+    def self.overwrite(quiet: false, paths: nil)
+      new().execute(overwrite: true, paths: paths, quiet: quiet)
     end
 
-    def execute(overwrite:, quiet: false)
-      ActionController::Base.view_paths.map(&:path).each do |path|
+    def execute(overwrite:, paths: nil, quiet: false)
+      return false unless ActiveRecord::Base.connection.table_exists?(EffectiveEmailTemplates.email_templates_table_name)
+
+      paths ||= ActionController::Base.view_paths.map(&:path)
+
+      paths.each do |path|
         Dir[Rails.root.join(path, '**', '*_mailer/', '*.liquid')].each do |filepath|
           name = File.basename(filepath, '.liquid')
           email_template = Effective::EmailTemplate.find_or_initialize_by(template_name: name)

data/lib/effective_email_templates/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEmailTemplates
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_email_templates
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -92,6 +92,7 @@ files:
 - app/controllers/admin/email_templates_controller.rb
 - app/datatables/effective_email_templates_datatable.rb
 - app/helpers/effective_email_templates_helper.rb
+- app/mailers/concerns/effective_email_templates_mailer.rb
 - app/mailers/effective/email_templates_mailer.rb
 - app/models/concerns/has_one_email_review.rb
 - app/models/effective/email_review.rb