effective_email_templates 1.0.8 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c84d011bfae37921bb40271777c47e7a3d2160152c0b408ab7dd76df71eea2e7
-  data.tar.gz: 9a4e13582f66232d044cf19eb5691f654313946b4a8eaa0b489b9d71b2cd9997
+  metadata.gz: 1ea4dc4be1510a05879a7ff2c084a17126b4d8bcaa228c693a7cb8a4093a2ffc
+  data.tar.gz: 74936efb073fc46f09e04d8543858c2a667e4737eeccc86b64882d1f5d9cf402
 SHA512:
-  metadata.gz: c8a0b4e52f4746b5e5a1d174133350838eed9e3ae2e6198400defcede6d4aad45fac66563c19cf4c9c32190f3e9226fe8df69af654029be9061037f1cf78750d
-  data.tar.gz: 30bed477a7ff6817bbe9b2a4887b69fca67b5bc4578de17951d336b4c3c1e50a2bcb87610d9ecef696f38b093ce16cedc6b877d4facd8dfe0ee59b7649c472c9
+  metadata.gz: 9cefe7ba9a4d3da5a15e4f1e7429167e7ff1d3570f2b381f5ca2c4a2f1379066748a6b0436868099badf1eb3ea178ba347f2d7889ea170b1108e14c80f0d1d61
+  data.tar.gz: d1e69f8c657c791cc2af22be8ef22fb5a0c4acecb1670727fc9e83b6e6de0ad0f3c9972f8990c3251b0b569148a23c763d64157a55a2ccb6c850bc11f969b200

data/app/datatables/effective_email_templates_datatable.rb

@@ -14,6 +14,8 @@ class EffectiveEmailTemplatesDatatable < Effective::Datatable
     col :subject
     col :body
 
+    col :content_type, visible: false
+
     actions_col partial: '/admin/email_templates/actions', partial_as: 'email_template'
   end
 
@@ -21,4 +23,3 @@ class EffectiveEmailTemplatesDatatable < Effective::Datatable
     Effective::EmailTemplate.all
   end
 end
-

data/app/helpers/effective_email_templates_helper.rb

@@ -1,11 +1,20 @@
 module EffectiveEmailTemplatesHelper
 
-  def effective_email_review_fields(form, template_name)
+  # We are given a form to essentially send an email
+  def effective_email_review_fields(form, template_name, mail = nil)
+    raise('expected a mail object') if mail && !mail.kind_of?(ActionMailer::MessageDelivery)
+    raise('expected form.object to respond to email_review') unless form.object.respond_to?(:email_review)
+
     email_review = form.object.email_review
 
     unless email_review&.template_name == template_name.to_s
       email_template = Effective::EmailTemplate.where(template_name: template_name).first!
       email_review = Effective::EmailReview.build(email_template: email_template)
+
+      if mail.present?
+        email_review.body = mail.message.body
+        email_review.subject = mail.message.subject
+      end
     end
 
     render(partial: 'effective/email_reviews/fields', locals: { email_review: email_review, form: form })

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_review.rb

@@ -4,25 +4,32 @@ module Effective
 
     attr_accessor :email_template
     attr_accessor :template_name
+
     attr_accessor :body
+    attr_accessor :subject
+    attr_accessor :from
+    attr_accessor :cc
+    attr_accessor :bcc
 
     def self.build(attributes = {})
-      new(attributes).tap do |email_review|
-        email_review.body ||= email_review.email_template&.body
-        email_review.template_name ||= email_review.email_template&.template_name
-      end
-    end
+      email_review = new(attributes)
+      template = email_review.email_template
 
-    validates :body, presence: true
-
-    validate(if: -> { body.present? }) do
-      begin
-        Liquid::Template.parse(body)
-      rescue Liquid::SyntaxError => e
-        errors.add(:body, e.message)
+      if template.present?
+        email_review.body ||= template.body
+        email_review.subject ||= template.subject
+        email_review.from ||= template.from
+        email_review.cc ||= template.cc
+        email_review.bcc ||= template.bcc
+        email_review.template_name ||= template.template_name
       end
+
+      email_review
     end
 
+    validates :body, presence: true, liquid: true
+    validates :subject, liquid: true
+
     def email_template
       @email_template ||= Effective::EmailTemplate.where(template_name: template_name).first
     end

data/app/models/effective/email_template.rb

@@ -22,21 +22,8 @@ module Effective
       self.content_type ||= CONTENT_TYPES.first
     end
 
-    before_validation(if: -> { body.present? }) do
-      begin
-        Liquid::Template.parse(body)
-      rescue Liquid::SyntaxError => e
-        errors.add(:body, e.message)
-      end
-    end
-
-    before_validation(if: -> { subject.present? }) do
-      begin
-        Liquid::Template.parse(subject)
-      rescue Liquid::SyntaxError => e
-        errors.add(:subject, e.message)
-      end
-    end
+    validates :body, liquid: true
+    validates :subject, liquid: true
 
     validates :subject, presence: true
     validates :from, presence: true
@@ -44,6 +31,20 @@ module Effective
     validates :content_type, presence: true, inclusion: { in: CONTENT_TYPES }
     validates :template_name, presence: true
 
+    # validate(if: -> { content_type == 'text/html' && body.present? }) do
+    #   unless body.include?('<') && body.include?('>')
+    #     self.errors.add(:content_type, 'expected html tags in body')
+    #     self.errors.add(:body, 'expected html tags in body')
+    #   end
+    # end
+
+    # validate(if: -> { content_type == 'text/plain' && body.present? }) do
+    #   if body.include?('</a>') || body.include?('</p>')
+    #     self.errors.add(:content_type, 'expected no html tags in body')
+    #     self.errors.add(:body, 'expected no html tags in body')
+    #   end
+    # end
+
     def to_s
       template_name.presence || 'New Email Template'
     end

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

@@ -1,6 +1,8 @@
 = effective_form_with(model: email_template, url: email_template.persisted? ? effective_email_templates.admin_email_template_path(email_template.id) : effective_email_templates.admin_email_templates_path) do |f|
   = f.static_field :template_name, label: 'Name'
-  = f.select :content_type, Effective::EmailTemplate::CONTENT_TYPES
+
+  - if EffectiveEmailTemplates.select_content_type
+    = f.select :content_type, Effective::EmailTemplate::CONTENT_TYPES
 
   = f.email_field :from, hint: 'Whom the email will be sent from'
   = f.text_field :cc

data/config/effective_email_templates.rb

@@ -32,4 +32,7 @@ EffectiveEmailTemplates.setup do |config|
     admin_email_templates: 'admin'
   }
 
+  # Not allowed to select text/html by default
+  config.select_content_type = false
+
 end

data/lib/effective_email_templates.rb

@@ -6,6 +6,7 @@ module EffectiveEmailTemplates
 
   mattr_accessor :email_templates_table_name
   mattr_accessor :authorization_method
+  mattr_accessor :select_content_type
   mattr_accessor :layout
 
   def self.setup

data/lib/effective_email_templates/engine.rb

@@ -2,6 +2,9 @@ module EffectiveEmailTemplates
   class Engine < ::Rails::Engine
     engine_name 'effective_email_templates'
 
+    config.autoload_paths += Dir["#{config.root}/lib/validators/"]
+    config.eager_load_paths += Dir["#{config.root}/lib/validators/"]
+
     # Set up our default configuration options.
     initializer 'effective_email_templates.defaults', before: :load_config_initializers do |app|
       eval File.read("#{config.root}/config/effective_email_templates.rb")
@@ -16,4 +19,3 @@ module EffectiveEmailTemplates
 
   end
 end
-

data/lib/effective_email_templates/importer.rb

@@ -9,16 +9,18 @@ module EffectiveEmailTemplates
     end
 
     def execute(overwrite:, quiet: false)
-      Dir[Rails.root.join('app', 'views', '**', '*.liquid')].each do |filepath|
-        name = File.basename(filepath, '.liquid')
-        email_template = Effective::EmailTemplate.find_or_initialize_by(template_name: name)
+      ActionController::Base.view_paths.map(&:path).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)
 
-        if email_template.persisted? && !overwrite
-          puts("SKIPPED #{filename(filepath)}") unless quiet
-          next
-        end
+          if email_template.persisted? && !overwrite
+            puts("SKIPPED #{filename(filepath)}") unless quiet
+            next
+          end
 
-        save(email_template, filepath, quiet: quiet)
+          save(email_template, filepath, quiet: quiet)
+        end
       end
     end
 

data/lib/effective_email_templates/version.rb

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

data/lib/validators/liquid_validator.rb

@@ -0,0 +1,15 @@
+# An ActiveRecord validator for any liquid field that you would use with effective_email_templates or otherwise
+#
+# validates :body, liquid: true
+
+class LiquidValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    if value.present?
+      begin
+        Liquid::Template.parse(value)
+      rescue Liquid::SyntaxError => e
+        record.errors.add(attribute, e.message)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_email_templates
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.13
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -115,11 +115,12 @@ files:
 - lib/effective_email_templates/version.rb
 - lib/generators/effective_email_templates/install_generator.rb
 - lib/tasks/effective_email_templates_tasks.rake
+- lib/validators/liquid_validator.rb
 homepage: https://github.com/code-and-effect/effective_email_templates
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -134,8 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Effective Email Templates provides an admin access to modify email templates
 test_files: []