effective_resources 2.22.2 → 2.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 155b88e4f6e0f28971593f6c25da4f9c787a0da62ef6f7f851cec0496def856e
-  data.tar.gz: 1ad5f683874982e47be3186363354adf0460bfb4af7ed4c4c2e922341a34de66
+  metadata.gz: b5203021d6f8cd741603bcf0459f4277f6227c56fde16fd21fb99cae45564667
+  data.tar.gz: 505149510d60183e7b0935a043f6be30d96dbb79099225a89c6fdc136ad1100d
 SHA512:
-  metadata.gz: 3dca56a7285c363e1bdbb79f775c53d3e645788ecf783caaa72ade6824b191998824548069b6b52ab6d1d78b37828ce5a730c51d92a74810f80cfd1cae44f668
-  data.tar.gz: baa235bfd2a657daae89b7ae1e5103f10ae9c41e47c4d2fd3e1d18160f7f9eb399d494c614927fa089991209830c50c2c85573c83be0e81751ce4c78d23f9ff3
+  metadata.gz: 5efcc14c75d711551ae84574fd1bb64970273a170c7135a645af656b55be45ea8b71520827950933b13d636a32c51c5b0a4a58326666bbcf8722394ae086b6ad
+  data.tar.gz: ca89163745a47fe5be4342149df505800565cf6afc6991a9d765de4099d8b2efe17f570f27026eadaa5f7c6629edcd6d7f25c4f0ba5e6a13ea6b840f52c49f15

data/app/helpers/effective_acts_as_email_form_helper.rb

@@ -20,12 +20,20 @@ module EffectiveActsAsEmailFormHelper
     # These defaults are only used when there is no email_template
     email_defaults = form.object.email_form_defaults(action) unless email_template.present?
 
+    from = email_template&.from || email_defaults[:from] || EffectiveResources.mailer_froms.first
+    subject = email_template&.subject || email_defaults[:subject] || ''
+    body = email_template&.body || email_defaults[:body] || ''
+    content_type = email_template&.content_type || email_defaults[:content_type] || ''
+
     locals = {
       form: form,
       email_to: to,
+      email_from: from,
+      email_subject: subject,
+      email_body: body,
+      email_content_type: content_type,
       email_skip: skip,
       email_action: (action || true),
-      email_defaults: email_defaults,
       email_template: email_template,
       email_variables: variables
     }

data/app/models/concerns/acts_as_email_form.rb

@@ -41,7 +41,7 @@ module ActsAsEmailForm
       validates :email_form_body, presence: true
 
       validate(unless: -> { email_form_from.blank? }) do
-        self.errors.add(:email_form_from, 'must be a valid email address') unless email_form_from.include?('@')
+        errors.add(:email_form_from, 'must be a valid email address') unless email_form_from.include?('@')
       end
     end
 
@@ -60,7 +60,7 @@ module ActsAsEmailForm
 
     # Only considered when not using an effective email template
     def email_form_defaults(action)
-      { from: nil, subject: nil, body: nil }
+      { from: nil, subject: nil, body: nil, content_type: 'text/plain' }
     end
 
   end

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

@@ -4,26 +4,18 @@
   = form.check_box :email_form_skip, label: 'Do not send email'
 
 = form.hide_if :email_form_skip, true do
+  - errors = form.object.errors.present?
+
   - if email_to.present?
     = form.static_field :email_form_to, label: 'To', value: (email_to.try(:email) || email_to)
 
-  - 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
+  = form.select :email_form_from, mailer_froms_collection(), label: 'From', value: (email_from unless errors)
+  = form.text_field :email_form_subject, label: 'Subject', value: (email_subject unless errors)
 
+  - if email_content_type == 'text/html'
+    = form.article_editor :email_form_body, label: 'Body', mode: :email, value: (email_body unless errors)
   - 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] || '')
+    = form.text_area :email_form_body, label: 'Body', rows: 10, value: (email_body unless errors)
 
   - if email_variables.present?
     %p The available variables are:

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.22.2'.freeze
+  VERSION = '2.23.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.22.2
+  version: 2.23.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-17 00:00:00.000000000 Z
+date: 2024-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails