effective_resources 1.8.8 → 1.8.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9509a414f11385f7ea245dd9981a689630cf9266678ff038f96c46fddd79091a
|
|
4
|
+
data.tar.gz: abb42db276f35a17a8a1cae9ed5d226d34488f6a06c0ca6096a95a55974a24f8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e8364de4a198c0e481a8819571b12d8e2092ad1785a1403f8a5c7c4993497f8c4b4e6309582b8661651f0ab95933e36418d67a2dccdb811c74cb9914af49cdd4
|
|
7
|
+
data.tar.gz: 68917727e998f65ad44282caa4ceb4810bce58a81c0a6ed66d56760992e840a5a4cdd662d889022e4fae3ff99fad488a4d44603604d1c986344bf42cf45c91c4
|
|
@@ -45,8 +45,10 @@ module Effective
|
|
|
45
45
|
@_effective_resource ||= begin
|
|
46
46
|
relation = instance_exec(&resource_scope_relation) if respond_to?(:resource_scope_relation)
|
|
47
47
|
|
|
48
|
-
if respond_to?(:resource_scope_relation)
|
|
49
|
-
|
|
48
|
+
if respond_to?(:resource_scope_relation)
|
|
49
|
+
unless relation.kind_of?(ActiveRecord::Relation) || (relation.kind_of?(Class) && relation.ancestors.include?(ActiveModel::Model))
|
|
50
|
+
raise('resource_scope must return an ActiveRecord::Relation or class including ActiveModel::Model')
|
|
51
|
+
end
|
|
50
52
|
end
|
|
51
53
|
|
|
52
54
|
resource = Effective::Resource.new(controller_path, relation: relation)
|
|
@@ -8,8 +8,10 @@ module Effective
|
|
|
8
8
|
def flash_success(resource, action = nil, name: nil)
|
|
9
9
|
raise 'expected an ActiveRecord resource' unless (name || resource.class.respond_to?(:model_name))
|
|
10
10
|
|
|
11
|
-
name ||=
|
|
12
|
-
resource.
|
|
11
|
+
name ||= if resource.respond_to?(:destroyed?) && resource.destroyed?
|
|
12
|
+
resource.class.model_name.to_s.downcase.split('::').last
|
|
13
|
+
else
|
|
14
|
+
resource.to_s.presence
|
|
13
15
|
end
|
|
14
16
|
|
|
15
17
|
"Successfully #{action_verb(action)} #{name || 'resource'}".html_safe
|
|
@@ -24,8 +26,10 @@ module Effective
|
|
|
24
26
|
|
|
25
27
|
messages = flash_errors(resource, e: e)
|
|
26
28
|
|
|
27
|
-
name ||=
|
|
28
|
-
resource.
|
|
29
|
+
name ||= if resource.respond_to?(:destroyed?) && resource.destroyed?
|
|
30
|
+
resource.class.model_name.to_s.downcase.split('::').last
|
|
31
|
+
else
|
|
32
|
+
resource.to_s.presence
|
|
29
33
|
end
|
|
30
34
|
|
|
31
35
|
["Unable to #{action}", (" #{name}" if name), (": #{messages}" if messages)].compact.join.html_safe
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: effective_resources
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.8.
|
|
4
|
+
version: 1.8.9
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Code and Effect
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2021-03-
|
|
11
|
+
date: 2021-03-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|