effective_resources 1.15.1 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37818a2db37ab767ea5c415519b0674ba87cc5a998978730a7851df8fddeae1d
-  data.tar.gz: 89f53d6a3238db076a5c9b212ce306109954c1cea374f763b755b7b8ee565e5b
+  metadata.gz: fd950c2764b8af440fa475f4a99666009f28ea5c25f352d85d957ee2bf6ea5a3
+  data.tar.gz: 5fddb4399b3f8e7c8edb26c317dd561add0573bd1ba3dd7489c7f7fdf408b198
 SHA512:
-  metadata.gz: ceb3fdb52931639ebb8ba24454dd103daa45dccc674d2d1dadb1a31d1e89da7f28f9a107a5db6e8dc38e2c688970366b3d36c9e189c78d7b5cca45555468e577
-  data.tar.gz: 1cea14061c7f0cc2bda9f56efd57f9be8b6018af50cdc72e8759d4ae80a120e5fcfceefea4da0908f95d3fc4161c4bf87d5472c69c93099ebd10137a5d5cb7b7
+  metadata.gz: 88867e25b814d72729e9746d12e6d5719a326f55f4097f593b3f2c888eddee003052bf1bea46d7a14e2c4e41cbd7128ec70155030341a2e6227d3a93bd69a647
+  data.tar.gz: d8086166e74b60cd6efaebc32705cdffb7940bf70686ded3c12a00b1a7e620ea529211e689b144763f0128bd4ab7c88e2aad37be491513449fabbac27e16e071

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]
@@ -57,17 +57,17 @@ 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
     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.15.1'.freeze
+  VERSION = '1.17.1'.freeze
 end

metadata

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