Allow routes with a trailing slash to be recognized

Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2039 state:committed]
rails · Mar 4, 2009 · ce56c5d · ce56c5d · ariejan · Mar 4, 2009
1 parent 9b1b88f
commit ce56c5d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/actionpack/lib/action_controller/routing/segments.rb b/actionpack/lib/action_controller/routing/segments.rb
@@ -318,7 +318,7 @@ def interpolation_chunk
       end
 
       def regexp_chunk
-        '(\.[^/?\.]+)?'
+        '/|(\.[^/?\.]+)?'
       end
 
       def to_s

diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
@@ -750,9 +750,17 @@ def test_nested_resources_in_nested_namespace
   end
 
   def test_with_path_segment
-    with_restful_routing :messages, :as => 'reviews' do
-      assert_simply_restful_for :messages, :as => 'reviews'
+    with_restful_routing :messages do
+      assert_simply_restful_for :messages
+      assert_recognizes({:controller => "messages", :action => "index"}, "/messages")
+      assert_recognizes({:controller => "messages", :action => "index"}, "/messages/")
     end
+
+     with_restful_routing :messages, :as => 'reviews' do
+       assert_simply_restful_for :messages, :as => 'reviews'
+      assert_recognizes({:controller => "messages", :action => "index"}, "/reviews")
+      assert_recognizes({:controller => "messages", :action => "index"}, "/reviews/")
+     end
   end
 
   def test_multiple_with_path_segment_and_controller