flame 4.9.0 → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 765731c4ac1b82c375236c1aea949533956027cb
-  data.tar.gz: fe2444302d7243844af734698540402e82230ccd
+  metadata.gz: 8395ff4675716dc3fb9aa3aa58b997624ca10d57
+  data.tar.gz: c612ae674eeb4571b71f42fcb39e60ccc8fc4f1f
 SHA512:
-  metadata.gz: b35c4109bdca5cd8e7d65e88b2b541d65caa833f7f77647aeba5318cc6f35baec33cafc27d097e812a44b6d83032a7185db5dd5898db58783dadc6d4e4e85948
-  data.tar.gz: fe7d7eaaad332bd3076fc6f78000140b1144df3f09551910b53bd9bce86d180c3be775146bacc01ece2d792d6f776376e681ef92b9fdac1a87209d9cd19683f9
+  metadata.gz: 639a69107187f6e64953d34c99abf822058c35ec320db0f0f54d84692f0810070825eec83bfeec11276e84e5f506277fa517d6f3a93a5e04bcfe08b684ecdd51
+  data.tar.gz: eed88fd30af185d4590519ad5e817744287082e7bedbb23de02c33662f3cc0b075d71b48a0d5c59300e81495036ba544b62eb6d1191a7f3755b44e7d592dac39

data/lib/flame/dispatcher.rb

@@ -25,7 +25,8 @@ module Flame
 		## Start of execution the request
 		def run!
 			catch :halt do
-				try_route ||
+				try_fix_slashes ||
+					try_route ||
 					try_static ||
 					try_static(File.join(__dir__, '..', '..', 'public')) ||
 					halt(404)
@@ -145,6 +146,12 @@ module Flame
 
 		private
 
+		## Redirect from urls endings by slashes to same url without slashes
+		def try_fix_slashes
+			return if request.fullpath == request.fullpath_without_trailing_slashes
+			response.redirect(request.fullpath_without_trailing_slashes, 301)
+		end
+
 		## Find route and try execute it
 		def try_route
 			route = @app.class.router.find_route(

data/lib/flame/request.rb

@@ -10,5 +10,10 @@ module Flame
 		def http_method
 			params['_method'] || request_method
 		end
+
+		## Return fullpath without trailing slashes
+		def fullpath_without_trailing_slashes
+			fullpath.gsub(%r{(?<=.)\/+(?=$|\?)}, '')
+		end
 	end
 end

data/lib/flame/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Flame
-	VERSION = '4.9.0'.freeze
+	VERSION = '4.10.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.10.0
 platform: ruby
 authors:
 - Alexander Popov