effective_resources 2.8.9 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a38e2952ba5fef52c6aa082b18ef2d9261c32dcd89f629fa548b22b4c5f70b6
-  data.tar.gz: 0aebae2fb3691c17fcc6cbe84d3a153592cd0fd4c49aafdeadcf77d511bd5c30
+  metadata.gz: 10642ec990cb0ad6b2426415a997aead2f5d53bcdb8a932b3f276af5e9485af9
+  data.tar.gz: a971535ad4974d3931be497db3595f91e1baac7483f718e3197778e84674e525
 SHA512:
-  metadata.gz: da673d1b40fbdf5c6ddf6322619c4cf8e1641b3aa28a81395de8080f5220d371a272f9cca5541eae8f8206c5020418d1562f1db3f22117c0513eb9fd2df0bc72
-  data.tar.gz: b0167300f0a180b5f7bb4445aa70750b6a606a38633d9fcb4ba22ea68d5e290602cfc5b659638e4703bed29fb2df8863ce4a94cdc59def680fdeec1acfefdc0f
+  metadata.gz: c8ee4692a6b49d21cfe3d591233f9991355cb1d4d3697d5317fceb7186eb9011db71edef3dc8b6ddedc8ba97d3d28b7c7cf80bf753c18a31b344c8cbc7393db1
+  data.tar.gz: 7cfa99b30169c1bb0bc316dafdc29bad35996b678affea7f21e9ab6fe469bdf4dd6a3fe013d028b8e8fb4cd4281aa809640477db683e3cb0d987bc40d62375b5

data/app/models/concerns/acts_as_purchasable_wizard.rb

@@ -89,7 +89,9 @@ module ActsAsPurchasableWizard
     raise('already has purchased submit fees') if fees.any?(&:purchased?)
 
     order = find_or_build_submit_order()
+    raise('expected an Effective::Order') unless order.kind_of?(Effective::Order)
     raise('already has purchased submit order') if order.purchased?
+    raise('unable to proceed with a voided submit order') if order.try(:voided?)
 
     true
   end

data/app/models/concerns/acts_as_statused.rb

@@ -39,7 +39,7 @@ module ActsAsStatused
     const_set(:STATUSES, acts_as_statused_options[:statuses])
 
     before_validation do
-      self.status ||= self.class.const_get(:STATUSES).first
+      self.status ||= all_statuses.first
 
       # Set an existing belongs_to automatically
       if respond_to?("#{status}_by") && send("#{status}_by").blank?
@@ -132,25 +132,51 @@ module ActsAsStatused
       end
 
       # unapproved!
-      define_method("un#{sym}!") do
-        self.status = nil if (status == sym.to_s)
+      define_method("un#{sym}!") do |atts = {}|
+        raise 'expected a Hash of passed attributes' unless atts.kind_of?(Hash)
 
-        if respond_to?("#{sym}_at") && send("#{sym}_at").present?
-          self.send("#{sym}_at=", nil)
-        end
-
-        if respond_to?("#{sym}_by") && send("#{sym}_by").present?
-          self.send("#{sym}_by=", nil)
-        end
+        self.try("#{sym}_at=", nil)
+        self.try("#{sym}_by=", nil)
+        self.try("#{sym}_by_id=", nil)
+        self.try("#{sym}_by_type=", nil)
 
         status_steps.delete(sym_at)
         status_steps.delete(sym_by_id)
         status_steps.delete(sym_by_type)
 
-        true
+        if status == sym.to_s # I was just this status
+          assign_attributes(status: last_completed_status || all_statuses.first)
+        end
+
+        # Assign atts if present
+        assign_attributes(atts) if atts.present?
+
+        save!
       end
+    end
 
+    # Regular instance methods
+    # Sort of matches acts_as_wizard
+    def status_keys
+      self.class.const_get(:STATUSES)
     end
+
+    def all_statuses
+      status_keys
+    end
+
+    def completed_statuses
+      all_statuses.select { |status| has_completed_status?(status) }
+    end
+
+    def last_completed_status
+      all_statuses.reverse.find { |status| has_completed_status?(status) }
+    end
+
+    def has_completed_status?(status)
+      (errors.present? ? status_steps_was : status_steps)["#{status}_at".to_sym].present?
+    end
+
   end
 
   module ClassMethods

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.8.9'.freeze
+  VERSION = '2.9.0'.freeze
 end

metadata

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