effective_email_templates 1.0.4 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a238b8b71692835a5696b2e39af036262811cf4afbbf33c44fdbaf1f97281d7
-  data.tar.gz: 943bb0895bc01b14eaa6186f560c3ed7d69ff9a825abbe0e4b287100d5865d40
+  metadata.gz: 1051f0fdea5606d0c44e97e4a9b8776ebec40ed2e9ad53dd9bedb11ea07fec92
+  data.tar.gz: e9c20eaa1d0b59b010d9cf35ec493e0f5fe0b9278efaf8165109298ab27eabd9
 SHA512:
-  metadata.gz: 818eff0c9972b335a6e61eb0afd4bb7abdcf25fbb970d8f3e151be81b102303ae007d88ddb81f9c24b3a28a0055cb22f7c33af7edcd9bb4167ce1bf79e15a7e5
-  data.tar.gz: 691d13d33273802ab710493d8509efe3952bf57032a45efd5e2afaedb5d21b81713224c07c09e0dcf1a2b8ed2bf91e5965593520ae9cce3ff2ff35b1b42f44cb
+  metadata.gz: 780ff3d0e553a9b463de798b3a66504adf4594ba907dd98857b6185c7f27267c4d0e47d9ac456b4c64ba4b9b2075be8080bf30f84bb62100b94f95167980d49d
+  data.tar.gz: a965fd38e92b81d5ca9d892248d75a16267af7dd0df9a1c5aacccbe1842cd083bbb3b30676d3db85f13b9a1ffb460347ba49cbcec700db19e5f5542d314c46e3

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/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.text_field :template_name
-  = f.text_area :body, rows: 10
+  = f.hidden_field :template_name
+  = 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.4'.freeze
+  VERSION = '1.0.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_email_templates
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.9
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-08-13 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: []