effective_resources 1.8.8 → 1.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7247ed4940067b7becde627b02de2ccc38e8fa425b0a43f1080e60b40b4c57dc
-  data.tar.gz: 38939264d4747f0d2f83a306c9d0fc4e474e6f6303dd612d47e40390a0cf0e8e
+  metadata.gz: 9509a414f11385f7ea245dd9981a689630cf9266678ff038f96c46fddd79091a
+  data.tar.gz: abb42db276f35a17a8a1cae9ed5d226d34488f6a06c0ca6096a95a55974a24f8
 SHA512:
-  metadata.gz: a42dba0d42144cae133a766cebe9192d0257e3a0610a4535c163311f193923c56b5b21c15a4643d842557945d66d5a68faac4c0b1934ec406ce99ef8e991d5ad
-  data.tar.gz: fd8659905534432f07004a55d072dab21ab2c87e9f374c4b54fef68d8bec93450f68637200d598c430575b72969e3d156a419bd349ca54eb6460f0412acda4cc
+  metadata.gz: e8364de4a198c0e481a8819571b12d8e2092ad1785a1403f8a5c7c4993497f8c4b4e6309582b8661651f0ab95933e36418d67a2dccdb811c74cb9914af49cdd4
+  data.tar.gz: 68917727e998f65ad44282caa4ceb4810bce58a81c0a6ed66d56760992e840a5a4cdd662d889022e4fae3ff99fad488a4d44603604d1c986344bf42cf45c91c4

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)

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/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.8.8'.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.8
+  version: 1.8.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails