effective_email_templates 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76b4cba485f59818cdff525e1a105ce1e61e82741b416291ea48721da04ac148
-  data.tar.gz: 96dabdd42fa0e1dc26a6e1c7fbe497f471ba06b67234f852ba3ca41816ccf58e
+  metadata.gz: 70659c858db00ba3550202875f36f68c3fdc8f955cc0ec6c9c804d82cc45f809
+  data.tar.gz: bcbc544fa37ab446f1a8bc2ddaa88e6aceb96596018bb1b4fa30ade686fdbd7f
 SHA512:
-  metadata.gz: 54dbf79839ab5bc46073a9aeb59ae30de17c89a6b5e7d0efaf54f5703c9761118f8e8713f0cc4fbe2acfc066c5ebdc9be4f307433cce9680d73e89eced6ca409
-  data.tar.gz: baed2e7069b501209ba92605dd023c4f18d4e8dcbf79861b195c15c268cbc5d7d8025b14ff27a07473a9a46a99dae26b55ef446df46cf02553dc288916dd7be5
+  metadata.gz: c1f5c5322dfd9717ccd295e175c1406368398b6afa67454c9b568f80cad139924e4f8d0851c73e786edd1d80f81a08786c9b1ad3107620209b942c5463f8c671
+  data.tar.gz: b7c81a31ec4a001c626e0d586e98fc4f22c37b844f359f01578cc0148b69d6834788c4a16a3f739d4d3cec60f109d4d40eeca592ff551b04e418c8a18429be9c

data/app/datatables/effective_email_templates_datatable.rb

@@ -9,23 +9,11 @@ class EffectiveEmailTemplatesDatatable < Effective::Datatable
 
     col :template_name, label: 'Name'
 
-    col :from do |email_template|
-      sanitize(email_template.from)
-    end
-
-    col :cc do |email_template|
-      sanitize(email_template.cc)
-    end
-
-    col :bcc do |email_template|
-      sanitize(email_template.bcc)
-    end
-
+    col :from, search: EffectiveEmailTemplates.mailer_froms
+    col :cc
+    col :bcc
     col :subject
-
-    col :body do |email_template|
-      simple_format(email_template.body)
-    end
+    col :body
 
     col :content_type, visible: false
 

data/app/mailers/concerns/effective_email_templates_mailer.rb

@@ -18,7 +18,7 @@ module EffectiveEmailTemplatesMailer
     email_template.subject = subject if subject.present?
 
     # Add any _url helpers
-    assigns = route_url_assigns(email_template).merge(assigns)
+    assigns = route_url_assigns(email_template, assigns).merge(assigns)
 
     # Render from the template, possibly with updated body
     rendered = email_template.render(assigns)
@@ -28,8 +28,12 @@ module EffectiveEmailTemplatesMailer
 
   private
 
-  def route_url_assigns(email_template)
-    email_template.template_variables.select { |name| name.ends_with?('_url') }.inject({}) do |h, name|
+  def route_url_assigns(email_template, existing)
+    route_variables = email_template.template_variables
+      .select { |name| name.ends_with?('_url') }
+      .reject { |name| existing.key?(name) || existing.key?(name.to_sym) }
+    
+    route_variables.inject({}) do |h, name|
       h[name] = public_send(name) if respond_to?(name); h
     end
   end

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

@@ -4,7 +4,7 @@
   - if EffectiveEmailTemplates.select_content_type
     = f.select :content_type, Effective::EmailTemplate::CONTENT_TYPES
 
-  = f.text_field :from, hint: 'Whom the email will be sent from'
+  = f.select :from, EffectiveEmailTemplates.mailer_froms, hint: 'Please contact us to add additional sender addresses.'
   = f.text_field :cc
   = f.text_field :bcc
 
@@ -19,6 +19,8 @@
         - Array(f.object.template_variables).each do |variable|
           %li {{ #{variable} }}
 
-      %small.text-muted Only a developer can add additional variables
+      %small.text-muted Please contact us to add additional variables
 
-  = f.submit
+  = f.submit do
+    = f.save 'Save'
+    = f.save 'Continue'

data/lib/effective_email_templates/importer.rb

@@ -9,8 +9,9 @@ module EffectiveEmailTemplates
     end
 
     def execute(overwrite:, paths: nil, quiet: false)
-      return false unless ActiveRecord::Base.connection.table_exists?(EffectiveEmailTemplates.email_templates_table_name)
+      return false unless ActiveRecord::Base.connection.table_exists?(EffectiveEmailTemplates.email_templates_table_name || :email_templates)
       return false if defined?(Tenant) && Tenant.current.blank?
+      return false if EffectiveEmailTemplates.mailer_froms.blank?
 
       paths ||= if defined?(Tenant)
         ActionController::Base.view_paths.reject { |view| view.path.include?('/apps/') }.map(&:path) + Tenant.view_paths.map(&:to_s)
@@ -38,6 +39,9 @@ module EffectiveEmailTemplates
     def save(email_template, filepath, quiet:)
       file = File.new(filepath, 'r')
 
+      froms = EffectiveEmailTemplates.mailer_froms
+      raise('expected an Array of mailer froms') unless froms.kind_of?(Array)
+
       attributes = begin
         content = YAML.load(file)
         content.kind_of?(Hash) ? content : {}
@@ -49,7 +53,10 @@ module EffectiveEmailTemplates
         content.gsub(match[1], '').strip if match
       end
 
+      from = froms.find { |from| from.include?(attributes['from']) } || froms.first
+
       email_template.assign_attributes(attributes)
+      email_template.assign_attributes(from: from)
       email_template.assign_attributes(body: body)
 
       if email_template.save

data/lib/effective_email_templates/version.rb

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

metadata

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