effective_resources 2.8.9 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a38e2952ba5fef52c6aa082b18ef2d9261c32dcd89f629fa548b22b4c5f70b6
-  data.tar.gz: 0aebae2fb3691c17fcc6cbe84d3a153592cd0fd4c49aafdeadcf77d511bd5c30
+  metadata.gz: e271cc3c7cc6656818fa8584765872c44add6e05f45aebf71b21a2463d27975e
+  data.tar.gz: b96b045469f418016cbef1d000eec3ee3b82b260122eff4a6f160e689f55f0b1
 SHA512:
-  metadata.gz: da673d1b40fbdf5c6ddf6322619c4cf8e1641b3aa28a81395de8080f5220d371a272f9cca5541eae8f8206c5020418d1562f1db3f22117c0513eb9fd2df0bc72
-  data.tar.gz: b0167300f0a180b5f7bb4445aa70750b6a606a38633d9fcb4ba22ea68d5e290602cfc5b659638e4703bed29fb2df8863ce4a94cdc59def680fdeec1acfefdc0f
+  metadata.gz: b065909664f6d3dfd6cdb6589023dcd743b77feeccf2d98e74ef940780c5a48492681915437975aa7bd988251d768367d50b00f8198de841642af7728425eec7
+  data.tar.gz: 44e79e8885d98c26b5179955f60cc7b775efac0d7804712e4d5556b20df09fc00d6efad0f9db8e40a0e61c959fc355ec5cf7b7314dcec80aceb0f476932fd9a3

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

@@ -185,8 +185,10 @@ module Effective
           respond_to do |format|
             format.html { }
             format.js do
+              html_template = action if template_present?(action, format: :html)
               template = template_present?(action) ? action : 'member_action'
-              render(template, formats: :js, locals: { action: action })
+
+              render(template, formats: :js, locals: { action: action, html_template: html_template })
             end
           end
 

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

@@ -103,9 +103,10 @@ module Effective
         flash[:danger] ||= danger
       end
 
-      def template_present?(action)
+      def template_present?(action, format: nil)
+        format = Array(format).presence
         formats = [(request.format.symbol.to_s.sub('json', 'js').presence || 'html').to_sym]
-        lookup_context.template_exists?(action, _prefixes, formats: formats)
+        lookup_context.template_exists?(action, _prefixes, formats: (format || formats))
       end
 
     end

data/app/helpers/effective_resources_helper.rb

@@ -189,13 +189,15 @@ module EffectiveResourcesHelper
     safe = atts.delete(:safe)
     atts = { :namespace => (effective_resource.namespace.to_sym if effective_resource.namespace), effective_resource.name.to_sym => resource }.compact.merge(atts)
 
-    if lookup_context.template_exists?(effective_resource.name, controller._prefixes, :partial)
-      return render(effective_resource.name, atts)
+    partial = (action.present? ? action.to_s : effective_resource.name)
+
+    if lookup_context.template_exists?(partial, controller._prefixes, :partial)
+      return render(partial, atts)
     end
 
     effective_resource.view_paths.each do |view_path|
-      if lookup_context.template_exists?(effective_resource.name, [view_path], :partial)
-        return render(view_path + '/' + effective_resource.name, atts)
+      if lookup_context.template_exists?(partial, [view_path], :partial)
+        return render(view_path + '/' + partial, atts)
       end
     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/concerns/acts_as_wizard.rb

@@ -146,10 +146,16 @@ module ActsAsWizard
       has_completed_step?(required_steps.last)
     end
 
-    def reset_wizard_steps!
+    def reset_all_wizard_steps!
       update!(wizard_steps: {})
     end
 
+    def complete_all_wizard_steps!
+      now = Time.zone.now
+      required_steps.each { |step| wizard_steps[step] ||= now }
+      save!
+    end
+
     def without_current_step(&block)
       existing = current_step
 

data/app/views/application/member_action.js.erb

@@ -1,7 +1,12 @@
 <% resource = (@_effective_resource || Effective::Resource.new(controller_path)) %>
 <% @resource = instance_variable_get('@' + resource.name) if resource.name %>
 
-EffectiveForm.remote_form_payload = "<%= j render_resource_form(@resource, action: action, safe: true) %>";
+<% if html_template.present? %>
+  EffectiveForm.remote_form_payload = "<%= j(render_resource_partial(@resource, action: action)) %>";
+<% else %>
+  EffectiveForm.remote_form_payload = "<%= j(render_resource_form(@resource, action: action, safe: true).presence || render_resource_partial(@resource)) %>";
+<% end %>
+
 EffectiveForm.remote_form_commit = "<%= params[:commit] %>";
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;
 

data/lib/effective_resources/engine.rb

@@ -46,10 +46,8 @@ module EffectiveResources
       app.config.to_prepare do
         if defined?(CanCan::Ability)
           CanCan::Ability.module_eval do
-            CRUD_ACTIONS = [:index, :new, :create, :edit, :update, :show, :destroy]
-
             def crud
-              CRUD_ACTIONS
+              [:index, :new, :create, :edit, :update, :show, :destroy]
             end
           end
 

data/lib/effective_resources/version.rb

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