@@ -310,7 +310,11 @@ module Merb end end - @variables = @segments.flatten.select { |s| s.is_a?(Symbol) } + unless regexp? + @variables = @segments.flatten.select { |s| s.is_a?(Symbol) } + compiled.gsub!(%r[/+], '/') + compiled.gsub!(%r[(.+)/$], '\1') + end compiled end lib/merb-core/dispatch/router/route.rb @@ -12,7 +12,7 @@ module Merb # ==== Returns # String:: The generated URL. def url(*args) - args << @request_params || {} + args << (@request_params || {}) Merb::Router.url(*args) end lib/merb-core/test/helpers/route_helper.rb @@ -17,6 +17,24 @@ describe "When recognizing requests," do it "should not match a different path" do lambda { route_to("/notinfo") }.should raise_not_found end + + it "should ignore trailing slashes" do + Merb::Router.prepare do + match("/hello/").to(:controller => "world") + end + + route_to("/hello").should have_route(:controller => "world") + end + + it "should ignore repeated slashes" do + Merb::Router.prepare do + match("/foo///bar").to(:controller => "fubar") + match("/hello//world").to(:controller => "greetings") + end + + route_to("/foo/bar").should have_route(:controller => "fubar") + route_to("/hello/world").should have_route(:controller => "greetings") + end end describe "a route with a Request method condition" do @@ -232,6 +250,26 @@ describe "When recognizing requests," do lambda { route_to("/one") }.should raise_not_found end + it "should ignore trailing slashes" do + Merb::Router.prepare do + match("/hello") do + match("/").to(:controller => "greetings") + end + end + + route_to("/hello").should have_route(:controller => "greetings") + end + + it "should ignore double slashes" do + Merb::Router.prepare do + match("/hello/") do + match("/world").to(:controller => "greetings") + end + end + + route_to("/hello/world").should have_route(:controller => "greetings") + end + it "should be able to define a route and still use the context for more route definition" do Merb::Router.prepare do match("/hello") do spec/public/router/recognition/conditions_spec.rb 36e76f35b62860bec3f63c30177115778586b618 Carl Lerche carllerche@mac.com http://github.com/wycats/merb-core/commit/32ee4fa37b534c5b046b1bb65d425947841d8e04 32ee4fa37b534c5b046b1bb65d425947841d8e04 2008-09-29T16:41:04-07:00 2008-09-29T16:41:04-07:00 Route matching handles slashes according to the RFC Trailing slashes in route matching are dropped and repeated slashes are converted to a single slash. e6dfc67c507bc1ee4bc2941c8c1b2b27f3f32b05 Carl Lerche carllerche@mac.com