effective_resources 1.14.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f21136f9833dbd9036cad7cb495972fef7601e9a53aa0a531f316fc270d898bb
-  data.tar.gz: 043bcdba74212c6c195539bd4a6991acf44be982660885a2d33f8908ebef572b
+  metadata.gz: 5e7d7a9ee482e38794221a01b428e01de652eb23b63c2b926eda018c47ae057c
+  data.tar.gz: 5a920c11ce61cf201a20b1a7b2fb946846d1f034ad4e9acb91253b6d0a8f6ce5
 SHA512:
-  metadata.gz: afbfc06d0319bfd759a924dea4bc8e8b47c0d772d88f2bddb6925bf926032b97553d9049ac97f398e7a48515c0154d2db4268eb8c7b55e43c87f99dd146c9cad
-  data.tar.gz: e71929d4829aa0624ff5314a8e87cb9f4369c0ce20b7e1be55f5da57af243a5c3e4d0fc3de91356883c49ce9064260d2ede78d238b8a9e209628369f2f1eeb77
+  metadata.gz: 99d01c855370aa34ad51bc3bde24a11d6b57080616312b4ed8e9c066601ec7fb5275117327780a94f9d85ad81e9a9486c49be29dfcb429f4654b3cac64ce67cc
+  data.tar.gz: 3fcd18e60abdb8f8da2208a92c6547718611ad70f0018c7a43af831173da3ee44cdc1c5a3a6f033c54d6fe97d67c749b8ccfb01f8b52e46893b132b6a6a5aada

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,6 +43,9 @@ 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 = '"Info" <info@example.com>'
 

data/lib/effective_resources/effective_gem.rb

@@ -5,7 +5,7 @@ module EffectiveGem
 
   EXCLUDED_GETTERS = [
     :config, :setup, :send_email, :parent_mailer_class,
-    :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin
+    :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject
   ]
 
   included do
@@ -72,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/engine.rb

@@ -57,11 +57,9 @@ module EffectiveResources
     # Register the acts_as_archived routes concern
     # resources :things, concerns: :acts_as_archived
     initializer 'effective_resources.routes_concern' do |app|
-      ActionDispatch::Routing::Mapper.include(ActsAsArchived::RoutesConcern)
-
-      # Doesn't seem to work with the on_load in rails 6.0
-      #ActiveSupport.on_load :action_controller_base do
-      #end
+      app.config.to_prepare do
+        ActionDispatch::Routing::Mapper.include(ActsAsArchived::RoutesConcern)
+      end
     end
 
     # Register the flash_messages concern so that it can be called in ActionController

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.14.0'.freeze
+  VERSION = '1.16.0'.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.14.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-03 00:00:00.000000000 Z
+date: 2022-03-12 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