effective_email_templates 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9651ddd52c209639a97f57e6598f203ef6de87c39264db848a02fc57118272c
-  data.tar.gz: fec2c937050738a39b1d6df2aeaf0b104a8d581188b3e7e9024806c141707ded
+  metadata.gz: 3f5c8f6d7991aa4a349fecda1ea4fc687df0facb55214d176a0030720ede39db
+  data.tar.gz: 7882e4790ff27ff4c60d5985bc501df2fac90bba84e96dcb7b44f7d63dfe3657
 SHA512:
-  metadata.gz: 55b6589e19e6437bf9b42a064df20c536b0e092dcc0efc1e646bba5c49867b214e9ba1f3e9c5c0f8d0cc55974fe28fe7348e63a4b21d6cb71c69417cced54844
-  data.tar.gz: e7caa88e4d81f51abf3c244c20dca5873caf3b1f4766dfdb0e821958ba039195376f08192c5c96e607e52dcdbd1df14e638d7d959eb0d1e86974c36c7616b444
+  metadata.gz: f36ac864bc2efe007f7f06555aefe5a5a9abdae549dc2b4ed44db66033858efb1c26cac1ab7679ce6bb4321c2a3468fc8b80399347682c76b412e05ba74acdbf
+  data.tar.gz: 4ef1228155f5f2940e36af9a9b1c7373147954eb241fe5573c15f880b00231e8f86b6dec1eba53b24bea6b29c688c861b983ffc94a716f55a13c349b39a7f329

data/app/mailers/concerns/effective_email_templates_mailer.rb

@@ -42,12 +42,22 @@ module EffectiveEmailTemplatesMailer
       end
     end
 
+    # Process body as plain text or html
+    body = merged.fetch(:body) || ''
+
     # For text/plain emails
-    return super(merged) if email_template.plain?
+    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
-    body = merged.fetch(:body)
-    layout = mailer_layout().presence || raise("expected a mailer layout when rendering text/html templates")
+    layout = mailer_layout().presence || raise("expected a mailer layout when rendering text/html email_template #{action_name}")
 
     super(merged.except(:body, :content_type)) do |format|
       format.text { strip_tags(body) }

data/app/models/effective/email_template.rb

@@ -1,5 +1,7 @@
 module Effective
   class EmailTemplate < ActiveRecord::Base
+    include ActionView::Helpers::TextHelper
+
     self.table_name = (EffectiveEmailTemplates.email_templates_table_name || :email_templates).to_s
 
     attr_accessor :current_user
@@ -12,20 +14,22 @@ module Effective
 
     effective_resource do
       template_name     :string
-      content_type      :string
 
-      subject           :string
       from              :string
       cc                :string
       bcc               :string
+
+      subject           :string
       body              :text
 
+      content_type      :string
+
       timestamps
     end
 
     before_validation do
-      self.content_type ||= CONTENT_TYPES.first
       self.from ||= EffectiveEmailTemplates.mailer_froms.first
+      self.content_type ||= CONTENT_TYPES.first
     end
 
     validates :body, liquid: true
@@ -38,11 +42,11 @@ module Effective
     validates :template_name, presence: true
 
     validate(if: -> { html? && body.present? }) do
-      errors.add(:body, 'expected html tags in body') unless body.include?('</p>') || body.include?('</div>')
+      errors.add(:body, 'expected html tags in body') if body_plain?
     end
 
     validate(if: -> { plain? && body.present? }) do
-      errors.add(:body, 'expected no html tags in body') if body.include?('</p>') || body.include?('</div>')
+      errors.add(:body, 'unexpected html tags found in body') if body_html?
     end
 
     def to_s
@@ -57,6 +61,14 @@ module Effective
       content_type == CONTENT_TYPE_PLAIN
     end
 
+    def body_html?
+      body.present? && (body.include?('</p>') || body.include?('</div>'))
+    end
+
+    def body_plain?
+      body.present? && !(body.include?('</p>') || body.include?('</div>'))
+    end
+
     def render(assigns = {})
       assigns = deep_stringify_assigns(assigns)
 
@@ -78,6 +90,18 @@ module Effective
       end.flatten.uniq.compact
     end
 
+    def save_as_html!
+      assign_attributes(content_type: 'text/html')
+      assign_attributes(body: simple_format(body)) if body_plain?
+      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

data/lib/effective_email_templates/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEmailTemplates
-  VERSION = '1.8.0'.freeze
+  VERSION = '1.9.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_email_templates
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-20 00:00:00.000000000 Z
+date: 2024-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement