effective_email_templates 1.8.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9651ddd52c209639a97f57e6598f203ef6de87c39264db848a02fc57118272c
-  data.tar.gz: fec2c937050738a39b1d6df2aeaf0b104a8d581188b3e7e9024806c141707ded
+  metadata.gz: 47bfa3ecaa97c291febde3388a8f11190d61a19bf760204f6295ed92e5bb4471
+  data.tar.gz: 4d7c4d2780620e6aa3f530fec568d8296c34f48b517b2921243095e3e6c3dc16
 SHA512:
-  metadata.gz: 55b6589e19e6437bf9b42a064df20c536b0e092dcc0efc1e646bba5c49867b214e9ba1f3e9c5c0f8d0cc55974fe28fe7348e63a4b21d6cb71c69417cced54844
-  data.tar.gz: e7caa88e4d81f51abf3c244c20dca5873caf3b1f4766dfdb0e821958ba039195376f08192c5c96e607e52dcdbd1df14e638d7d959eb0d1e86974c36c7616b444
+  metadata.gz: dbcb356a67b2b287bfb7a2031e1bc97de2d849df08c16ff347c7bfae412dcce7c452a8a8a940ff566492988274c5e1c058e171cd7c4c776e23ebcd42f12c4bf7
+  data.tar.gz: 95bdc306c0b0bd5fe76002c40938a2e326b9f1a37cba897b82079bf64ed11d4bf9e3f4ae83e57ae5fccbe1aa7ed8d3651bd886025449dfb902250bf0069c7e48

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,27 @@ 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

data/lib/effective_email_templates/importer.rb

@@ -24,10 +24,7 @@ module EffectiveEmailTemplates
           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
+          next if email_template.persisted? && !overwrite
 
           save(email_template, filepath, quiet: quiet)
         end
@@ -60,7 +57,10 @@ module EffectiveEmailTemplates
       email_template.assign_attributes(from: from)
       email_template.assign_attributes(body: body)
 
-      if email_template.save
+      # Save as plain or html
+      save_method = (EffectiveEmailTemplates.select_content_type ? :save_as_html! : :save!)
+
+      if (email_template.send(save_method) rescue false)
         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.8.0'.freeze
+  VERSION = '1.9.1'.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.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-20 00:00:00.000000000 Z
+date: 2025-03-19 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