Merge pull request #1390 from iguchi1124/fix-captured-paths

Fix to ignore empty captures from params
sinatra · Feb 21, 2018 · 05cb1fe · 05cb1fe
2 parents 3d26361 + 06f8c83
commit 05cb1fe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
@@ -1029,7 +1029,7 @@ def process_route(pattern, conditions, block = nil, values = [])
       if regexp_exists
         captures           = pattern.match(route).captures
         values            += captures
-        @params[:captures] = captures
+        @params[:captures] = captures unless captures.nil? || captures.empty?
       else
         values += params.values.flatten
       end

diff --git a/test/routing_test.rb b/test/routing_test.rb
@@ -216,6 +216,21 @@ class RoutingTest < Minitest::Test
     assert_equal "This is not a drill either", response.body
   end
 
+  it "returns empty when unmatched with any regex captures" do
+    mock_app do
+      before do
+        # noop
+      end
+
+      get '/hello' do
+        params.to_s
+      end
+    end
+
+    assert get('/hello').ok?
+    assert_body '{}'
+  end
+
   it "uses 404 error handler for not matching route" do
     mock_app {
       not_found do