mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Ported missing functionality from Rails 2.3.x, raise error on wrong regexps in :constraints in routes
This commit is contained in:
parent
c15bb4901b
commit
ca3936dbd6
1 changed files with 9 additions and 0 deletions
|
@ -113,6 +113,15 @@ module ActionDispatch
|
|||
@requirements ||= (@options[:constraints].is_a?(Hash) ? @options[:constraints] : {}).tap do |requirements|
|
||||
requirements.reverse_merge!(@scope[:constraints]) if @scope[:constraints]
|
||||
@options.each { |k, v| requirements[k] = v if v.is_a?(Regexp) }
|
||||
|
||||
requirements.each do |_, requirement|
|
||||
if requirement.source =~ %r{\A(\\A|\^)|(\\Z|\\z|\$)\Z}
|
||||
raise ArgumentError, "Regexp anchor characters are not allowed in routing requirements: #{requirement.inspect}"
|
||||
end
|
||||
if requirement.multiline?
|
||||
raise ArgumentError, "Regexp multiline option not allowed in routing requirements: #{requirement.inspect}"
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue