flame-flash 2.1.0 → 2.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/flame/flash.rb +14 -5
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: fe365073f1d5d4060c1d9adae691fcd0256ec01b
|
4
|
+
data.tar.gz: 1be84d5b7a28ba31d6586ad5de4655533be3f9f5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c26edab72b7480cce22dc1bfa3151df63b3ddd438ed0ba13ff80bb6fc5252bd0c7399ac1acb069eba971b44d0aa5c0d731351d1641c581beb86a765edf3f559a
|
7
|
+
data.tar.gz: 4deedc6fbcb340db645c29b15521bd86cc80ca7d7fc4520b51029a9937b3a38f14c145879383fac4b495b94167ccc69b2fdd7fe1b82b5bfd4ef1f3f9906e3d96
|
data/lib/flame/flash.rb
CHANGED
@@ -14,11 +14,11 @@ module Flame
|
|
14
14
|
## redirect ArticlesController, :show, id: 2, error: 'Access required'
|
15
15
|
def redirect(*args)
|
16
16
|
if args.last.is_a? Hash
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
end
|
17
|
+
if args[0].is_a? String
|
18
|
+
flashes = args.pop
|
19
|
+
else
|
20
|
+
args[-1], flashes = extract_flashes(args)
|
21
|
+
end
|
22
22
|
flash.merge(flashes)
|
23
23
|
end
|
24
24
|
super
|
@@ -34,5 +34,14 @@ module Flame
|
|
34
34
|
)
|
35
35
|
).scope(key)
|
36
36
|
end
|
37
|
+
|
38
|
+
## Split Hash-argument to parameters and flashes
|
39
|
+
def extract_flashes(args)
|
40
|
+
add_controller_class(args)
|
41
|
+
parameters = args[0].instance_method(args[1]).parameters.map(&:last)
|
42
|
+
args.last.partition do |key, _value|
|
43
|
+
parameters.include? key
|
44
|
+
end.map(&:to_h)
|
45
|
+
end
|
37
46
|
end
|
38
47
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: flame-flash
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.1.
|
4
|
+
version: 2.1.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Alexander Popov
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-02-
|
11
|
+
date: 2016-02-04 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: flame
|