effective_resources 1.8.12 → 1.8.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b61bac97524b1592c39a8b701f2c7bb0af87f9c5e882e75cbd1c2144e2284c38
-  data.tar.gz: 5c3d1674d1cdec588970c5358f307399c24d177300f04f81ffd8fde5e8b1e916
+  metadata.gz: 0162db8b9e57f6f0289551a07214bbba02f4154d8786fa38a92e51c023317f17
+  data.tar.gz: b993410fb958c5efa5a8d281a8def12f8b1e02c209e56ba9835d283a0e33ef44
 SHA512:
-  metadata.gz: 9ffaaa83f17ee7dc3865da68bb1e3dbc7c9416fe68fd77c106cc51f1e9d23691cd35e1017f23428534d2001b897220d19b8daa0f27a96a004b29b8ef04aa8c91
-  data.tar.gz: 315828b2d06aa231f15dbae213f5dfcbc9e5721c53786e17aa10ee87d6e574f83c026c383f6f1782c08415df087b8d7a2fc7ccea828e56444cc2b173bf795bab
+  metadata.gz: a8d89ebcead9ac5fee2263e5dc6fe83703a103f7daa6e3501a53fdc169b14a0adc65176a46b8fa7ac3310e348afce0b805fe007d14c48a07d38811bdad2f7f6c
+  data.tar.gz: 8f59af5c2225dce3a7378317688f53a4ce79b6db2502f10cd0632b605e9ad5c02c21eba28ec45d8b428c1e1e9ba229d976c4bc1b9a944cfdbf27771f988cde95

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

@@ -15,7 +15,16 @@ module Effective
 
             format.js do
               flash[:success] ||= resource_flash(:success, resource, action)
-              render(action, locals: { remote_form_redirect: resource_redirect_path(resource, action)}) # action.js.erb
+
+              if params[:_datatable_action]
+                redirect_to(resource_redirect_path(resource, action))
+              else
+                render(
+                  (template_present?(action) ? action : :member_action),
+                  locals: { action: action, remote_form_redirect: resource_redirect_path(resource, action)}
+                )
+              end
+
             end
           end
         elsif template_present?(action)

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

@@ -9,7 +9,7 @@ module Effective
         if save_resource(resource, action)
           flash[:success] ||= options.delete(:success) || resource_flash(:success, resource, action)
 
-          @skip_to ||= next_step
+          @skip_to ||= resource.required_steps.find { |s| s == next_step } || resource.first_uncompleted_step
           @redirect_to ||= resource_wizard_path(resource, @skip_to) if was_new_record
 
           redirect_to(@redirect_to || wizard_path(@skip_to))

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

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.12'.freeze
+  VERSION = '1.8.17'.freeze
 end

metadata

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