effective_resources 1.8.11 → 1.8.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2703faba8c8b14643c0e0f75e958bf27471b5d54fba6461d24e583156f7badae
-  data.tar.gz: 917291289d6e5530f04ddf65d03da2f828d0bf00dce53d79fc6e3f67c7d7a421
+  metadata.gz: a854fdf544ea77faf7d45b251f8161b54ef66685c71730d6b4bdef42298ac371
+  data.tar.gz: 22d0141d18a049ed853d2ba54197758e46817ffdf6704c1facee7850cad5bef6
 SHA512:
-  metadata.gz: 7033816b0b5c53b7f6ebccf7269aa635effb7f792e6dbbf55d83d546980612ecba3f3d18b160c46c5f6e353724763e63efb55e8ffa23c2f360eea1d3e1057635
-  data.tar.gz: e7b77545e441aec916ecbe3ca0fc35e8c9d14eeb6b7d3553e8b8e5be7af7ef71b735c89b480d5a91a3288f03a48b2846ac6f7f05a744a6bdb1d758d83630e08b
+  metadata.gz: fa64174fb405b2499a303ed87d64b8e32aa4d7c48388875c811919526935679a4c98bfef973e0f41b2124257b5d9d46207e906f85776d5eb5c0bf487ee086179
+  data.tar.gz: e00c2e31e5430de0a3e19d2f0d607fa73426edbbe8f7d31c0936f60a418a4bf92206fef2d904d2ba78dab1bfffc132235056ad138ede924642cabdeffd8a6408

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/controllers/concerns/effective/wizard_controller.rb

@@ -46,9 +46,9 @@ module Effective
       end
     end
 
-    def resource_wizard_step_title(step)
+    def resource_wizard_step_title(resource, step)
       return if step == 'wicked_finish'
-      effective_resource.klass.const_get(:WIZARD_STEPS).fetch(step)
+      resource.wizard_step_title(step)
     end
 
     def resource_wizard_steps

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

@@ -8,7 +8,7 @@ module Effective
         self.resource ||= resource_scope.new
         EffectiveResources.authorize!(self, :new, resource)
 
-        redirect_to resource_wizard_path(:new, resource_wizard_steps.first)
+        redirect_to resource_wizard_path(:new, resource.first_uncompleted_step || resource_wizard_steps.first)
       end
 
       def show

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

@@ -49,7 +49,7 @@ module Effective
           Rails.logger.info "  Unable to visit step :#{step}. Last can_visit_step? is :#{next_step}. Change the acts_as_wizard model's can_visit_step?(step) function to change this."
         end
 
-        flash[:success] = "You have been redirected to the #{resource_wizard_step_title(next_step)} step."
+        flash[:success] = "You have been redirected to the #{resource_wizard_step_title(resource, next_step)} step."
         redirect_to wizard_path(next_step)
       end
 
@@ -66,7 +66,7 @@ module Effective
       # before_action :assign_page_title, only: [:show, :update]
       # Assign page title
       def assign_page_title
-        @page_title ||= resource_wizard_step_title(step)
+        @page_title ||= resource_wizard_step_title(resource, step)
       end
 
     end

data/app/helpers/effective_resources_helper.rb

@@ -116,7 +116,6 @@ module EffectiveResourcesHelper
     locals = {
       resource: resource,
       effective_resource: effective_resource,
-      formats: [:html],
       format_block: (block if block_given?),
       namespace: namespace,
       actions: actions,
@@ -133,7 +132,7 @@ module EffectiveResourcesHelper
         spacer_template: spacer_template
       )
     else
-      render(partial, locals)
+      render(partial: partial, formats: [:html], locals: locals)
     end
   end
 

data/app/helpers/effective_resources_wizard_helper.rb

@@ -20,7 +20,7 @@ module EffectiveResourcesWizardHelper
   def render_wizard_sidebar_item(resource, nav_step, index = nil)
     # From Controller
     current = (nav_step == step)
-    title = resource_wizard_step_title(nav_step)
+    title = resource_wizard_step_title(resource, nav_step)
 
     # From Model
     disabled = !resource.can_visit_step?(nav_step)

data/app/models/concerns/acts_as_wizard.rb

@@ -43,6 +43,7 @@ module ActsAsWizard
       wizard_steps[current_step.to_sym] ||= Time.zone.now
     end
 
+    # Use can_visit_step? required_steps and wizard_step_title(step) to control the wizard behaviour
     def can_visit_step?(step)
       can_revisit_completed_steps(step)
     end
@@ -52,6 +53,10 @@ module ActsAsWizard
       self.class.const_get(:WIZARD_STEPS).keys
     end
 
+    def wizard_step_title(step)
+      self.class.const_get(:WIZARD_STEPS).fetch(step)
+    end
+
     def first_completed_step
       required_steps.find { |step| has_completed_step?(step) }
     end
@@ -65,7 +70,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/app/models/effective/resources/init.rb

@@ -78,8 +78,20 @@ module Effective
         # acpa/admin/shirts
         (names.length).downto(1).each do |n|
           names.combination(n).to_a.each do |pieces|
-            klass_pieces = pieces.map { |piece| piece.classify } * '::'
-            klass = klass_pieces.safe_constantize
+            klass = begin
+              klass_pieces = pieces.map { |piece| piece.classify } * '::'
+              klass_pieces.safe_constantize
+            end
+
+            klass ||= if pieces.length > 1
+              klass_pieces = ([pieces.first.classify] + pieces[1..-1].map { |piece| piece.classify }) * '::'
+              klass_pieces.safe_constantize
+            end
+
+            klass ||= if pieces.length > 1
+              klass_pieces = ([pieces.first.classify.pluralize] + pieces[1..-1].map { |piece| piece.classify }) * '::'
+              klass_pieces.safe_constantize
+            end
 
             if klass.present? && klass.class != Module
               @namespaces ||= (names - pieces)

data/app/models/effective/resources/naming.rb

@@ -31,14 +31,14 @@ module Effective
       end
 
       def route_name_fallbacks
-        mod = class_name.split('::').first.downcase
+        mod = class_name.split('::').first.to_s.downcase
 
         matches = [
           route_name.singularize,
           [*namespace, plural_name].join('/'),
           [*namespace, name].join('/'),
-          [mod, *namespace, plural_name].join('/'),
-          [mod, *namespace, name].join('/')
+          [*mod, *namespace, plural_name].join('/'),
+          [*mod, *namespace, name].join('/')
         ]
       end
 

data/lib/effective_resources/version.rb

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