flame 4.12.4 → 4.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ed5d54f5f6821749a7324ead082677cb04d669e
-  data.tar.gz: 228dbe656d57d35ab38a75780ead602461a73827
+  metadata.gz: 5bc0b79cf5230c68de69ef02ca56cbcb87129596
+  data.tar.gz: 704eeb2d13348ff0a2550f2bec091b3ce31f0107
 SHA512:
-  metadata.gz: d702039c0a51e0041d5bc41fb8b15c62bb1c9eb943fd2c6bfa74b88a8024f310921c9c22445fd8270e23a43815412fa9508ee42413aed7407a83b7efb89b93b2
-  data.tar.gz: 5347d0bc63a7c39d725369de0d1c8afa7707ef41cd95ea18aa282d8d61379903cb28b4353c0f731d6f45ddba853fc7603deb9c4a4cc41e19dd10004de2f8e5de
+  metadata.gz: c7e1bab7ef3dea8e2b4ebd3c0a2794238363d2667b8231a693450c906dfb49013d5280893003e65484678be80ff130860b7e16fab477aa62484630026c0ac347
+  data.tar.gz: 22a49850f69e4ca3dfa5ac4a58bb9fcaf639be004b6f0c2ec9ce9d45e64a4784840ad90b4f7aaf5c6057d0bce35a1736dd965f0a7096d2eff8b110781443270c

data/lib/flame/controller.rb

@@ -39,27 +39,41 @@ module Flame
 		end
 
 		## Redirect for response
-		## @overload redirect(path)
+		## @overload redirect(path, status)
 		##   Redirect to the string path
 		##   @param path [String] path
+		##   @param status [Ingeter, nil] HTTP status
+		##   @return [nil]
 		##   @example Redirect to '/hello'
 		##     redirect '/hello'
-		## @overload redirect(uri)
+		##   @example Redirect to '/hello' with status 301
+		##     redirect '/hello', 301
+		## @overload redirect(uri, status)
 		##   Redirect to the URI location
 		##   @param uri [URI] URI object
+		##   @param status [Ingeter, nil] HTTP status
+		##   @return [nil]
 		##   @example Redirect to 'http://example.com'
 		##     redirect URI::HTTP.build(host: 'example.com')
-		## @overload redirect(*args)
+		##   @example Redirect to 'http://example.com' with status 301
+		##     redirect URI::HTTP.build(host: 'example.com'), 301
+		## @overload redirect(*args, status)
 		##   Redirect to the path of `path_to` method
 		##   @param args arguments for `path_to` method
+		##   @param status [Ingeter, nil] HTTP status
+		##   @return [nil]
 		##   @example Redirect to `show` method of `ArticlesController` with id = 2
 		##     redirect ArticlesController, :show, id: 2
-		def redirect(*params)
-			probably_url = params.first
-			probably_url = probably_url.to_s if probably_url.is_a? URI
-			response.redirect(
-				probably_url.is_a?(String) ? probably_url : path_to(*params)
-			)
+		##   @example Redirect to method of controller with status 301
+		##     redirect ArticlesController, :show, { id: 2 }, 301
+		def redirect(*args)
+			args[0] = args.first.to_s if args.first.is_a? URI
+			unless args.first.is_a? String
+				path_to_args_range = 0..(args.last.is_a?(Integer) ? -2 : -1)
+				args[path_to_args_range] = path_to(*args[path_to_args_range])
+			end
+			response.redirect(*args)
+			nil
 		end
 
 		## Set the Content-Disposition to "attachment" with the specified filename,

data/lib/flame/dispatcher.rb

@@ -10,6 +10,8 @@ require_relative 'static'
 module Flame
 	## Helpers for dispatch Flame::Application#call
 	class Dispatcher
+		GEM_STATIC_FILES = File.join __dir__, '..', '..', 'public'
+
 		attr_reader :request, :response
 
 		include Flame::Dispatcher::Static
@@ -28,11 +30,11 @@ module Flame
 		def run!
 			catch :halt do
 				try_static ||
-					try_static(File.join(__dir__, '..', '..', 'public')) ||
+					try_static(GEM_STATIC_FILES) ||
 					try_route ||
 					halt(404)
 			end
-			response.write body
+			response.write body unless request.http_method == :HEAD
 			response.finish
 		end
 

data/lib/flame/request.rb

@@ -10,7 +10,7 @@ module Flame
 
 		## Override HTTP-method of the request if the param '_method' found
 		def http_method
-			params['_method'] || request_method
+			@http_method ||= (params['_method'] || request_method).upcase.to_sym
 		end
 	end
 end

data/lib/flame/route.rb

@@ -107,7 +107,9 @@ module Flame
 			end
 
 			def compare_method(request_method)
-				method.upcase.to_sym == request_method.upcase.to_sym
+				request_method = request_method.upcase.to_sym
+				request_method = :GET if request_method == :HEAD
+				method.upcase.to_sym == request_method
 			end
 
 			def compare_path_parts(request_parts)

data/lib/flame/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Flame
-	VERSION = '4.12.4'
+	VERSION = '4.14.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 4.12.4
+  version: 4.14.1
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack