effective_resources 2.9.4 → 2.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5238f51cc7e5066cef998e991f9905f4492419900004d5fdb488b782e475555
-  data.tar.gz: 8673f4e1f7b1dfafdb482d5dbe76226da53911ee05b5117187e0affabdb81d69
+  metadata.gz: 31ab38dae78be5079c1f7312694e48d20f944df03f634ec327f61f053b2ecd90
+  data.tar.gz: af0850da493f9408108da574756ffc49b31e2013453160f7b863edb65df35d90
 SHA512:
-  metadata.gz: dcb765e5931c64b5e56553046c498f21ff1e0dc54dffbd2d20df9107780401bdb31e50eedad950f09e21f6866a9383d038defb60babc51c378aede5a2aee166f
-  data.tar.gz: de2b98efbba78404c14da1b7140723264e948cd2b601ff89ddaa8746da7ea247808a272e3f41deadcc4d81401c91c1719e4287b6096b0e32e87522684936a055
+  metadata.gz: ee7af38a7dd4128302fc3b480189837a6f51b5c5babc8308b1972b3501b28eaf82f4e94aea2803135037538edb34ba032bd2a81e9c18b103aa8536e6577b69bc
+  data.tar.gz: e2b4e7c3b1d23dc95b919627f9daae50ccaad2f2d87ae194601cb31b3c0e2054a23148b62ddf4e4d170f19bb6df06b1091ef0d5c00ef073c5f9f63e197a3387c

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

@@ -45,9 +45,11 @@ module Effective
         return if step == 'wicked_finish'
         return if resource.blank?
         return if resource.try(:done?)
-        return unless resource_scope.respond_to?(:in_progress)
+        return unless resource_scope.respond_to?(:in_progress_for) || resource_scope.respond_to?(:in_progress)
+
+        in_progress = resource_scope.try(:in_progress_for, current_user) || resource_scope.try(:in_progress)
+        existing = in_progress.order(:id).where.not(id: resource).first
 
-        existing = resource_scope.in_progress.order(:id).where.not(id: resource).first
         return unless existing.present?
         return if resource.persisted? && (existing.id > resource.id) # Otherwise we get an infinite loop
 

data/app/models/concerns/acts_as_wizard.rb

@@ -21,6 +21,18 @@ module ActsAsWizard
     end
   end
 
+  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
+  end
+
   included do
     acts_as_wizard_options = @acts_as_wizard_options
 
@@ -180,17 +192,6 @@ module ActsAsWizard
 
   end
 
-  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
-
-  end
 
 end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.9.4'.freeze
+  VERSION = '2.9.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.9.4
+  version: 2.9.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2023-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails