effective_resources 1.12.2 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 708a6f264932790398c9a14aac69e4755d828a85510724358b3b007b18cf2acc
-  data.tar.gz: 6b1617fd635ca5c208b211e4c87b86a2445e0f644b493a66f95e46de615dd8b0
+  metadata.gz: 47223bd598879ab72aa61596d1179ba80bb92b9978e97bfca8d72a55708ebeb4
+  data.tar.gz: 1ffe0c08d538e01f6423acc9bcfd6f2b0a5967c9258e8474e7ee85a6c6fc9b2f
 SHA512:
-  metadata.gz: b84ed8b1ebdac3e4a342c1447be127ad5d3a68b3afcdfe01d7e8c2e5e6d54f829ba1a0908a8a783c20f43d817ca0c9abceb77c88448d731451953e7812f7031a
-  data.tar.gz: 8c7a42aa944f20c7a0eab0f2a9c46f37963b794e5afee932f590211a866e633a1e6349b54c3ba5ec1f61aff2b33ac7ab392dba81b69c246b3a30918b9b9d9b3a
+  metadata.gz: 99fa630b70a1d1b4952bb9ae0ef1a277d2a958d9f693fa023dd2c1c47c5eb1a1ab10056e276de8985c1b2327fb2493479699fff5b004a5d710ff1c794e0fc3fd
+  data.tar.gz: 2a131e320fa7af2df8de848a3a9878858b96cf86993c34682f14efe7bac7d9b2bbc1824a0a7e395c07b29c77e5474fc1c0190f4092828968c7e7e98f957a6ddf

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/app/models/concerns/acts_as_purchasable_wizard.rb

@@ -62,7 +62,7 @@ module ActsAsPurchasableWizard
     end
 
     # From Billing Step
-    order.billing_address = owner.billing_address if owner.billing_address.present?
+    order.billing_address = owner.billing_address if owner.try(:billing_address).present?
 
     # Important to add/remove anything
     order.save!

data/app/models/concerns/acts_as_wizard.rb

@@ -141,6 +141,10 @@ module ActsAsWizard
   module ClassMethods
     def acts_as_wizard?; true; end
 
+    def wizard_steps_hash
+      const_get(:WIZARD_STEPS)
+    end
+
     def all_wizard_steps
       const_get(:WIZARD_STEPS).keys
     end

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
   #

data/lib/effective_resources/effective_gem.rb

@@ -39,13 +39,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.2'.freeze
+  VERSION = '1.13.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.2
+  version: 1.13.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails