effective_email_templates 1.0.5 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2b7b2c28fcf4f3db2dcd66a28a8ce10438de029f87e8ef130ba75eb902a8d82
-  data.tar.gz: 3fa36a8f03b57e2e26a68ad2f8ae0ddf588c34b90ee91e288a8af5e9d9ca16df
+  metadata.gz: 6ed72c520b24e50d1102d0e89a4e353c399d8b0f6e95e44bb872e7dc75e6805e
+  data.tar.gz: b0cf351fffa4982b8bb9d6e8665cde74bdcefc02c4a551d03d7eaf29ed21b96c
 SHA512:
-  metadata.gz: 236ccdc72f1c6d29ca204cb1222f890416fe536ecdf1ee2384cc78562d670940c55bf7a4021cb90bae3224658513d907f509767f1ba8c97044f60c2fe3469250
-  data.tar.gz: 35d9707d2ba8a1aba3a26501bb5a3c7f632c82e391961d2ad72fd56c39cd4f6e9b41ff29c26299d9ea9f8c33b56b009356171aa73f2cce232ab851216a89e752
+  metadata.gz: 02d5add10f230239034b43148b5c6efc73da5a886ffcaa62cebdb36e34ee3bbaa368f3fd5fb830289fb46952cad7ff9bcc49ccb6610f6a1ad535c615bd784380
+  data.tar.gz: fa8fdfdc3408a0e778ab6510363c77d8d7704cb0dd9cabac69882b28cdc9dea9bcd607ee723421114afdde9e64a3e626a6b53e1103d0d7680c26ba9746290f4a

data/app/controllers/admin/email_templates_controller.rb

@@ -34,7 +34,11 @@ module Admin
     end
 
     def edit
-      @email_template = Effective::EmailTemplate.find(params[:id])
+      @email_template =
+        Effective::EmailTemplate.where(id: params[:id]).or(
+          Effective::EmailTemplate.where(template_name: params[:id])
+        ).first!
+
       @page_title = 'Edit Email Template'
 
       authorize_effective_email_templates!

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,6 +1,9 @@
 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 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
@@ -8,6 +11,11 @@ module EffectiveEmailTemplatesHelper
       email_review = Effective::EmailReview.build(email_template: email_template)
     end
 
+    if mail.present?
+      raise('expected a mail object') unless mail.kind_of?(ActionMailer::MessageDelivery)
+      email_review.body ||= mail.message.body
+    end
+
     render(partial: 'effective/email_reviews/fields', locals: { email_review: email_review, form: form })
   end
 

data/app/models/concerns/has_one_email_review.rb

@@ -4,7 +4,7 @@
 module HasOneEmailReview
   extend ActiveSupport::Concern
 
-  module ActiveRecord
+  module Base
     def has_one_email_review
       include ::HasOneEmailReview
     end

data/app/models/effective/email_template.rb

@@ -2,6 +2,8 @@ module Effective
   class EmailTemplate < ActiveRecord::Base
     self.table_name = EffectiveEmailTemplates.email_templates_table_name.to_s
 
+    log_changes if respond_to?(:log_changes)
+
     CONTENT_TYPES = ['text/plain', 'text/html']
 
     # Attributes
@@ -42,6 +44,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
@@ -49,14 +65,14 @@ module Effective
     def render(assigns = {})
       assigns = deep_stringify_assigns(assigns)
 
-      {
+      result = {
         from: from,
-        cc: cc.presence || false,
-        bcc: bcc.presence || false,
+        cc: cc.presence,
+        bcc: bcc.presence,
         content_type: content_type,
         subject: template_subject.render(assigns),
         body: template_body.render(assigns)
-      }
+      }.compact
     end
 
     def template_variables

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/app/views/effective/email_reviews/_fields.html.haml

@@ -1,6 +1,6 @@
 = form.fields_for(:email_review, email_review) do |f|
   = f.hidden_field :template_name
-  = f.text_area :body, rows: 10
+  = f.text_area :body, required: true, rows: 10
 
   = collapse('Show / hide email variables') do
     %p The available variables are:

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

@@ -10,7 +10,7 @@ module EffectiveEmailTemplates
     # Include has_one_email_review concern and allow any ActiveRecord object to call it
     initializer 'effective_email_templates.active_record' do |app|
       ActiveSupport.on_load :active_record do
-        ActiveRecord::Base.extend(HasOneEmailReview::ActiveRecord)
+        ActiveRecord::Base.extend(HasOneEmailReview::Base)
       end
     end
 

data/lib/effective_email_templates/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEmailTemplates
-  VERSION = '1.0.5'.freeze
+  VERSION = '1.0.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_email_templates
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.10
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -119,7 +119,7 @@ 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 +134,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: []