effective_resources 1.8.11 → 1.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2703faba8c8b14643c0e0f75e958bf27471b5d54fba6461d24e583156f7badae
-  data.tar.gz: 917291289d6e5530f04ddf65d03da2f828d0bf00dce53d79fc6e3f67c7d7a421
+  metadata.gz: b61bac97524b1592c39a8b701f2c7bb0af87f9c5e882e75cbd1c2144e2284c38
+  data.tar.gz: 5c3d1674d1cdec588970c5358f307399c24d177300f04f81ffd8fde5e8b1e916
 SHA512:
-  metadata.gz: 7033816b0b5c53b7f6ebccf7269aa635effb7f792e6dbbf55d83d546980612ecba3f3d18b160c46c5f6e353724763e63efb55e8ffa23c2f360eea1d3e1057635
-  data.tar.gz: e7b77545e441aec916ecbe3ca0fc35e8c9d14eeb6b7d3553e8b8e5be7af7ef71b735c89b480d5a91a3288f03a48b2846ac6f7f05a744a6bdb1d758d83630e08b
+  metadata.gz: 9ffaaa83f17ee7dc3865da68bb1e3dbc7c9416fe68fd77c106cc51f1e9d23691cd35e1017f23428534d2001b897220d19b8daa0f27a96a004b29b8ef04aa8c91
+  data.tar.gz: 315828b2d06aa231f15dbae213f5dfcbc9e5721c53786e17aa10ee87d6e574f83c026c383f6f1782c08415df087b8d7a2fc7ccea828e56444cc2b173bf795bab

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

@@ -96,6 +96,10 @@ module Effective
       effective_resource.klass
     end
 
+    def resource_human_name
+      effective_resource.human_name
+    end
+
     def resource_plural_name # 'things'
       effective_resource.plural_name
     end

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

@@ -27,7 +27,6 @@ module Effective
 
             format.js do
               flash.now[:success] ||= resource_flash(:success, resource, action)
-              #reload_resource unless action == :destroy # Removed.
               render(action) # action.js.erb
             end
           end
@@ -96,9 +95,7 @@ module Effective
       end
 
       def template_present?(action)
-        #lookup_context.template_exists?("#{action}.#{request.format.symbol.to_s.sub('json', 'js').presence || 'html'}", _prefixes)
-
-        formats = [request.format.symbol.to_s.sub('json', 'js').presence || 'html']
+        formats = [(request.format.symbol.to_s.sub('json', 'js').presence || 'html').to_sym]
         lookup_context.template_exists?(action, _prefixes, formats: formats)
       end
 

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

@@ -9,9 +9,9 @@ module Effective
       raise 'expected an ActiveRecord resource' unless (name || resource.class.respond_to?(:model_name))
 
       name ||= if resource.respond_to?(:destroyed?) && resource.destroyed?
-        resource.class.model_name.to_s.downcase.split('::').last
+        resource_human_name
       else
-        resource.to_s.presence
+        resource.to_s.presence || resource_human_name
       end
 
       "Successfully #{action_verb(action)} #{name || 'resource'}".html_safe
@@ -27,9 +27,9 @@ module Effective
       messages = flash_errors(resource, e: e)
 
       name ||= if resource.respond_to?(:destroyed?) && resource.destroyed?
-        resource.class.model_name.to_s.downcase.split('::').last
+        resource_human_name
       else
-        resource.to_s.presence
+        resource.to_s.presence || resource_human_name
       end
 
       ["Unable to #{action}", (" #{name}" if name), (": #{messages}" if messages)].compact.join.html_safe

data/app/models/concerns/acts_as_wizard.rb

@@ -65,7 +65,7 @@ module ActsAsWizard
     end
 
     def has_completed_step?(step)
-      wizard_steps[step].present?
+      (errors.present? ? wizard_steps_was : wizard_steps)[step].present?
     end
 
     def next_step

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.8.11'.freeze
+  VERSION = '1.8.12'.freeze
 end

metadata

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