effective_email_templates 1.9.3 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22c94c5f28e082f029701dea00e77fbf19758c5c3273ae68bc725429d3864176
-  data.tar.gz: d2ac8302071d55c74d2008f808a1e35fac77bd57933722e7bde8bdeb05938750
+  metadata.gz: 4f9c6e50213d4168bcb01a3d4f4524e89b58aeced9f489e94f706bfa3370f962
+  data.tar.gz: 9fc4ba9085fa62c3a77334bb1ba3d86f531f2f659feee2d6da73658557ad2874
 SHA512:
-  metadata.gz: 48c579ece7dfe1e077b7570bfda94610335df6e0be047cc4c04db8c6b503b8c1747efc84245da702a5cafb0df7dd4448e0e7a0ba5864cb795fb71fdab72d4b1b
-  data.tar.gz: 34e347579eb631dce2bcde73666a9236c9188e87a5ea51a25d58c686770c3d7120efe30cef9837448d9eee9c5dc60aa8e6c4d2fa0d822bfa2e2f7ba8f091ad40
+  metadata.gz: d8313334ab8ac9cb89e8ab962519f91a4bd7e8c6ad140a515c0a7d0dc25385d2b33115e9dd14cb63dfcd45d1633986c7cd242fb263c742d375baff04ef3ea6c7
+  data.tar.gz: 161defb7c4e2d0d1008acf6eb435f3414ebef94580b41d89c294a0dedaa1d93a20bb7fbb9e3ba32f541e18e56b839848bf3d8fdd928fdb00efd58fde7004bdc0

data/app/datatables/effective_email_templates_datatable.rb

@@ -18,8 +18,6 @@ class EffectiveEmailTemplatesDatatable < Effective::Datatable
     col :subject
     col :body
 
-    col :content_type, visible: false
-
     actions_col
   end
 

data/app/helpers/effective_email_templates_helper.rb

@@ -1,23 +1,2 @@
 module EffectiveEmailTemplatesHelper
-
-  # 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 })
-  end
-
 end

data/app/mailers/concerns/effective_email_templates_mailer.rb

@@ -42,22 +42,9 @@ module EffectiveEmailTemplatesMailer
       end
     end
 
-    # Process body as plain text or html
+    # Render as multipart html email
     body = merged.fetch(:body) || ''
-
-    # For text/plain emails
-    if email_template.plain?
-      stripped = body.strip
-
-      if stripped.starts_with?('<p>') || stripped.ends_with?('</p>')
-        raise("unexpected html content found when when rendering text/plain email_template #{action_name}")
-      end
-
-      return super(merged) 
-    end
-
-    # For text/html emails
-    layout = mailer_layout().presence || raise("expected a mailer layout when rendering text/html email_template #{action_name}")
+    layout = mailer_layout().presence || raise("expected a mailer layout when rendering email_template #{action_name}")
 
     super(merged.except(:body, :content_type)) do |format|
       format.text { strip_tags(body) }

data/app/models/effective/email_template.rb

@@ -8,10 +8,6 @@ module Effective
 
     log_changes if respond_to?(:log_changes)
 
-    CONTENT_TYPE_PLAIN = 'text/plain'
-    CONTENT_TYPE_HTML = 'text/html'
-    CONTENT_TYPES = [CONTENT_TYPE_PLAIN, CONTENT_TYPE_HTML]
-
     effective_resource do
       template_name     :string
 
@@ -22,14 +18,21 @@ module Effective
       subject           :string
       body              :text
 
-      content_type      :string
-
       timestamps
     end
 
     before_validation do
       self.from ||= EffectiveEmailTemplates.mailer_froms.first
-      self.content_type ||= CONTENT_TYPES.first
+    end
+
+    # Convert to HTML
+    before_validation(if: -> { body_plain? }) do
+      html = simple_format(body)
+
+      # Replace [UpsideAMS](http://www.upsideams.com) type markdown links
+      html = html.gsub(/\[(.*?)\]\((.*?)\)/, '<a href="\2">\1</a>')
+
+      assign_attributes(body: html)
     end
 
     validates :body, liquid: true
@@ -38,31 +41,18 @@ module Effective
     validates :subject, 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
 
-    validate(if: -> { html? && body.present? }) do
+    validate(if: -> { body.present? }) do
       errors.add(:body, 'expected html tags in body') if body_plain?
     end
 
-    validate(if: -> { plain? && body.present? }) do
-      errors.add(:body, 'unexpected html tags found in body') if body_html?
-    end
-
     def to_s
       template_name.presence || 'New Email Template'
     end
 
-    def html?
-      content_type == CONTENT_TYPE_HTML
-    end
-
-    def plain?
-      content_type == CONTENT_TYPE_PLAIN
-    end
-
-    def body_html?
-      body.present? && (body.include?('</p>') || body.include?('</div>'))
+    def content_type
+      'text/html'
     end
 
     def body_plain?
@@ -76,7 +66,6 @@ module Effective
         from: from,
         cc: cc.presence,
         bcc: bcc.presence,
-        content_type: content_type,
         subject: template_subject.render(assigns),
         body: template_body.render(assigns)
       }.compact
@@ -90,35 +79,14 @@ module Effective
       end.flatten.uniq.compact
     end
 
-    def save_as_html!
-      assign_attributes(content_type: 'text/html')
-
-      if body_plain?
-        html = simple_format(body)
-        
-        # Replace [UpsideAMS](http://www.upsideams.com) type markdown links
-        html = html.gsub(/\[(.*?)\]\((.*?)\)/, '<a href="\2">\1</a>')
-
-        assign_attributes(body: html)
-      end
-
-      save!
-    end
-
-    def save_as_plain!
-      assign_attributes(content_type: 'text/plain')
-      assign_attributes(body: strip_tags(body)) if body_html?
-      save!
-    end
-
     private
 
     def template_body
-      Liquid::Template.parse(body)
+      (Liquid::Template.parse(body) rescue nil)
     end
 
     def template_subject
-      Liquid::Template.parse(subject)
+      (Liquid::Template.parse(subject) rescue nil)
     end
 
     def deep_stringify_assigns(assigns)

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

@@ -2,9 +2,6 @@
   = card do
     = f.static_field :template_name, label: 'Name'
 
-    - if EffectiveEmailTemplates.select_content_type
-      = f.select :content_type, Effective::EmailTemplate::CONTENT_TYPES
-
     = f.select :from, mailer_froms_collection(), hint: 'Please contact us to add additional sender addresses. Please refresh the page if this from address looks weird.'
     = f.text_field :cc
     = f.text_field :bcc
@@ -12,11 +9,7 @@
     - prefix_hint = EffectiveResources.mailer_subject_prefix_hint.to_s.strip.presence
     = f.text_field :subject, hint: (prefix_hint ? "The subject of your email. It will be automatically prefixed with: #{prefix_hint}" : 'The subject of your email')
 
-    = f.show_if(:content_type, Effective::EmailTemplate::CONTENT_TYPE_PLAIN) do
-      = f.text_area :body, hint: 'The text/plain content of your email template', rows: 10
-
-    = f.show_if(:content_type, Effective::EmailTemplate::CONTENT_TYPE_HTML) do
-      = f.article_editor :body, hint: 'The text/html content of your email template', mode: :email
+    = f.article_editor :body, hint: 'The content of your email template', mode: :email
 
   = card do
     %p The available variables for this email template are:

data/config/effective_email_templates.rb

@@ -1,7 +1,4 @@
 EffectiveEmailTemplates.setup do |config|
   # Layout Settings
   # config.layout = { application: 'application', admin: 'admin' }
-
-  # Not allowed to select text/html by default
-  config.select_content_type = false
 end

data/db/migrate/101_create_effective_email_templates.rb

@@ -8,7 +8,6 @@ class CreateEffectiveEmailTemplates < ActiveRecord::Migration[6.0]
       t.string    :bcc
       t.string    :cc
 
-      t.string    :content_type
       t.text      :body
 
       t.timestamps

data/lib/effective_email_templates/importer.rb

@@ -57,10 +57,7 @@ module EffectiveEmailTemplates
       email_template.assign_attributes(from: from)
       email_template.assign_attributes(body: body)
 
-      # Save as plain or html
-      save_method = (EffectiveEmailTemplates.select_content_type ? :save_as_html! : :save!)
-
-      if (email_template.send(save_method) rescue false)
+      if email_template.save
         puts("SUCCESS #{filename(filepath)}") unless quiet
       else
         puts "ERROR #{filename(filepath)}: #{email_template.errors.full_messages.to_sentence}"

data/lib/effective_email_templates/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEmailTemplates
-  VERSION = '1.9.3'.freeze
+  VERSION = '1.10.1'.freeze
 end

data/lib/effective_email_templates.rb

@@ -6,13 +6,13 @@ require 'effective_email_templates/version'
 module EffectiveEmailTemplates
 
   def self.config_keys
-    [:email_templates_table_name, :select_content_type, :layout]
+    [:email_templates_table_name, :layout]
   end
 
   include EffectiveGem
 
   def self.permitted_params
-    @permitted_params ||= [:from, :bcc, :cc, :subject, :body, :content_type]
+    @permitted_params ||= [:from, :bcc, :cc, :subject, :body]
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_email_templates
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.10.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-25 00:00:00.000000000 Z
+date: 2026-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -193,10 +193,8 @@ files:
 - 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
 - app/models/effective/email_template.rb
 - app/views/admin/email_templates/_form.html.haml
-- app/views/effective/email_reviews/_fields.html.haml
 - app/views/layouts/effective_email_templates_mailer_layout.html.haml
 - config/effective_email_templates.rb
 - config/email_templates_mailer.rb

data/app/models/effective/email_review.rb

@@ -1,38 +0,0 @@
-module Effective
-  class EmailReview
-    include ActiveModel::Model
-
-    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 = {})
-      email_review = new(attributes)
-      template = email_review.email_template
-
-      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
-
-  end
-end

data/app/views/effective/email_reviews/_fields.html.haml

@@ -1,13 +0,0 @@
-= form.fields_for(:email_review, email_review) do |f|
-  = f.hidden_field :template_name
-  = f.text_area :body, required: true, rows: 10
-
-  = collapse('Show / hide email variables') do
-    %p The available variables are:
-
-    %ul
-      - Array(f.object.email_template&.template_variables).each do |variable|
-        %li {{ #{variable} }}
-
-    %small.text-muted Only a developer can add additional variables
-