effective_resources 1.8.6 → 1.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3054f246623c2920a43e74b98bdb52aa03501ca936da01036523ac76e6f35049
-  data.tar.gz: 2121fdfa7914e4b0c4c516a26d030f6ff3c1bda0d60ff54a5f683fe0c4280c51
+  metadata.gz: 2703faba8c8b14643c0e0f75e958bf27471b5d54fba6461d24e583156f7badae
+  data.tar.gz: 917291289d6e5530f04ddf65d03da2f828d0bf00dce53d79fc6e3f67c7d7a421
 SHA512:
-  metadata.gz: c714c8640357cbb5c52aeca16a5cef0a6e0caf9eafe1a54cccf8c9aee79f27afb65ae022a8512c4297c379b96b9dc9c98275345709a24591aa8b1544051d64fc
-  data.tar.gz: be065c497d1b2b664b9d82dedf8fa2e3fd77bc25f89b06d51a1841ce9069fdd41e933d681cf11a66a2f76d2846c09b9f1c2353e75d88c69d48d8df0cbdacde27
+  metadata.gz: 7033816b0b5c53b7f6ebccf7269aa635effb7f792e6dbbf55d83d546980612ecba3f3d18b160c46c5f6e353724763e63efb55e8ffa23c2f360eea1d3e1057635
+  data.tar.gz: e7b77545e441aec916ecbe3ca0fc35e8c9d14eeb6b7d3553e8b8e5be7af7ef71b735c89b480d5a91a3288f03a48b2846ac6f7f05a744a6bdb1d758d83630e08b

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

@@ -11,7 +11,6 @@ module Effective
     include Effective::CrudController::Submits
 
     included do
-      define_actions_from_routes
       define_callbacks :resource_render, :resource_before_save, :resource_after_save, :resource_after_commit, :resource_error
       layout -> { resource_layout }
     end
@@ -19,22 +18,11 @@ module Effective
     module ClassMethods
       include Effective::CrudController::Dsl
 
-      # This is used to define_actions_from_routes and for the buttons/submits/ons
+      # This is used for the buttons/submits/ons
       # It doesn't really work with the resource_scope correctly but the routes are important here
       def effective_resource
         @_effective_resource ||= Effective::Resource.new(controller_path)
       end
-
-      # Automatically respond to any action defined via the routes file
-      def define_actions_from_routes
-        (effective_resource.member_actions - effective_resource.crud_actions).each do |action|
-          define_method(action) { member_action(action) }
-        end
-
-        (effective_resource.collection_actions - effective_resource.crud_actions).each do |action|
-          define_method(action) { collection_action(action) }
-        end
-      end
     end
 
     def resource # @thing
@@ -53,22 +41,41 @@ module Effective
       send(:instance_variable_set, "@#{resource_plural_name}", instance)
     end
 
-    def effective_resource
+    def effective_resource(safe: false)
       @_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)
 
         unless resource.relation.kind_of?(ActiveRecord::Relation) || resource.active_model?
-          raise("unable to build resource_scope for #{resource.klass || 'unknown klass'}. Please name your controller to match an existing model, or manually define a resource_scope.")
+          raise("unable to build resource_scope for #{resource.klass || 'unknown klass'}. Please name your controller to match an existing model, or manually define a resource_scope.") unless safe
+        else
+          resource
         end
+      end
+    end
+
+    def action_missing(action, *args, &block)
+      effective_resource = self.effective_resource(safe: true)
+      return super if effective_resource.blank?
+
+      action = action.to_sym
 
-        resource
+      if effective_resource.member_actions.include?(action)
+        return member_action(action)
       end
+
+      if effective_resource.collection_actions.include?(action)
+        return collection_action(action)
+      end
+
+      super
     end
 
     private

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)
@@ -35,7 +35,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 +61,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 +73,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

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.class.model_name.to_s.downcase.split('::').last
+      else
+        resource.to_s.presence
       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.class.model_name.to_s.downcase.split('::').last
+      else
+        resource.to_s.presence
       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/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/effective_gem.rb

@@ -7,7 +7,7 @@ module EffectiveGem
     raise("expected self.config_keys method") unless respond_to?(:config_keys)
 
     config_keys.each do |key|
-      self.class.define_method(key) { config()[key] }
+      self.singleton_class.define_method(key) { config()[key] }
     end
   end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.8.6'.freeze
+  VERSION = '1.8.11'.freeze
 end

metadata

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