effective_resources 2.9.3 → 2.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b629b5ffc2f0314504db5832178d1d75ef1ea25014d773ba56a251afce443828
-  data.tar.gz: 6b98c8ffbcf23f626da2aebacfc5fa4a75f1527d472447644ba717a42fee447a
+  metadata.gz: 31ab38dae78be5079c1f7312694e48d20f944df03f634ec327f61f053b2ecd90
+  data.tar.gz: af0850da493f9408108da574756ffc49b31e2013453160f7b863edb65df35d90
 SHA512:
-  metadata.gz: 2d15031507379c13ce150e741d2c2d9339ac9f2ac2c759cc26f6db93cd318ed0fd1ae6d0c53ff0fbf772c3c868a398f8f802f40d5290c9bd0c17c71fdfcac6ee
-  data.tar.gz: d86facd0e96f7d6a4725bdb04e1be6433aa41732f13432b5e96cb371b728d3b38577d9dc769323cba14f2d5f8ee4859ec456eb39101f4e4e728df6cb985c6fd2
+  metadata.gz: ee7af38a7dd4128302fc3b480189837a6f51b5c5babc8308b1972b3501b28eaf82f4e94aea2803135037538edb34ba032bd2a81e9c18b103aa8536e6577b69bc
+  data.tar.gz: e2b4e7c3b1d23dc95b919627f9daae50ccaad2f2d87ae194601cb31b3c0e2054a23148b62ddf4e4d170f19bb6df06b1091ef0d5c00ef073c5f9f63e197a3387c

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

@@ -51,7 +51,7 @@ module Effective
           exception = e
         rescue => e
           exception = e
-          notify_exception(e, resource, action) unless e.class.name == 'RuntimeError'
+          notify_exception(e, resource, action)
         end
 
         if exception.present?

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.3'.freeze
+  VERSION = '2.9.5'.freeze
 end

data/lib/effective_resources.rb

@@ -145,7 +145,7 @@ module EffectiveResources
     duplicate = ActiveStorage::Blob.create_before_direct_upload!(**atts)
 
     case service.class.name
-    when 'ActiveStorage::Service::S3Service'
+    when 'ActiveStorage::Service::S3Service', 'ActiveStorage::Service::S3NoDeleteService'
       bucket = service.bucket
       object = bucket.object(blob.key)
       object.copy_to(bucket.object(duplicate.key))

metadata

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