effective_resources 2.14.0 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 119e9f0a8624355ffae9fccf896c8113eec69a9951d348f606bc7d84bb4aeb54
-  data.tar.gz: 1298347e273712aebf5dc5b83131d009a6002e93c9ab912681fe75d22fff754d
+  metadata.gz: fd61b5df998f90f23f8564279a7dc20840cf169c5114b026ff7cadef9978f00f
+  data.tar.gz: 1106d08aabdc5053db5fb6e78db263be7157b477b78dc6162f7edc8feef10ede
 SHA512:
-  metadata.gz: 41cf9cf6dea7e560c11a63db4da0f9b3cc4f5144c70eec3b6094834a1c8ada28bd898de0c673081f854942d75561576d31409cb0f62c12388f86d847442b87d2
-  data.tar.gz: 7a0f942c31ac1c589c68e7f711fffc1202d15637dafeada9bdaf9f4f2271367d35e908ddef420af9de7170a0869e36c7ed7376e5795b7111fd65ac62cc4245e7
+  metadata.gz: 8815dfa572def42ccad3f5731af8fffe847992a997568a2fd867a4b1586ec51716bfd368d42df15f5578fa2a3759ada115e09243ee225314aa7b3d1f30e14412
+  data.tar.gz: 1abf591d59b8a0ec96bfe05f8a2d0e6776389b7016a47ae72bc0bf010a70f33c8f7719a4b4e0424c55b0869c6eb3afc9ce9f82984ce7769800b637c4c0c992cd

data/app/helpers/effective_acts_as_email_form_helper.rb

@@ -13,25 +13,15 @@ module EffectiveActsAsEmailFormHelper
       action.kind_of?(Effective::EmailTemplate) ? action : Effective::EmailTemplate.where(template_name: action).first!
     end
 
-    if email_template.present?
-      resource.email_form_from ||= email_template.from
-      resource.email_form_subject ||= email_template.subject
-      resource.email_form_body ||= email_template.body
-    else
-      defaults = form.object.email_form_defaults(action)
-
-      resource.email_form_from ||= defaults[:from]
-      resource.email_form_subject ||= defaults[:subject]
-      resource.email_form_body ||= defaults[:body]
-    end
-
-    resource.email_form_from ||= EffectiveResources.mailer_froms.first
+    # These defaults are only used when there is no email_template
+    email_defaults = form.object.email_form_defaults(action) unless email_template.present?
 
     locals = {
       form: form,
       email_to: to,
       email_skip: skip,
       email_action: (action || true),
+      email_defaults: email_defaults,
       email_template: email_template,
       email_variables: variables
     }
@@ -39,4 +29,13 @@ module EffectiveActsAsEmailFormHelper
     render(partial: (partial || 'effective/acts_as_email_form/fields'), locals: locals)
   end
 
+  def mailer_froms_collection(froms: nil)
+    froms ||= EffectiveResources.mailer_froms
+
+    froms.map do |from|
+      html = content_tag(:span, escape_once(from))
+      [from, from, 'data-html': html]
+    end
+  end
+
 end

data/app/mailers/concerns/effective_mailer.rb

@@ -8,17 +8,9 @@ module EffectiveMailer
     layout -> { mailer_settings.mailer_layout }
   end
 
-  protected
-
-  def mailer_admin
-    mailer_settings.mailer_admin
-  end
-
-  def subject_for(action, default, resource, opts = {})
+  def subject_for(action, subject, resource, opts = {})
     mailer_subject = mailer_settings.mailer_subject
 
-    subject = opts[:subject] || opts['subject'] || default
-
     if mailer_subject.respond_to?(:call)
       subject = self.instance_exec(action, subject, resource, opts, &mailer_subject)
     end
@@ -26,18 +18,12 @@ module EffectiveMailer
     subject
   end
 
-  def headers_for(resource, opts = {})
-    headers = opts
-
-    if resource.respond_to?(:log_changes_datatable)
-      headers[:log] = resource
-    end
-
-    if (opts[:subject] || opts['subject']).present?
-      headers[:custom_subject] = true
-    end
+  def mailer_admin
+    mailer_settings.mailer_admin
+  end
 
-    headers
+  def headers_for(resource, opts = {})
+    resource.respond_to?(:log_changes_datatable) ? opts.merge(log: resource) : opts
   end
 
   private

data/app/models/concerns/acts_as_email_form.rb

@@ -43,9 +43,9 @@ module ActsAsEmailForm
       end
     end
 
-    if defined?(EffectiveEmailTemplates)
-      validates :email_form_subject, liquid: true, if: -> { email_form_effective_email_templates? }
-      validates :email_form_body, liquid: true, if: -> { email_form_effective_email_templates? }
+    with_options(if: -> { defined?(EffectiveEmailTemplates) }) do
+      validates :email_form_subject, liquid: true
+      validates :email_form_body, liquid: true
     end
 
     def email_form_params
@@ -56,10 +56,6 @@ module ActsAsEmailForm
       EffectiveResources.truthy?(email_form_skip)
     end
 
-    def email_form_effective_email_templates?
-      !!defined?(EffectiveEmailTemplates)
-    end
-
     # Only considered when not using an effective email template
     def email_form_defaults(action)
       { from: nil, subject: nil, body: nil }

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

@@ -7,9 +7,23 @@
   - if email_to.present?
     = form.static_field :email_form_to, label: 'To', value: (email_to.try(:email) || email_to)
 
-  = form.select :email_form_from, EffectiveResources.mailer_froms, label: 'From'
-  = form.text_field :email_form_subject, label: 'Subject'
-  = form.text_area :email_form_body, label: 'Body', rows: 10
+  - if form.object.errors.present?
+    = form.select :email_form_from, mailer_froms_collection(), label: 'From'
+    = form.text_field :email_form_subject, label: 'Subject'
+    = form.text_area :email_form_body, label: 'Body', rows: 10
+
+  - elsif email_template.present?
+    -# email_template is an Effective::EmailTemplate
+    - from_value = email_template.from || EffectiveResources.mailer_froms.first
+    = form.select :email_form_from, mailer_froms_collection(), label: 'From', value: from_value
+    = form.text_field :email_form_subject, label: 'Subject', value: email_template.subject
+    = form.text_area :email_form_body, label: 'Body', value: email_template.body, rows: 10
+
+  - else
+    - from_value = email_defaults[:from] || EffectiveResources.mailer_froms.first
+    = form.select :email_form_from, mailer_froms_collection(), label: 'From', value: from_value
+    = form.text_field :email_form_subject, label: 'Subject', value: (email_defaults[:subject] || '')
+    = form.text_area :email_form_body, label: 'Body', rows: 10, value: (email_defaults[:body] || '')
 
   - if email_variables.present?
     %p The available variables are:

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.14.0'.freeze
+  VERSION = '2.15.0'.freeze
 end

data/lib/effective_resources.rb

@@ -72,6 +72,11 @@ module EffectiveResources
     config[:mailer_froms].presence || [mailer_sender]
   end
 
+  # This is used by the effective_email_templates form
+  def self.mailer_subject_prefix_hint
+    instance_exec(:mailer_subject_blank_prefix, nil, nil, nil, &mailer_subject) if mailer_subject.respond_to?(:call)
+  end
+
   # Utilities
 
   # This looks up the best class give the name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.15.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-25 00:00:00.000000000 Z
+date: 2023-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails