effective_resources 1.8.4 → 1.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33448d396358208a6585b8beeff84f22b659bfc3676acbf9ed087d647acc56d3
-  data.tar.gz: 56b33689f40c4988cb600175623f5b3a3a4dde6192630d86188080244f5333ee
+  metadata.gz: 9509a414f11385f7ea245dd9981a689630cf9266678ff038f96c46fddd79091a
+  data.tar.gz: abb42db276f35a17a8a1cae9ed5d226d34488f6a06c0ca6096a95a55974a24f8
 SHA512:
-  metadata.gz: d8e3d0a86b310e31d991deb85b090c62167ba713e986d8a6c8ba30b3c3fa5583014d406af6e7d21cdbcc1f34fe5c8e8ec541d29e25835b724ebaa87e13b4cae1
-  data.tar.gz: 5908aa0138e84275ad07dcb500ccce0601a9ba7864ee98711eab0712a0075ea4fd0ad9adc33842fd423d3f6bc71d7f4d53319c3fbced1ec2ff90f28d8e27b527
+  metadata.gz: e8364de4a198c0e481a8819571b12d8e2092ad1785a1403f8a5c7c4993497f8c4b4e6309582b8661651f0ab95933e36418d67a2dccdb811c74cb9914af49cdd4
+  data.tar.gz: 68917727e998f65ad44282caa4ceb4810bce58a81c0a6ed66d56760992e840a5a4cdd662d889022e4fae3ff99fad488a4d44603604d1c986344bf42cf45c91c4

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))
+              redirect_to(resource_redirect_path(resource, action))
             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/helpers/effective_resources_helper.rb

@@ -148,6 +148,7 @@ module EffectiveResourcesHelper
     effective_resource = (atts.delete(:effective_resource) || find_effective_resource)
 
     action = atts.delete(:action)
+    safe = atts.delete(:safe)
     atts = { :namespace => (effective_resource.namespace.to_sym if effective_resource.namespace), effective_resource.name.to_sym => resource }.compact.merge(atts)
 
     if lookup_context.template_exists?("form_#{action}", controller._prefixes, :partial)
@@ -168,7 +169,10 @@ module EffectiveResourcesHelper
       end
     end
 
-    render('form', atts) # Will raise the regular error
+    # Will raise the regular error
+    return ''.html_safe if safe
+
+    render('form', atts)
   end
 
   # Similar to render_resource_form
@@ -182,6 +186,7 @@ module EffectiveResourcesHelper
     effective_resource = (atts.delete(:effective_resource) || find_effective_resource)
 
     action = atts.delete(:action)
+    safe = atts.delete(:safe)
     atts = { :namespace => (effective_resource.namespace.to_sym if effective_resource.namespace), effective_resource.name.to_sym => resource }.compact.merge(atts)
 
     if lookup_context.template_exists?(effective_resource.name, controller._prefixes, :partial)
@@ -194,7 +199,10 @@ module EffectiveResourcesHelper
       end
     end
 
-    render(resource, atts)  # Will raise the regular error
+    # Will raise the regular error
+    return ''.html_safe if safe
+
+    render(resource, atts)
   end
   alias_method :render_resource, :render_resource_partial
 

data/app/models/effective/resources/associations.rb

@@ -70,7 +70,8 @@ module Effective
       end
 
       def action_texts
-        klass.reflect_on_all_associations(:has_one).select { |ass| ass.class_name == 'ActionText::RichText' }
+        klass.reflect_on_all_associations(:has_one).select { |ass| ass.class_name == 'ActionText::RichText' } +
+        klass.reflect_on_all_associations(:has_many).select { |ass| ass.class_name == 'ActionText::RichText' }
       end
 
       def action_texts_has_ones_ids

data/app/models/effective/resources/instance.rb

@@ -80,6 +80,7 @@ module Effective
         action_texts
           .map { |ass| instance.send(ass.name) }
           .compact
+          .flatten
           .select { |obj| obj.previous_changes['body'].present? }
           .inject({}) { |h, obj| h[obj.name.to_sym] = obj.previous_changes['body']; h }
       end

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

@@ -1,7 +1,7 @@
 <% resource = (@_effective_resource || Effective::Resource.new(controller_path)) %>
 <% @resource = instance_variable_get('@' + resource.name) if resource.name %>
 
-EffectiveForm.remote_form_payload = "<%= j render_resource_form(@resource, action: action) %>";
+EffectiveForm.remote_form_payload = "<%= j render_resource_form(@resource, action: action, safe: true) %>";
 EffectiveForm.remote_form_commit = "<%= params[:commit] %>";
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;
 

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.4'.freeze
+  VERSION = '1.8.9'.freeze
 end

metadata

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