effective_resources 1.18.5 → 1.18.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 567d72c04873550e68210d5d632d9f6b28581fd9ad7ecafd3869c474e8e01d98
-  data.tar.gz: f573678744280a397793530d76f74a9509191b1bb872a29464148591005d3f9e
+  metadata.gz: 62921f58ed6ed86c3dc1fc8f08b78509170185d28ca302e8edaac034aee13c3a
+  data.tar.gz: 984a86a6c60a73b257a771d3d805673c7d0ab2bc4b6009580fb81c25b6c0c10c
 SHA512:
-  metadata.gz: 28c8e863d89bc6ffe40b1df04d373e4f500adc1afe913750962a2e7cb7804257ece906f9da25972825f365ba883398279fd17000d87841279a04d53ceddbb029
-  data.tar.gz: 7f93cb245d4b556bca714a46b4bcf760ed0a30b29bbd7eddc681657216989f777b71b6ff0db88f7afb6e433e08b84dea7a63a706bda2c5ebe3a1885388ef6fe1
+  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/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.18.5'.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.5
+  version: 1.18.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-08 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails