effective_resources 1.16.0 → 1.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e7d7a9ee482e38794221a01b428e01de652eb23b63c2b926eda018c47ae057c
-  data.tar.gz: 5a920c11ce61cf201a20b1a7b2fb946846d1f034ad4e9acb91253b6d0a8f6ce5
+  metadata.gz: 88760067301847f6d36a2f8550224e019acf06cc9fcc9021a7cf22799e09d560
+  data.tar.gz: 8a922371e95e9f9c91e1cd907b858f19316615508a05077ec5025c7c82c4e1c4
 SHA512:
-  metadata.gz: 99d01c855370aa34ad51bc3bde24a11d6b57080616312b4ed8e9c066601ec7fb5275117327780a94f9d85ad81e9a9486c49be29dfcb429f4654b3cac64ce67cc
-  data.tar.gz: 3fcd18e60abdb8f8da2208a92c6547718611ad70f0018c7a43af831173da3ee44cdc1c5a3a6f033c54d6fe97d67c749b8ccfb01f8b52e46893b132b6a6a5aada
+  metadata.gz: c19cbb3988ce98384ff670148617f5779337254fcaee5b4c68f354cd0d9a2bc40d15497db83c53d3f5dd9c37a9e13191f40bf3ed435a8607b05963e2678a292b
+  data.tar.gz: 96e9c5059d55ff3ad40a10f891fd8765eb9fee9d359d19809b1566a47dca26cbccde1f18e4f182f64740c2738134d6e08d93be7170add23ef917bed1631c7a9e

data/app/controllers/concerns/effective/crud_controller.rb

@@ -126,10 +126,13 @@ module Effective
     end
 
     def resource_layout
+      namespace = controller_path.include?('admin/') ? 'admin' : 'application'
+
       if defined?(Tenant)
-        namespace = controller_path.include?('admin/') ? 'admin' : 'application'
-        "#{Tenant.current}/#{namespace}"
+        return "#{Tenant.current}/#{namespace}"
       end
+
+      namespace
     end
 
     def resource_params_method_name

data/app/models/concerns/acts_as_purchasable_wizard.rb

@@ -48,9 +48,12 @@ module ActsAsPurchasableWizard
   end
 
   def find_or_build_submit_order
-    order = submit_order || orders.build(user: owner)
+    order = submit_order || orders.build(user: owner) # This is polymorphic user, might be an organization
     fees = submit_fees().reject { |fee| fee.marked_for_destruction? }
 
+    # A membership could go from individual to organization
+    order.user = owner
+
     # Adds fees, but does not overwrite any existing price.
     fees.each do |fee|
       order.add(fee) unless order.purchasables.include?(fee)

data/app/models/concerns/acts_as_wizard.rb

@@ -56,7 +56,23 @@ module ActsAsWizard
 
     def required_steps
       return self.class.test_required_steps if Rails.env.test? && self.class.test_required_steps.present?
-      wizard_step_keys()
+
+      steps = wizard_step_keys()
+
+      # Give the caller class a mechanism to change these.
+      # Used more in effective memberships
+      steps = change_wizard_steps(steps)
+
+      unless steps.kind_of?(Array) && steps.all? { |step| step.kind_of?(Symbol) }
+        raise('expected change_wizard_steps to return an Array of steps with no nils')
+      end
+
+      steps
+    end
+
+    # Intended for use by calling class
+    def change_wizard_steps(steps)
+      steps
     end
 
     # For use in the summary partials. Does not include summary.

data/lib/effective_resources/engine.rb

@@ -21,7 +21,7 @@ module EffectiveResources
 
     # Include acts_as_addressable concern and allow any ActiveRecord object to call it
     initializer 'effective_resources.active_record' do |app|
-      ActiveSupport.on_load :active_record do
+      app.config.to_prepare do
         ActiveRecord::Base.extend(ActsAsArchived::Base)
         ActiveRecord::Base.extend(ActsAsEmailForm::Base)
         ActiveRecord::Base.extend(ActsAsTokened::Base)
@@ -38,7 +38,7 @@ module EffectiveResources
     end
 
     initializer 'effective_resources.cancancan' do |app|
-      ActiveSupport.on_load :active_record do
+      app.config.to_prepare do
         if defined?(CanCan::Ability)
           CanCan::Ability.module_eval do
             CRUD_ACTIONS = [:index, :new, :create, :edit, :update, :show, :destroy]
@@ -64,8 +64,10 @@ module EffectiveResources
 
     # Register the flash_messages concern so that it can be called in ActionController
     initializer 'effective_resources.action_controller' do |app|
-      ActiveSupport.on_load :action_controller do
-        include(Effective::FlashMessages)
+      app.config.to_prepare do
+        ActiveSupport.on_load :action_controller do
+          include(Effective::FlashMessages)
+        end
       end
     end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.16.0'.freeze
+  VERSION = '1.17.2'.freeze
 end

metadata

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