effective_resources 1.18.3 → 1.18.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 218b8f81c8bff70630d8c704a75f300a4eababd535f31f99ae9a5d2eef211917
-  data.tar.gz: 884d5584efd0a95c8bd6ad56800dcba047a2b887964571d20aa3667434883260
+  metadata.gz: 62921f58ed6ed86c3dc1fc8f08b78509170185d28ca302e8edaac034aee13c3a
+  data.tar.gz: 984a86a6c60a73b257a771d3d805673c7d0ab2bc4b6009580fb81c25b6c0c10c
 SHA512:
-  metadata.gz: 9bd790c6f0c5015636ceca4e3385cda7704379ff627df6642aada1ef56c1e4afe781e1ec2ee884667222d2ced828dc7ab6927d89345f5a8f68c629c2c48c28eb
-  data.tar.gz: ab239c0c780d22bb20d570a7c335776bb2d55564d4377e99acbc5d7e961f79285145ed5a0241a4867068f1cbb35a000339c4685e6053c72366727c882a0b31c8
+  metadata.gz: 1209d346a9de8b331e2976578881b1308a12593ede050e2fb9964c10ccd9dbd24ec85ecc520d6d9e438589de4845692b162897967953f7c3076df54c9b43c631
+  data.tar.gz: ab56820215894af275fa99a4de2ba66b8a1fc05e1acf43167936a9674bd3330b50de5fb4f35bc5da63d505aff84794e8404c848e1ccef06f327c796f3c128db9

data/app/controllers/concerns/effective/flash_messages.rb

@@ -8,11 +8,7 @@ module Effective
     def flash_success(resource, action = nil, name: nil)
       raise 'expected an ActiveRecord resource' unless (name || resource.class.respond_to?(:model_name))
 
-      name ||= if resource.respond_to?(:destroyed?) && resource.destroyed?
-        resource_human_name
-      else
-        resource.to_s.presence || resource_human_name
-      end
+      name ||= resource_human_name
 
       "Successfully #{action_verb(action)} #{name || 'resource'}".html_safe
     end
@@ -25,12 +21,7 @@ module Effective
       action = action.to_s.gsub('_', ' ')
 
       messages = flash_errors(resource, e: e)
-
-      name ||= if resource.respond_to?(:destroyed?) && resource.destroyed?
-        resource_human_name
-      else
-        resource.to_s.presence || resource_human_name
-      end
+      name ||= resource_human_name
 
       ["Unable to #{action}", (" #{name}" if name), (": #{messages}" if messages)].compact.join.html_safe
     end

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

@@ -21,6 +21,11 @@ module Effective
         self.resource ||= find_wizard_resource
       end
 
+      def assign_resource_current_user
+        return unless respond_to?(:current_user)
+        resource.current_user ||= current_user
+      end
+
       # before_action :authorize_resource, only: [:show, :update]
       # Authorize the resource
       def authorize_resource
@@ -70,10 +75,6 @@ module Effective
       # before_action :assign_current_step, only: [:show, :update]
       # Assign the current step to resource
       def assign_current_step
-        if respond_to?(:current_user) && resource.respond_to?(:current_user=)
-          resource.current_user = current_user
-        end
-
         resource.current_step = step.to_sym
       end
 

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

@@ -22,6 +22,8 @@ module Effective
         before_action :redirect_if_blank_step
 
         before_action :assign_resource
+        before_action :assign_resource_current_user
+
         before_action :authorize_resource
         before_action :assign_required_steps
 
@@ -59,10 +61,14 @@ module Effective
       if params[resource_name_id] && params[resource_name_id] != 'new'
         resource_scope.find(params[resource_name_id])
       else
-        resource_scope.new
+        build_wizard_resource
       end
     end
 
+    def build_wizard_resource
+      resource_scope.new
+    end
+
     def resource_wizard_step_title(resource, step)
       return if step == 'wicked_finish'
       resource.wizard_step_title(step)

data/app/helpers/effective_resources_helper.rb

@@ -218,6 +218,9 @@ module EffectiveResourcesHelper
 
     if lookup_context.exists?(file, [path], :partial)
       render(partial, atts)
+    else
+      Rails.logger.info "Skipped Render (effective_resources) render_if_exists: #{partial}"
+      nil
     end
   end
 

data/app/helpers/effective_resources_wizard_helper.rb

@@ -6,7 +6,7 @@ module EffectiveResourcesWizardHelper
     klasses = ['wizard-sidebar', 'list-group', ('list-group-horizontal' if horizontal)].compact.join(' ')
 
     sidebar = content_tag(:div, class: klasses) do
-      resource.required_steps.map.with_index do |nav_step, index|
+      resource.sidebar_steps.map.with_index do |nav_step, index|
         render_wizard_sidebar_item(resource, nav_step, (index + 1 if numbers))
       end.join.html_safe
     end

data/app/models/concerns/acts_as_wizard.rb

@@ -78,6 +78,10 @@ module ActsAsWizard
       steps
     end
 
+    def sidebar_steps
+      required_steps
+    end
+
     # For use in the summary partials. Does not include summary.
     def render_steps
       blacklist = [:start, :billing, :checkout, :submitted, :summary]

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.18.3'.freeze
+  VERSION = '1.18.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.18.3
+  version: 1.18.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-05 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails