effective_email_templates 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd45246572ae7b8d6eab683d911aba2fb4d74e2b9ac9f805fb6faea71ebef8b6
-  data.tar.gz: b37ed1adc75b8773d6c5caa57510e434b4537c2512bc63d1adf7b36d1ebe2939
+  metadata.gz: 4928f9db162ceb9b1b35fcbe367f38689be1f8977f75e46bff4e734c15f7ec90
+  data.tar.gz: 9129d4a60362284332fc2ab16685f0c325846dfe6f199cdd1e3924c974e3fb6e
 SHA512:
-  metadata.gz: 93297ce10d8e17183bd52a0c89cf393c42182a7ac4875669ac375f775a9a166770d7d6ffec1f7c9c385e4f40cb8f74e2f240ad2d428bc8b09dd2b4d8ddaaf5c4
-  data.tar.gz: 16a24643ba98a5ad269071eb992e3c73ae7f4d02cbab1c331b083cce8d45ad231e8c8a22a554e547aa94fb748aa98d62f5199a8391f6723778e889b50e5d8b03
+  metadata.gz: 963de88d3ca0956517777a2445018ecf36bece45bf40165007403b49c347ed4a217d3d6438518318cedb25354694473639da50845cab41cd29173575192acd8c
+  data.tar.gz: 06f6f69fea13c1405bb5e93576ed5779ca412db1955b7543effa2ced254a4af7e781154df370ae97cba887dfb962f29ca424d140040213b3442388f17e640d39

data/app/helpers/effective_email_templates_helper.rb

@@ -13,6 +13,7 @@ module EffectiveEmailTemplatesHelper
 
       if mail.present?
         email_review.body = mail.message.body
+        email_review.subject = mail.message.subject
       end
     end
 

data/app/models/effective/email_review.rb

@@ -4,25 +4,32 @@ module Effective
 
     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 = {})
-      new(attributes).tap do |email_review|
-        email_review.body ||= email_review.email_template&.body
-        email_review.template_name ||= email_review.email_template&.template_name
-      end
-    end
+      email_review = new(attributes)
+      template = email_review.email_template
 
-    validates :body, presence: true
-
-    validate(if: -> { body.present? }) do
-      begin
-        Liquid::Template.parse(body)
-      rescue Liquid::SyntaxError => e
-        errors.add(:body, e.message)
+      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

data/app/models/effective/email_template.rb

@@ -22,21 +22,8 @@ module Effective
       self.content_type ||= CONTENT_TYPES.first
     end
 
-    before_validation(if: -> { body.present? }) do
-      begin
-        Liquid::Template.parse(body)
-      rescue Liquid::SyntaxError => e
-        errors.add(:body, e.message)
-      end
-    end
-
-    before_validation(if: -> { subject.present? }) do
-      begin
-        Liquid::Template.parse(subject)
-      rescue Liquid::SyntaxError => e
-        errors.add(:subject, e.message)
-      end
-    end
+    validates :body, liquid: true
+    validates :subject, liquid: true
 
     validates :subject, presence: true
     validates :from, presence: true
@@ -86,11 +73,11 @@ module Effective
     private
 
     def template_body
-      Liquid::Template.parse(body)
+      Liquid::Template.parse(body_was || body)
     end
 
     def template_subject
-      Liquid::Template.parse(subject)
+      Liquid::Template.parse(subject_was || subject)
     end
 
     def deep_stringify_assigns(assigns)

data/lib/effective_email_templates/engine.rb

@@ -2,6 +2,9 @@ module EffectiveEmailTemplates
   class Engine < ::Rails::Engine
     engine_name 'effective_email_templates'
 
+    config.autoload_paths += Dir["#{config.root}/lib/validators/"]
+    config.eager_load_paths += Dir["#{config.root}/lib/validators/"]
+
     # Set up our default configuration options.
     initializer 'effective_email_templates.defaults', before: :load_config_initializers do |app|
       eval File.read("#{config.root}/config/effective_email_templates.rb")
@@ -16,4 +19,3 @@ module EffectiveEmailTemplates
 
   end
 end
-

data/lib/effective_email_templates/importer.rb

@@ -9,16 +9,18 @@ module EffectiveEmailTemplates
     end
 
     def execute(overwrite:, quiet: false)
-      Dir[Rails.root.join('app', 'views', '**', '*.liquid')].each do |filepath|
-        name = File.basename(filepath, '.liquid')
-        email_template = Effective::EmailTemplate.find_or_initialize_by(template_name: name)
+      ActionController::Base.view_paths.map(&:path).each do |path|
+        Dir[Rails.root.join(path, '**', '*_mailer/', '*.liquid')].each do |filepath|
+          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
+          if email_template.persisted? && !overwrite
+            puts("SKIPPED #{filename(filepath)}") unless quiet
+            next
+          end
 
-        save(email_template, filepath, quiet: quiet)
+          save(email_template, filepath, quiet: quiet)
+        end
       end
     end
 

data/lib/effective_email_templates/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEmailTemplates
-  VERSION = '1.0.11'.freeze
+  VERSION = '1.0.12'.freeze
 end

data/lib/validators/liquid_validator.rb

@@ -0,0 +1,15 @@
+# An ActiveRecord validator for any liquid field that you would use with effective_email_templates or otherwise
+#
+# validates :body, liquid: true
+
+class LiquidValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    if value.present?
+      begin
+        Liquid::Template.parse(value)
+      rescue Liquid::SyntaxError => e
+        record.errors.add(attribute, e.message)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_email_templates
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -115,6 +115,7 @@ files:
 - lib/effective_email_templates/version.rb
 - lib/generators/effective_email_templates/install_generator.rb
 - lib/tasks/effective_email_templates_tasks.rake
+- lib/validators/liquid_validator.rb
 homepage: https://github.com/code-and-effect/effective_email_templates
 licenses:
 - MIT