effective_resources 1.8.7 → 1.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79cab109b01cb0133d18f3530e8ed872c183c8e637c8279da87bbd068ddbee21
-  data.tar.gz: 20e8cb596ab2181fde595dc430c2e57fa1396b7d91490827d496e20438f59575
+  metadata.gz: b61bac97524b1592c39a8b701f2c7bb0af87f9c5e882e75cbd1c2144e2284c38
+  data.tar.gz: 5c3d1674d1cdec588970c5358f307399c24d177300f04f81ffd8fde5e8b1e916
 SHA512:
-  metadata.gz: b4ed96cdaf9a6fb68f51b3328fde6b38151f595f09e94fbc8943f034d0de2a9ae48a959f07c050fc77a8bfcaa8d1b6be0f671e7d23e762de51771cc58a6c8779
-  data.tar.gz: feaa6d1027ba1b6315a922b400feab502bc1f96e545092e4d9f9284f9cd935e80e918dd2b2e93fb5b0f2391b59978aaa908c1663ec112d10c9bd3cde819c830b
+  metadata.gz: 9ffaaa83f17ee7dc3865da68bb1e3dbc7c9416fe68fd77c106cc51f1e9d23691cd35e1017f23428534d2001b897220d19b8daa0f27a96a004b29b8ef04aa8c91
+  data.tar.gz: 315828b2d06aa231f15dbae213f5dfcbc9e5721c53786e17aa10ee87d6e574f83c026c383f6f1782c08415df087b8d7a2fc7ccea828e56444cc2b173bf795bab

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/paths.rb

@@ -2,7 +2,7 @@ module Effective
   module CrudController
     module Paths
 
-      def resource_redirect_path(action = nil)
+      def resource_redirect_path(resource, action)
         submit = commit_action(action)
         redirect = submit[:redirect].respond_to?(:call) ? instance_exec(&submit[:redirect]) : submit[:redirect]
 
@@ -39,13 +39,29 @@ module Effective
         # Otherwise consider the action
         commit_default_redirect = case action
         when :create
-          [resource_show_path, resource_edit_path, resource_index_path]
+          [
+            (resource_show_path if EffectiveResources.authorized?(self, :show, resource)),
+            (resource_edit_path if EffectiveResources.authorized?(self, :edit, resource)),
+            (resource_index_path if EffectiveResources.authorized?(self, :index, resource.class))
+          ]
         when :update
-          [resource_edit_path, resource_show_path, resource_index_path]
+          [
+            (resource_edit_path if EffectiveResources.authorized?(self, :edit, resource)),
+            (resource_show_path if EffectiveResources.authorized?(self, :show, resource)),
+            (resource_index_path if EffectiveResources.authorized?(self, :index, resource.class))
+          ]
         when :destroy
-          [referer_redirect_path, resource_index_path]
+          [
+            referer_redirect_path,
+            (resource_index_path if EffectiveResources.authorized?(self, :index, resource.class))
+          ]
         else
-          [referer_redirect_path, resource_edit_path, resource_show_path, resource_index_path]
+          [
+            referer_redirect_path,
+            (resource_edit_path if EffectiveResources.authorized?(self, :edit, resource)),
+            (resource_show_path if EffectiveResources.authorized?(self, :show, resource)),
+            (resource_index_path if EffectiveResources.authorized?(self, :index, resource.class))
+          ]
         end.compact.first
 
         return commit_default_redirect if commit_default_redirect.present?

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

@@ -10,12 +10,12 @@ module Effective
           respond_to do |format|
             format.html do
               flash[:success] ||= resource_flash(:success, resource, action)
-              redirect_to(resource_redirect_path(action))
+              redirect_to(resource_redirect_path(resource, action))
             end
 
             format.js do
               flash[:success] ||= resource_flash(:success, resource, action)
-              redirect_to(resource_redirect_path(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
@@ -35,7 +34,7 @@ module Effective
           respond_to do |format|
             format.html do
               flash[:success] ||= resource_flash(:success, resource, action)
-              redirect_to(resource_redirect_path(action))
+              redirect_to(resource_redirect_path(resource, action))
             end
 
             format.js do
@@ -61,7 +60,7 @@ module Effective
           when :destroy
             format.html do
               redirect_flash
-              redirect_to(resource_redirect_path(action))
+              redirect_to(resource_redirect_path(resource, action))
             end
           else
             if template_present?(action)
@@ -73,7 +72,7 @@ module Effective
             else
               format.html do
                 redirect_flash
-                redirect_to(resource_redirect_path(action))
+                redirect_to(resource_redirect_path(resource, action))
               end
             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/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.7'.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.7
+  version: 1.8.12
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails