effective_resources 1.13.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47223bd598879ab72aa61596d1179ba80bb92b9978e97bfca8d72a55708ebeb4
-  data.tar.gz: 1ffe0c08d538e01f6423acc9bcfd6f2b0a5967c9258e8474e7ee85a6c6fc9b2f
+  metadata.gz: 37818a2db37ab767ea5c415519b0674ba87cc5a998978730a7851df8fddeae1d
+  data.tar.gz: 89f53d6a3238db076a5c9b212ce306109954c1cea374f763b755b7b8ee565e5b
 SHA512:
-  metadata.gz: 99fa630b70a1d1b4952bb9ae0ef1a277d2a958d9f693fa023dd2c1c47c5eb1a1ab10056e276de8985c1b2327fb2493479699fff5b004a5d710ff1c794e0fc3fd
-  data.tar.gz: 2a131e320fa7af2df8de848a3a9878858b96cf86993c34682f14efe7bac7d9b2bbc1824a0a7e395c07b29c77e5474fc1c0190f4092828968c7e7e98f957a6ddf
+  metadata.gz: ceb3fdb52931639ebb8ba24454dd103daa45dccc674d2d1dadb1a31d1e89da7f28f9a107a5db6e8dc38e2c688970366b3d36c9e189c78d7b5cca45555468e577
+  data.tar.gz: 1cea14061c7f0cc2bda9f56efd57f9be8b6018af50cdc72e8759d4ae80a120e5fcfceefea4da0908f95d3fc4161c4bf87d5472c69c93099ebd10137a5d5cb7b7

data/app/mailers/concerns/effective_mailer.rb

@@ -0,0 +1,52 @@
+# Includes some shared mailer methods for effective_* gem mailers
+
+module EffectiveMailer
+  extend ActiveSupport::Concern
+
+  included do
+    default from: -> { mailer_settings.mailer_sender }
+    layout -> { mailer_settings.mailer_layout }
+  end
+
+  protected
+
+  def mailer_admin
+    mailer_settings.mailer_admin
+  end
+
+  def subject_for(action, subject, resource, opts = {})
+    mailer_subject = mailer_settings.mailer_subject
+
+    if mailer_subject.respond_to?(:call)
+      subject = self.instance_exec(action, subject, resource, opts, &mailer_subject)
+    end
+
+    subject
+  end
+
+  def headers_for(resource, opts = {})
+    (resource.respond_to?(:log_changes_datatable) ? opts.merge(log: resource) : opts)
+  end
+
+  private
+
+  # This returns the top level gem, EffectiveOrders or EffectiveResources
+  def mailer_settings
+    name = self.class.name.sub('::', '').sub('Mailer', '')
+
+    # If this is in a gem mailer like Effective::OrdersMailer we use constantize
+    # Otherwise this could be included in an ApplicationMailer, so we defer to EffectiveResources
+    klass = if name.start_with?('Effective')
+      name.constantize
+    else
+      name.safe_constantize || EffectiveResources
+    end
+
+    raise('expected mailer settings to respond to mailer_subject') unless klass.respond_to?(:mailer_subject)
+    raise('expected mailer settings to respond to mailer_sender') unless klass.respond_to?(:mailer_sender)
+    raise('expected mailer settings to respond to mailer_layout') unless klass.respond_to?(:mailer_layout)
+
+    klass
+  end
+
+end

data/app/models/effective/resources/controller.rb

@@ -47,7 +47,6 @@ module Effective
             action_name = action.to_s.titleize
 
             if action == :destroy
-              next if buttons.values.find { |v| v[:action] == :archive }.present?
               buttons['Delete'] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really delete @resource?" }
             else
               buttons[action_name] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really #{action_name} @resource?" }
@@ -101,7 +100,6 @@ module Effective
             action_name = action.to_s.titleize
 
             if action == :destroy
-              next if actions.find { |_, v| v[:action] == :archive }.present?
               actions['Delete'] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really delete @resource?" }
             else
               actions[action_name] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really #{action_name} @resource?" }

data/config/effective_resources.rb

@@ -43,9 +43,12 @@ EffectiveResources.setup do |config|
   # Default layout
   # config.mailer_layout = 'effective_mailer_layout'
 
+  # Customize the Subject
+  # config.mailer_subject = Proc.new { |action, subject, resource, opts = {}| subject }
+
   # Default From
-  config.mailer_sender = "no-reply@example.com"
+  config.mailer_sender = '"Info" <info@example.com>'
 
   # Send Admin correspondence To
-  config.mailer_admin = "admin@example.com"
+  config.mailer_admin = '"Admin" <admin@example.com>'
 end

data/lib/effective_resources/effective_gem.rb

@@ -3,13 +3,24 @@
 module EffectiveGem
   extend ActiveSupport::Concern
 
+  EXCLUDED_GETTERS = [
+    :config, :setup, :send_email, :parent_mailer_class,
+    :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject
+  ]
+
   included do
     raise("expected self.config_keys method") unless respond_to?(:config_keys)
 
-    config_keys.each do |key|
+    # Define getters
+    (config_keys - EXCLUDED_GETTERS).each do |key|
       self.singleton_class.define_method(key) { config()[key] }
+    end
+
+    # Define setters
+    config_keys.each do |key|
       self.singleton_class.define_method("#{key}=") { |value| config()[key] = value }
     end
+
   end
 
   module ClassMethods
@@ -61,6 +72,10 @@ module EffectiveGem
       config[:mailer_admin].presence || EffectiveResources.mailer_admin
     end
 
+    def mailer_subject
+      config[:mailer_subject].presence || EffectiveResources.mailer_subject
+    end
+
     def send_email(email, *args)
       raise('gem does not respond to mailer_class') unless respond_to?(:mailer_class)
       raise('expected args to be an Array') unless args.kind_of?(Array)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.13.0'.freeze
+  VERSION = '1.15.1'.freeze
 end

data/lib/effective_resources.rb

@@ -3,11 +3,12 @@ require 'effective_resources/version'
 require 'effective_resources/effective_gem'
 
 module EffectiveResources
+  MAILER_SUBJECT_PROC = Proc.new { |action, subject, resource, opts = {}| subject }
 
   def self.config_keys
     [
       :authorization_method, :default_submits,
-      :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :parent_mailer
+      :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject
     ]
   end
 
@@ -44,10 +45,19 @@ module EffectiveResources
     (rails.respond_to?(:active_job) && rails.active_job.queue_adapter) ? :deliver_later : :deliver_now
   end
 
+  def self.parent_mailer_class
+    return config[:parent_mailer].constantize if config[:parent_mailer].present?
+    '::ApplicationMailer'.safe_constantize || 'ActionMailer::Base'.constantize
+  end
+
   def self.mailer_layout
     config[:mailer_layout] || 'effective_mailer_layout'
   end
 
+  def self.mailer_subject
+    config[:mailer_subject] || MAILER_SUBJECT_PROC
+  end
+
   def self.mailer_sender
     config[:mailer_sender] || raise('effective resources mailer_sender missing. Add it to config/initializers/effective_resources.rb')
   end
@@ -56,11 +66,6 @@ module EffectiveResources
     config[:mailer_admin] || raise('effective resources mailer_admin missing. Add it to config/initializers/effective_resources.rb')
   end
 
-  def self.parent_mailer_class
-    return config[:parent_mailer].constantize if config[:parent_mailer].present?
-    '::ApplicationMailer'.safe_constantize || 'ActionMailer::Base'.constantize
-  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: 1.13.0
+  version: 1.15.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-03 00:00:00.000000000 Z
+date: 2022-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -152,6 +152,7 @@ files:
 - app/helpers/effective_resources_helper.rb
 - app/helpers/effective_resources_private_helper.rb
 - app/helpers/effective_resources_wizard_helper.rb
+- app/mailers/concerns/effective_mailer.rb
 - app/models/concerns/acts_as_archived.rb
 - app/models/concerns/acts_as_email_form.rb
 - app/models/concerns/acts_as_purchasable_wizard.rb