diff options
author | José Valim <jose.valim@gmail.com> | 2011-10-10 23:57:03 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-10-10 23:57:03 -0700 |
commit | 1735868c61bc9925f8fabdaea4c44e4b5962b8f4 (patch) | |
tree | 51ef0babbf3913c361a41cef963239c38742bff8 /actionpack/lib | |
parent | b5f66cf7ebfafefc27ee8c62ce39fee4c044eee7 (diff) | |
parent | 8f863742e34908ed1a9549bb9f984edb58f2b068 (diff) | |
download | rails-1735868c61bc9925f8fabdaea4c44e4b5962b8f4.tar.gz rails-1735868c61bc9925f8fabdaea4c44e4b5962b8f4.tar.bz2 rails-1735868c61bc9925f8fabdaea4c44e4b5962b8f4.zip |
Merge pull request #3285 from dcrec1/master
Fixes #3280: Shorthand route nested in scope produces missing controller error
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index cd59b13c42..ef31d1e004 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -49,7 +49,7 @@ module ActionDispatch class Mapping #:nodoc: IGNORE_OPTIONS = [:to, :as, :via, :on, :constraints, :defaults, :only, :except, :anchor, :shallow, :shallow_path, :shallow_prefix] ANCHOR_CHARACTERS_REGEX = %r{\A(\\A|\^)|(\\Z|\\z|\$)\Z} - SHORTHAND_REGEX = %r{^/[\w/]+$} + SHORTHAND_REGEX = %r{/[\w/]+$} WILDCARD_PATH = %r{\*([^/\)]+)\)?$} def initialize(set, scope, path, options) @@ -70,7 +70,7 @@ module ActionDispatch if using_match_shorthand?(path_without_format, @options) to_shorthand = @options[:to].blank? - @options[:to] ||= path_without_format[1..-1].sub(%r{/([^/]*)$}, '#\1') + @options[:to] ||= path_without_format.gsub(/\(.*\)/, "")[1..-1].sub(%r{/([^/]*)$}, '#\1') end @options.merge!(default_controller_and_action(to_shorthand)) @@ -90,7 +90,7 @@ module ActionDispatch # match "account/overview" def using_match_shorthand?(path, options) - path && options.except(:via, :anchor, :to, :as).empty? && path =~ SHORTHAND_REGEX + path && (options[:to] || options[:action]).nil? && path =~ SHORTHAND_REGEX end def normalize_path(path) |