effective_resources 2.8.8 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a583a70685ae3faf4811c49e750ae55c05aec5af0ed3f061662c80723575a2c9
-  data.tar.gz: acb81962352988b990db0d8b95ba4430d02bfad1bf04946d5724753bf10454ad
+  metadata.gz: 10642ec990cb0ad6b2426415a997aead2f5d53bcdb8a932b3f276af5e9485af9
+  data.tar.gz: a971535ad4974d3931be497db3595f91e1baac7483f718e3197778e84674e525
 SHA512:
-  metadata.gz: 60bb0ff5c80356b24770eb98d9787a9a975368edf7fa3be6c5cd700c7937e3fce7a6ad1a5d8cf8670184c0b5feeaf0dd98577989948b5292a7f3f4fe09c3ed97
-  data.tar.gz: 1aa740c85b5a07a900e9cc68f97f38dfe0c57b1ca1fbfecf43f34a2b9be2aba8571e84d989a99957c319d33b437da061e56744999d49213d4a9dddf3795f30f4
+  metadata.gz: c8ee4692a6b49d21cfe3d591233f9991355cb1d4d3697d5317fceb7186eb9011db71edef3dc8b6ddedc8ba97d3d28b7c7cf80bf753c18a31b344c8cbc7393db1
+  data.tar.gz: 7cfa99b30169c1bb0bc316dafdc29bad35996b678affea7f21e9ab6fe469bdf4dd6a3fe013d028b8e8fb4cd4281aa809640477db683e3cb0d987bc40d62375b5

data/app/helpers/effective_resources_wizard_helper.rb

@@ -42,19 +42,32 @@ module EffectiveResourcesWizardHelper
     end
   end
 
-  def render_wizard_resource(resource, as: nil, path: nil)
+  def render_wizard_resource_step(resource, step, as: nil, path: nil)
+    render_wizard_resource(resource, only: step, as: as, path: path)
+  end
+
+  def render_wizard_resource(resource, only: [], except: [], as: nil, path: nil)
     effective_resource = Effective::Resource.new(resource)
 
+    # Render path
     as ||= effective_resource.name
-    path ||= effective_resource.view_file_path(nil)
+    path ||= effective_resource.wizard_file_path(resource)
     raise('expected a path') unless path.present?
 
     resource.render_path = path.to_s.chomp('/')
 
-    resource.render_steps.map do |partial|
-      resource.render_step = partial
+    # Render steps
+    only = Array(only)
+    except = Array(except)
+
+    steps = resource.render_steps
+    steps = (steps - except) if except.present?
+    steps = (steps & only) if only.present?
+
+    steps.map do |step|
+      resource.render_step = step
 
-      render_if_exists("#{path}/#{partial}", as.to_sym => resource) || render('effective/acts_as_wizard/wizard_step', resource: resource, resource_path: path)
+      render_if_exists("#{path}/#{step}", as.to_sym => resource) || render('effective/acts_as_wizard/wizard_step', resource: resource, resource_path: path)
     end.join.html_safe
   end
 

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/app/models/effective/resources/paths.rb

@@ -35,6 +35,15 @@ module Effective
         File.join(*[tenant_path, 'app/datatables', namespace, "effective_#{plural_name}_datatable.rb"].compact)
       end
 
+      # Wizards are kinda weird, we need some help for effective_memberships
+      def wizard_file_path(resource)
+        if resource.class.try(:effective_memberships_applicant?) || resource.class.try(:effective_memberships_applicant_review?)
+          File.join(*['effective', plural_name].compact)
+        else
+          view_file_path(nil)
+        end
+      end
+
       # Views
       def view_file(action = :index, partial: false)
         File.join(*[tenant_path, 'app/views', class_path, namespace, plural_name, "#{'_' if partial}#{action}.html.haml"].compact)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.8.8'.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.8
+  version: 2.9.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-02 00:00:00.000000000 Z
+date: 2023-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails