aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-03-26 15:41:05 +0100
committerJosé Valim <jose.valim@gmail.com>2010-03-26 15:51:51 +0100
commitb2c2b0ce459a215d389f3ab8bb9e33718460cf51 (patch)
tree8215d6ec113d603c9194de9ac619db17970b09a5 /actionpack/lib/action_dispatch
parentf5ee855f439feb7958504dc1d8e62aad4da5fac6 (diff)
downloadrails-b2c2b0ce459a215d389f3ab8bb9e33718460cf51.tar.gz
rails-b2c2b0ce459a215d389f3ab8bb9e33718460cf51.tar.bz2
rails-b2c2b0ce459a215d389f3ab8bb9e33718460cf51.zip
Rails router automatically calculated for you the controller and named routes in the following scenarios:
match "home/about" #=> maps to home#about with named route home_about_path match "about" #=> does not work because it cannot guess the controller match "about" => "home#about" #=> maps to home#about with named route home_about_path match "home/about", :as => "about" #=> maps to home#about with named route about_path
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index ddee742021..278cf383ee 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -55,10 +55,8 @@ module ActionDispatch
path = normalize_path(path)
if using_match_shorthand?(path, options)
- options = {
- :to => path[1..-1].sub(%r{/([^/]*)$}, '#\1'),
- :as => path[1..-1].gsub("/", "_")
- }.merge!(options)
+ options[:to] ||= path[1..-1].sub(%r{/([^/]*)$}, '#\1')
+ options[:as] ||= path[1..-1].gsub("/", "_")
end
[ path, options ]
@@ -71,7 +69,7 @@ module ActionDispatch
# match "account/overview"
def using_match_shorthand?(path, options)
- path && options.except(:via, :anchor).empty? && !path.include?(':')
+ path && options.except(:via, :anchor, :to, :as).empty? && path =~ %r{^/[\w\/]+$}
end
def normalize_path(path)