effective_resources 2.11.6 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df20052518286a1ff3271eddb3e9007211d31ac6702cc4bb87ddf0c6706a0a31
-  data.tar.gz: 15b0d4740305154619c1cf4922ed567811149c60966d63d2c737c6306a2b8e1c
+  metadata.gz: 9f4283f3c4e59e72313277c4e8a132c9bcb35fb9250fbd140733c53c2e74d18b
+  data.tar.gz: ec11d262fa2bb76d6cea5e31b9445da37fc1c89d4721c89465d07b2bef9ef6bc
 SHA512:
-  metadata.gz: eccffe9230dd0ee3119e04c48cc8b05374d73d29ca18c7d5344c7d6be3cf39362622cadf17265b0f146773bd0be3dd77276b5988832d82c641c8c0f1f348a4c7
-  data.tar.gz: ab946a0050800cab2698955c69cdd27911ec110f7a68dacd19ef975b7800e2eadd1145c456f660d775b3f985d4e1e6a9f62776363191d78fae68f08ea0e81bb9
+  metadata.gz: fce12caba2beddbabbd580ddfc9a75e1bc0e0b3827a1bba509141764856953df8015e44f489e872d5cb2cde6b093d527e9823be0d273b984c771a443d8211ee6
+  data.tar.gz: ec4a712e9c30fd1ba87c019b8bf98861cdcddb236e8b0872f45f83fa6ea3b01102fdc2030a0d3a92cc2cace7829b0123f6dd042042dd6da08c7b9e6d81597bcf

data/app/helpers/effective_acts_as_email_form_helper.rb

@@ -13,15 +13,25 @@ module EffectiveActsAsEmailFormHelper
       action.kind_of?(Effective::EmailTemplate) ? action : Effective::EmailTemplate.where(template_name: action).first!
     end
 
-    # These defaults are only used when there is no email_template
-    email_defaults = form.object.email_form_defaults(action) unless email_template.present?
+    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
 
     locals = {
       form: form,
       email_to: to,
       email_skip: skip,
       email_action: (action || true),
-      email_defaults: email_defaults,
       email_template: email_template,
       email_variables: variables
     }

data/app/mailers/concerns/effective_mailer.rb

@@ -14,9 +14,11 @@ module EffectiveMailer
     mailer_settings.mailer_admin
   end
 
-  def subject_for(action, subject, resource, opts = {})
+  def subject_for(action, default, 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

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

@@ -4,24 +4,12 @@
   = form.check_box :email_form_skip, label: 'Do not send email'
 
 = form.hide_if :email_form_skip, true do
-  - if email_to.present? && form.respond_to?(:static_field)
-    = form.static_field :email_form_to, label: 'To', value: (email_to.respond_to?(:email) ? email_to.email : email_to)
+  - 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.text_field :email_form_from, 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
-    = form.text_field :email_form_from, label: 'From', value: email_template.from
-    = 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
-    = form.text_field :email_form_from, label: 'From', value: (email_defaults[:from] || '')
-    = 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.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 email_variables.present?
     %p The available variables are:
@@ -30,4 +18,4 @@
       - email_variables.each do |variable|
         %li {{ #{variable} }}
 
-    %small.text-muted Only a developer can add additional variables
+    %small.text-muted Please contact us to add additional variables

data/config/effective_resources.rb

@@ -49,6 +49,10 @@ EffectiveResources.setup do |config|
   # Default From
   config.mailer_sender = '"Info" <info@example.com>'
 
+  # Default Froms radios collection
+  # Used for effective gems email collection. Leave blank to fallback to just the mailer_sender
+  config.mailer_froms = ['"Info" <info@example.com>', '"Admin" <admin@example.com>']
+
   # Send Admin correspondence To
   config.mailer_admin = '"Admin" <admin@example.com>'
 end

data/lib/effective_resources/effective_gem.rb

@@ -7,7 +7,7 @@ module EffectiveGem
 
   EXCLUDED_GETTERS = [
     :config, :setup, :send_email, :parent_mailer_class,
-    :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject
+    :deliver_method, :mailer_layout, :mailer_sender, :mailer_froms, :mailer_admin, :mailer_subject
   ]
 
   included do
@@ -70,6 +70,10 @@ module EffectiveGem
       config[:mailer_sender].presence || EffectiveResources.mailer_sender
     end
 
+    def mailer_froms
+      config[:mailer_froms].presence || EffectiveResources.mailer_froms
+    end
+
     def mailer_admin
       config[:mailer_admin].presence || EffectiveResources.mailer_admin
     end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.11.6'.freeze
+  VERSION = '2.13.0'.freeze
 end

data/lib/effective_resources.rb

@@ -10,7 +10,7 @@ module EffectiveResources
   def self.config_keys
     [
       :authorization_method, :default_submits,
-      :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject
+      :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_froms, :mailer_admin, :mailer_subject
     ]
   end
 
@@ -60,12 +60,16 @@ module EffectiveResources
     config[:mailer_subject] || MAILER_SUBJECT_PROC
   end
 
+  def self.mailer_admin
+    config[:mailer_admin] || raise('effective resources mailer_admin missing. Add it to config/initializers/effective_resources.rb')
+  end
+
   def self.mailer_sender
     config[:mailer_sender] || raise('effective resources mailer_sender missing. Add it to config/initializers/effective_resources.rb')
   end
 
-  def self.mailer_admin
-    config[:mailer_admin] || raise('effective resources mailer_admin missing. Add it to config/initializers/effective_resources.rb')
+  def self.mailer_froms
+    config[:mailer_froms].presence || [mailer_sender]
   end
 
   # Utilities

metadata

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