Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Enable routes to recognize uppercase controller names. Closes #1635

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1765 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit f4bfacb24fbe17c1010a46c2b2d7a15d44cf1918 1 parent 5727dc2
@seckar seckar authored
View
2  actionpack/lib/action_controller/routing.rb
@@ -210,7 +210,7 @@ def traverse_to_controller(segments, start_at = 0)
mod_name = controller_name = segment = nil
while index < length
- return nil unless /^[a-z][a-z\d_]*$/ =~ (segment = segments[index])
+ return nil unless /^[A-Za-z][A-Za-z\d_]*$/ =~ (segment = segments[index])
index += 1
mod_name = segment.camelize
View
12 actionpack/test/controller/routing_test.rb
@@ -109,6 +109,9 @@ def self.const_available?(*args)
class UserController
end
+
+ class NewsFeedController
+ end
end
end
@@ -718,6 +721,15 @@ def test_backwards
def test_action_expiry
assert_equal ['/content', {}], rs.generate({:controller => 'content'}, {:controller => 'content', :action => 'show'})
end
+
+ def test_recognition_with_uppercase_controller_name
+ assert_equal({'controller' => ::Controllers::ContentController, 'action' => 'index'}, rs.recognize_path(%w(Content)))
+ assert_equal({'controller' => ::Controllers::ContentController, 'action' => 'list'}, rs.recognize_path(%w(Content list)))
+ assert_equal({'controller' => ::Controllers::ContentController, 'action' => 'show', 'id' => '10'}, rs.recognize_path(%w(Content show 10)))
+
+ assert_equal({'controller' => ::Controllers::Admin::NewsFeedController, 'action' => 'index'}, rs.recognize_path(%w(Admin NewsFeed)))
+ assert_equal({'controller' => ::Controllers::Admin::NewsFeedController, 'action' => 'index'}, rs.recognize_path(%w(Admin News_Feed)))
+ end
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.