kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

fix to ';' interpretation in route recognition--only follow a route with ';' if the segment in question actually contains a ';'

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4244 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jamis Buck 2006-04-21 17:21:26 +00:00
parent 010a10f3a1
commit 0a0b5bd722
2 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
actionpack/lib/action_controller/routing.rb
View file

@ -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)

27
actionpack/test/controller/routing_test.rb
View file

@ -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(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(items 3;complete)
hash = rs.recognize_path %w(posts 7)
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"]]
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