effective_resources 1.12.3 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47e241da2411f181fa4a176db6791e1416b861f38061c9186fdf595df78767e2
-  data.tar.gz: 76dc05f7974a967a14c608161e9c57e90eb66a962f32ca923b4913bd1f4f15bb
+  metadata.gz: f21136f9833dbd9036cad7cb495972fef7601e9a53aa0a531f316fc270d898bb
+  data.tar.gz: 043bcdba74212c6c195539bd4a6991acf44be982660885a2d33f8908ebef572b
 SHA512:
-  metadata.gz: 6dc99f690d6f2aa26bfa240df5d9b5887ff4811ecf834178269934c5ef35cdd195180cc137302a2d31dee371ca5d012077f8d0113d146410d76fc9f6b06d2723
-  data.tar.gz: aebfd8aff7b492dbf304ae5be5b3c63d6432754b2272c4c77a0aff64e1685add92fa70dadc385589c56e0b55dfc430156a18a9945bdb22fa73488ec970bbba10
+  metadata.gz: afbfc06d0319bfd759a924dea4bc8e8b47c0d772d88f2bddb6925bf926032b97553d9049ac97f398e7a48515c0154d2db4268eb8c7b55e43c87f99dd146c9cad
+  data.tar.gz: e71929d4829aa0624ff5314a8e87cb9f4369c0ce20b7e1be55f5da57af243a5c3e4d0fc3de91356883c49ce9064260d2ede78d238b8a9e209628369f2f1eeb77

data/app/controllers/concerns/effective/wizard_controller/actions.rb

@@ -24,10 +24,13 @@ module Effective
       def update
         Rails.logger.info 'Processed by Effective::WizardController#update'
 
+        action = (commit_action[:action] == :save ? :update : commit_action[:action])
+        EffectiveResources.authorize!(self, action, resource)
+
         resource.assign_attributes(send(resource_params_method_name))
         assign_current_step
 
-        save_wizard_resource(resource)
+        save_wizard_resource(resource, action)
       end
 
     end

data/app/controllers/concerns/effective/wizard_controller/save.rb

@@ -4,12 +4,17 @@ module Effective
 
       def save_wizard_resource(resource, action = nil, options = {})
         was_new_record = resource.new_record?
-        action ||= resource.respond_to?("#{step}!") ? step : :save
+
+        if action.blank? || action == :update
+          action = resource.respond_to?("#{step}!") ? step : :save
+        end
 
         if save_resource(resource, action)
           flash[:success] ||= options.delete(:success) || resource_flash(:success, resource, action)
 
           @skip_to ||= skip_to_step(resource)
+
+          @redirect_to ||= resource_redirect_path(resource, action) if specific_redirect_path?(action)
           @redirect_to ||= resource_wizard_path(resource, @skip_to) if was_new_record
 
           if @redirect_to

data/config/effective_resources.rb

@@ -30,7 +30,7 @@ EffectiveResources.setup do |config|
   # Supported values: 'Save', 'Continue', and 'Add New'
   config.default_submits = ['Save', 'Continue', 'Add New']
 
-  # Email Settings
+  # Mailer Settings
   #
   # The default mailer settings for all effective gems
   #
@@ -44,8 +44,8 @@ EffectiveResources.setup do |config|
   # config.mailer_layout = 'effective_mailer_layout'
 
   # 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
+  ]
+
   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
@@ -39,13 +50,33 @@ module EffectiveGem
       true
     end
 
-    # This is included into every gem
-    # The gem may not have a mailer or use effective email templates
+    # Mailer Settings
+    # These methods are intended to flow through to the default EffectiveResources settings
+    def parent_mailer_class
+      config[:parent_mailer].presence&.constantize || EffectiveResources.parent_mailer_class
+    end
+
+    def deliver_method
+      config[:deliver_method].presence || EffectiveResources.deliver_method
+    end
+
+    def mailer_layout
+      config[:mailer_layout].presence || EffectiveResources.mailer_layout
+    end
+
+    def mailer_sender
+      config[:mailer_sender].presence || EffectiveResources.mailer_sender
+    end
+
+    def mailer_admin
+      config[:mailer_admin].presence || EffectiveResources.mailer_admin
+    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)
 
-      mailer_class.send(email, *args).send(EffectiveResources.deliver_method)
+      mailer_class.send(email, *args).send(deliver_method)
     end
 
   end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.12.3'.freeze
+  VERSION = '1.14.0'.freeze
 end

data/lib/effective_resources.rb

@@ -34,7 +34,9 @@ module EffectiveResources
     (['Save', 'Continue', 'Add New'] & Array(config.default_submits)).inject({}) { |h, v| h[v] = true; h }
   end
 
-  # Email
+  # Mailer Settings
+  # These serve as the default mailer settings for all effective_* gems
+  # They can be overriden on a per-gem basis.
   def self.deliver_method
     return config[:deliver_method] if config[:deliver_method].present?
 
@@ -109,7 +111,6 @@ module EffectiveResources
     end
   end
 
-
   def self.advance_date(date, business_days: 1, holidays: [:ca, :observed])
     raise('business_days must be an integer <= 365') unless business_days.kind_of?(Integer) && business_days <= 365
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.12.3
+  version: 1.14.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-04 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails