diff options
| author | brainopia <brainopia@evilmartians.com> | 2014-12-27 13:42:42 +0300 |
|---|---|---|
| committer | brainopia <brainopia@evilmartians.com> | 2015-01-25 03:07:27 +0300 |
| commit | 572bbab2e63916b4bb5e835d403856767b7f4be5 (patch) | |
| tree | ea971378864f33ceb33d84a6a232405fa21eaa30 /actionpack/lib | |
| parent | 04d1c3716b5bfa133a0b1ed937649a0829ac5f22 (diff) | |
| download | rails-572bbab2e63916b4bb5e835d403856767b7f4be5.tar.gz rails-572bbab2e63916b4bb5e835d403856767b7f4be5.tar.bz2 rails-572bbab2e63916b4bb5e835d403856767b7f4be5.zip | |
Improve shorthand matching for routes
Shorthand route match is when controller and action are taken literally from path.
E.g.
get '/foo/bar' # => will use 'foo#bar' as endpoint
get '/foo/bar/baz' # => will use 'foo/bar#baz' as endpoint
Not any path with level two or more of nesting can be used as shortcut.
If path contains any characters outside of /[\w-]/ then it can't be
used as such.
This commit ensures that invalid shortcuts aren't used.
':controller/:action/postfix' - is an example of invalid shortcut
that was previosly matched and led to exception:
"ArgumentError - ':controller/:action' is not a supported controller name"
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index f2c9e7b1a0..34b5b48f3a 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -1504,7 +1504,7 @@ module ActionDispatch end def using_match_shorthand?(path, options) - path && (options[:to] || options[:action]).nil? && path =~ %r{/[\w/]+$} + path && (options[:to] || options[:action]).nil? && path =~ %r{^/?[-\w]+/[-\w/]+$} end def decomposed_match(path, options) # :nodoc: |