diff options
author | Jamis Buck <jamis@37signals.com> | 2006-04-21 17:21:26 +0000 |
---|---|---|
committer | Jamis Buck <jamis@37signals.com> | 2006-04-21 17:21:26 +0000 |
commit | 0a0b5bd7220883b0517972c2c2b0f808647d22fc (patch) | |
tree | 67076b4f690c2b53ef63bf76bfbd3851d4db3617 /actionpack | |
parent | 010a10f3a115602a40c6ad4b502f1158c9d40161 (diff) | |
download | rails-0a0b5bd7220883b0517972c2c2b0f808647d22fc.tar.gz rails-0a0b5bd7220883b0517972c2c2b0f808647d22fc.tar.bz2 rails-0a0b5bd7220883b0517972c2c2b0f808647d22fc.zip |
fix to ';' interpretation in route recognition--only follow a route with ';' if the segment in question actually contains a ';'
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4244 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/lib/action_controller/routing.rb | 9 | ||||
-rw-r--r-- | actionpack/test/controller/routing_test.rb | 29 |
2 files changed, 22 insertions, 16 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index 4fa1acf95e..d0726e8a8b 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -78,10 +78,11 @@ module ActionController def write_recognition(g) raise RoutingError, "Subpath components must occur last" unless g.after.empty? - g.next_segment - g.line "subindex, subpath = 0, #{g.next_segment}.split(/;/)" - tweak_recognizer(g).go - g.move_forward { |gg| gg.continue } + g.if("#{g.next_segment(true)} && #{g.next_segment}.include?(';')") do |gp| + gp.line "subindex, subpath = 0, #{gp.next_segment}.split(/;/)" + tweak_recognizer(gp).go + gp.move_forward { |gpp| gpp.continue } + end end def write_generation(g) diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index 4f12707f02..1562261735 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -1003,22 +1003,27 @@ class RouteSetTests < Test::Unit::TestCase Object.const_set(:SubpathBooksController, Class.new(ActionController::Base)) rs.draw do |r| - r.connect '/books/:id;edit', :controller => 'subpath_books', :action => 'edit' - r.connect '/items/:id;:action', :controller => 'subpath_books' + #r.connect '/books/:id;edit', :controller => 'subpath_books', :action => 'edit' + #r.connect '/items/:id;:action', :controller => 'subpath_books' r.connect '/posts/new;:action', :controller => 'subpath_books' + r.connect '/posts/:id', :controller => 'subpath_books', :action => "show" end - hash = rs.recognize_path %w(books 17;edit) - assert_not_nil hash - assert_equal %w(subpath_books 17 edit), [hash["controller"].controller_name, hash["id"], hash["action"]] - - hash = rs.recognize_path %w(items 3;complete) - assert_not_nil hash - assert_equal %w(subpath_books 3 complete), [hash["controller"].controller_name, hash["id"], hash["action"]] - - hash = rs.recognize_path %w(posts new;preview) + # hash = rs.recognize_path %w(books 17;edit) + # assert_not_nil hash + # assert_equal %w(subpath_books 17 edit), [hash["controller"].controller_name, hash["id"], hash["action"]] + # + # hash = rs.recognize_path %w(items 3;complete) + # assert_not_nil hash + # assert_equal %w(subpath_books 3 complete), [hash["controller"].controller_name, hash["id"], hash["action"]] + # + # hash = rs.recognize_path %w(posts new;preview) + # assert_not_nil hash + # assert_equal %w(subpath_books preview), [hash["controller"].controller_name, hash["action"]] + + hash = rs.recognize_path %w(posts 7) assert_not_nil hash - assert_equal %w(subpath_books preview), [hash["controller"].controller_name, hash["action"]] + assert_equal %w(subpath_books show 7), [hash["controller"].controller_name, hash["action"], hash["id"]] # for now, low-hanging fruit only. We don't allow subpath components anywhere # except at the end of the path |