effective_email_templates 1.0.3 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d25efc5fcbfdd39c8db6714777574361d0658757e68cfee0e88c075c0b84faa4
-  data.tar.gz: fc54755485ddc9a80b081ea1448ce4b2ecbccdb546c1b08146dbc36982499100
+  metadata.gz: c84d011bfae37921bb40271777c47e7a3d2160152c0b408ab7dd76df71eea2e7
+  data.tar.gz: 9a4e13582f66232d044cf19eb5691f654313946b4a8eaa0b489b9d71b2cd9997
 SHA512:
-  metadata.gz: 6727c12728c12a03a74c9b126b0a16a3c2bf12b16e2dcb8efc53c66b3f9efef9a0f71df34c4a97bf3336b6e1586e606b1ae91e3cbaccfbc833c4c0653c273f51
-  data.tar.gz: cc09e802861ebbfb5564a6670fb8422c9acf9f522a5230ffdeeb56a0c5e5af7f42d80826335c4ada8cb36649b45a3589e7395228ce45b9541e0d9441d4c70a0a
+  metadata.gz: c8a0b4e52f4746b5e5a1d174133350838eed9e3ae2e6198400defcede6d4aad45fac66563c19cf4c9c32190f3e9226fe8df69af654029be9061037f1cf78750d
+  data.tar.gz: 30bed477a7ff6817bbe9b2a4887b69fca67b5bc4578de17951d336b4c3c1e50a2bcb87610d9ecef696f38b093ce16cedc6b877d4facd8dfe0ee59b7649c472c9

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/helpers/effective_email_templates_helper.rb

@@ -3,9 +3,9 @@ module EffectiveEmailTemplatesHelper
   def effective_email_review_fields(form, template_name)
     email_review = form.object.email_review
 
-    email_review ||= begin
+    unless email_review&.template_name == template_name.to_s
       email_template = Effective::EmailTemplate.where(template_name: template_name).first!
-      form.object.build_email_review(email_template: email_template)
+      email_review = Effective::EmailReview.build(email_template: email_template)
     end
 
     render(partial: 'effective/email_reviews/fields', locals: { email_review: email_review, form: form })

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_review.rb

@@ -3,11 +3,13 @@ module Effective
     include ActiveModel::Model
 
     attr_accessor :email_template
+    attr_accessor :template_name
     attr_accessor :body
 
     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
 
@@ -21,5 +23,9 @@ module Effective
       end
     end
 
+    def email_template
+      @email_template ||= Effective::EmailTemplate.where(template_name: template_name).first
+    end
+
   end
 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
@@ -49,14 +51,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/effective/email_reviews/_fields.html.haml

@@ -1,2 +1,13 @@
 = form.fields_for(:email_review, email_review) do |f|
-  = 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:
+
+    %ul
+      - Array(f.object.email_template&.template_variables).each do |variable|
+        %li {{ #{variable} }}
+
+    %small.text-muted Only a developer can add additional variables
+

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.3'.freeze
+  VERSION = '1.0.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_email_templates
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails