effective_resources 1.8.10 → 1.8.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc3c685dc56b79f0af482b0cf0d67e0dacafd6b9dc1e032cceb5d688b44752d6
-  data.tar.gz: e5b9f21ab57e68f9fbc601d6a41cc40358f47f92850e80c756e75f7c52d13383
+  metadata.gz: f4b28e1caca0bb8019717713f5c76ae4c1b9e8008936450697ff53f9bca96546
+  data.tar.gz: '09187e5fcec31ad99827706d91a900038097c84579ee701fbafe6efde2dbed7d'
 SHA512:
-  metadata.gz: 044ee953eb0e281c9f85c95934a2824a80d73a2779e4799e716374e7f1fe932255339bd56efc918333a9886eaef0baa0c4400a43db1060ddd40ee2c2f988d7d5
-  data.tar.gz: 6d337535d4e2c37da1f8d5bbeb5c6dd95621bb3789b873fcf94364fd21fd5750a7a31c0c5e6d6be28d560525c6b5a7c1de9d8a56b6abdf710e2cc771c71a35c5
+  metadata.gz: af2652031c87d654fd8ba0210a41893a5eae2fa1a85ff05667b78b36cf0cf51fe01185f6c5d4d6d4ebb36eb8217ec73170a3f24680f19fba6b330b04ee1cf439
+  data.tar.gz: 651d54db0baf6fd4c6817b1669e9facaecd43b1792fe6a48b96ce9a72ce65f6c430b77665152574e95ebaf786886b78d63374e9cade0113794d0c78b9d824127

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

@@ -15,7 +15,7 @@ module Effective
 
             format.js do
               flash[:success] ||= resource_flash(:success, resource, action)
-              redirect_to(resource_redirect_path(resource, action))
+              render(action, locals: { remote_form_redirect: resource_redirect_path(resource, action)}) # action.js.erb
             end
           end
         elsif template_present?(action)
@@ -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/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/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/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/app/views/application/create.js.erb

@@ -4,8 +4,8 @@
 EffectiveForm.remote_form_payload = "<%= j render_resource_form(@resource) %>";
 EffectiveForm.remote_form_commit = "<%= params[:commit] %>";
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;
+EffectiveForm.remote_form_redirect = "<%= local_assigns[:remote_form_redirect] %>";
 
 <% if @resource.respond_to?(:refresh_datatables) && @resource.refresh_datatables.present? %>
   EffectiveForm.remote_form_refresh_datatables = <%= raw Array(@resource.refresh_datatables).uniq.compact.map(&:to_s) %>;
 <% end %>
-

data/app/views/application/destroy.js.erb

@@ -4,6 +4,7 @@
 EffectiveForm.remote_form_payload = '';
 EffectiveForm.remote_form_commit = "<%= params[:commit] %>";
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;
+EffectiveForm.remote_form_redirect = "<%= local_assigns[:remote_form_redirect] %>";
 
 <% if @resource.respond_to?(:refresh_datatables) && @resource.refresh_datatables.present? %>
   EffectiveForm.remote_form_refresh_datatables = <%= raw Array(@resource.refresh_datatables).uniq.compact.map(&:to_s) %>;

data/app/views/application/member_action.js.erb

@@ -5,6 +5,10 @@ EffectiveForm.remote_form_payload = "<%= j render_resource_form(@resource, actio
 EffectiveForm.remote_form_commit = "<%= params[:commit] %>";
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;
 
+<% if !request.get? %>
+  EffectiveForm.remote_form_redirect = "<%= local_assigns[:remote_form_redirect] %>";
+<% end %>
+
 <% if !request.get? && @resource.respond_to?(:refresh_datatables) && @resource.refresh_datatables.present? %>
   EffectiveForm.remote_form_refresh_datatables = <%= raw Array(@resource.refresh_datatables).uniq.compact.map(&:to_s) %>;
 <% end %>

data/app/views/application/update.js.erb

@@ -4,6 +4,7 @@
 EffectiveForm.remote_form_payload = "<%= j render_resource_form(@resource) %>";
 EffectiveForm.remote_form_commit = "<%= params[:commit] %>";
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;
+EffectiveForm.remote_form_redirect = "<%= raw local_assigns[:remote_form_redirect] %>";
 
 <% if @resource.respond_to?(:refresh_datatables) && @resource.refresh_datatables.present? %>
   EffectiveForm.remote_form_refresh_datatables = <%= raw Array(@resource.refresh_datatables).uniq.compact.map(&:to_s) %>;

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.8.10'.freeze
+  VERSION = '1.8.15'.freeze
 end

metadata

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