effective_resources 1.8.8 → 1.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7247ed4940067b7becde627b02de2ccc38e8fa425b0a43f1080e60b40b4c57dc
-  data.tar.gz: 38939264d4747f0d2f83a306c9d0fc4e474e6f6303dd612d47e40390a0cf0e8e
+  metadata.gz: '064967a176b57ad12b7dd280d6f0471ca8655fd061cb9bf0aa58c6bac94772ad'
+  data.tar.gz: f5c4412bd5732c346a5aa7c5764c11178ab109afc58eb9949c97211dde972c00
 SHA512:
-  metadata.gz: a42dba0d42144cae133a766cebe9192d0257e3a0610a4535c163311f193923c56b5b21c15a4643d842557945d66d5a68faac4c0b1934ec406ce99ef8e991d5ad
-  data.tar.gz: fd8659905534432f07004a55d072dab21ab2c87e9f374c4b54fef68d8bec93450f68637200d598c430575b72969e3d156a419bd349ca54eb6460f0412acda4cc
+  metadata.gz: 3169964c8d02171156423cbb0439ed671887d095d2c26fa7ffbf254162cfb9b72b7ab0f63dcc8eef2420bb0139fe2cba00a7e16cec7632232d6af3383796ce34
+  data.tar.gz: cdc0afac03a21901fe95495e8b3ebb64c64017b71487173eb2cb85232a35da5cf367af0725d3a25f3170874e13c753c2fdeb67cb98aab8a5ea6cf75f136bc9a5

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

@@ -45,8 +45,10 @@ module Effective
       @_effective_resource ||= begin
         relation = instance_exec(&resource_scope_relation) if respond_to?(:resource_scope_relation)
 
-        if respond_to?(:resource_scope_relation) && !relation.kind_of?(ActiveRecord::Relation)
-          raise('resource_scope must return an ActiveRecord::Relation')
+        if respond_to?(:resource_scope_relation)
+          unless relation.kind_of?(ActiveRecord::Relation) || (relation.kind_of?(Class) && relation.ancestors.include?(ActiveModel::Model))
+            raise('resource_scope must return an ActiveRecord::Relation or class including ActiveModel::Model')
+          end
         end
 
         resource = Effective::Resource.new(controller_path, relation: relation)
@@ -94,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

@@ -8,8 +8,10 @@ module Effective
     def flash_success(resource, action = nil, name: nil)
       raise 'expected an ActiveRecord resource' unless (name || resource.class.respond_to?(:model_name))
 
-      name ||= begin
-        resource.destroyed? ? resource.class.model_name.to_s.downcase.split('::').last : resource.to_s.presence
+      name ||= if resource.respond_to?(:destroyed?) && resource.destroyed?
+        resource_human_name
+      else
+        resource.to_s.presence || resource_human_name
       end
 
       "Successfully #{action_verb(action)} #{name || 'resource'}".html_safe
@@ -24,8 +26,10 @@ module Effective
 
       messages = flash_errors(resource, e: e)
 
-      name ||= begin
-        resource.destroyed? ? resource.class.model_name.to_s.downcase.split('::').last : resource.to_s.presence
+      name ||= if resource.respond_to?(:destroyed?) && resource.destroyed?
+        resource_human_name
+      else
+        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/save.rb

@@ -7,7 +7,7 @@ module Effective
         action ||= resource.respond_to?("#{step}!") ? step : :save
 
         if save_resource(resource, action)
-          flash[:success] = options.delete(:success) || resource_flash(:success, resource, action)
+          flash[:success] ||= options.delete(:success) || resource_flash(:success, resource, action)
 
           @skip_to ||= next_step
           @redirect_to ||= resource_wizard_path(resource, @skip_to) if was_new_record

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/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.8'.freeze
+  VERSION = '1.8.13'.freeze
 end

metadata

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