flame-flash 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34ea27d4523bf6286024a2be3100e5266f28487a
-  data.tar.gz: 8eb40fd2360612f052f68b9273556865288b313b
+  metadata.gz: fe365073f1d5d4060c1d9adae691fcd0256ec01b
+  data.tar.gz: 1be84d5b7a28ba31d6586ad5de4655533be3f9f5
 SHA512:
-  metadata.gz: 06ffbc5df6906671adb359ac6ff758929c47dc6eb1b0140aa8b765f1ba3d64a88c20763f71753e4f83a6bf3d425a6068665023681deec4f986760292ee0e4210
-  data.tar.gz: 7d6711ee480a307e99196a687013e72190deed10af7b5cf1cf509f1243825067c88769c76846899db94053db40bbfaa8121abb525ace818fb446f58f2c8cfe99
+  metadata.gz: c26edab72b7480cce22dc1bfa3151df63b3ddd438ed0ba13ff80bb6fc5252bd0c7399ac1acb069eba971b44d0aa5c0d731351d1641c581beb86a765edf3f559a
+  data.tar.gz: 4deedc6fbcb340db645c29b15521bd86cc80ca7d7fc4520b51029a9937b3a38f14c145879383fac4b495b94167ccc69b2fdd7fe1b82b5bfd4ef1f3f9906e3d96

data/lib/flame/flash.rb

@@ -14,11 +14,11 @@ module Flame
 		##   redirect ArticlesController, :show, id: 2, error: 'Access required'
 		def redirect(*args)
 			if args.last.is_a? Hash
-				add_controller_class(args)
-				parameters = args[0].instance_method(args[1]).parameters.map(&:last)
-				args[-1], flashes = args.last.partition do |key, _value|
-					parameters.include? key
-				end.map(&:to_h)
+				if args[0].is_a? String
+					flashes = args.pop
+				else
+					args[-1], flashes = extract_flashes(args)
+				end
 				flash.merge(flashes)
 			end
 			super
@@ -34,5 +34,14 @@ module Flame
 				)
 			).scope(key)
 		end
+
+		## Split Hash-argument to parameters and flashes
+		def extract_flashes(args)
+			add_controller_class(args)
+			parameters = args[0].instance_method(args[1]).parameters.map(&:last)
+			args.last.partition do |key, _value|
+				parameters.include? key
+			end.map(&:to_h)
+		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame-flash
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flame