From 2445a4994468aabe627f106341af79bfff24451e Mon Sep 17 00:00:00 2001
From: namusyaka <namusyaka@gmail.com>
Date: Tue, 28 Mar 2017 11:24:57 +0900
Subject: [PATCH] add :strict_paths option for managing trailing slashes

---
 lib/sinatra/base.rb  |  2 ++
 test/routing_test.rb | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
index 729d7c16..d6cbdea1 100644
--- a/lib/sinatra/base.rb
+++ b/lib/sinatra/base.rb
@@ -1029,6 +1029,7 @@ module Sinatra
     def process_route(pattern, conditions, block = nil, values = [])
       route = @request.path_info
       route = '/' if route.empty? and not settings.empty_path_info?
+      route = route[0..-2] if !settings.strict_paths? && route != '/' && route.end_with?('/')
       return unless params = pattern.params(route)
 
       params.delete("ignore") # TODO: better params handling, maybe turn it into "smart" object or detect changes
@@ -1845,6 +1846,7 @@ module Sinatra
     set :absolute_redirects, true
     set :prefixed_redirects, false
     set :empty_path_info, nil
+    set :strict_paths, true
 
     set :app_file, nil
     set :root, Proc.new { app_file && File.expand_path(File.dirname(app_file)) }
diff --git a/test/routing_test.rb b/test/routing_test.rb
index db241787..dda03607 100644
--- a/test/routing_test.rb
+++ b/test/routing_test.rb
@@ -1499,4 +1499,20 @@ class RoutingTest < Minitest::Test
     get '/foo/'
     assert_equal 'Foo with a slash', body
   end
+
+  it 'does not treat routes with and without trailing slashes differently if :strict_paths is disabled' do
+    mock_app do
+      disable :strict_paths
+
+      get '/foo' do
+        'foo'
+      end
+    end
+
+    get '/foo'
+    assert_equal 'foo', body
+
+    get '/foo/'
+    assert_equal 'foo', body
+  end
 end