diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2008-03-28 20:01:21 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-03-28 20:01:21 +0000 |
commit | db3a60eb92707912461c76895492f6b018b63cc5 (patch) | |
tree | 3d5c9bc2a3d17fe9e2b5193397a010b9de32914f /actionpack/lib/action_controller/routing | |
parent | 9300ebd86fa39c6ea96cf39ef50ba5337dca6157 (diff) | |
download | rails-db3a60eb92707912461c76895492f6b018b63cc5.tar.gz rails-db3a60eb92707912461c76895492f6b018b63cc5.tar.bz2 rails-db3a60eb92707912461c76895492f6b018b63cc5.zip |
Added support for regexp flags like ignoring case in the :requirements part of routes declarations (closes #11421) [NeilW]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9115 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/routing')
-rw-r--r-- | actionpack/lib/action_controller/routing/builder.rb | 9 | ||||
-rw-r--r-- | actionpack/lib/action_controller/routing/route.rb | 4 | ||||
-rw-r--r-- | actionpack/lib/action_controller/routing/segments.rb | 18 |
3 files changed, 26 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/routing/builder.rb b/actionpack/lib/action_controller/routing/builder.rb index 69943d4230..50064055f4 100644 --- a/actionpack/lib/action_controller/routing/builder.rb +++ b/actionpack/lib/action_controller/routing/builder.rb @@ -16,6 +16,10 @@ module ActionController Regexp.new "(.*?)(#{separators.source}|$)" end + def multiline_regexp?(expression) + expression.options & Regexp::MULTILINE == Regexp::MULTILINE + end + # Accepts a "route path" (a string defining a route), and returns the array # of segments that corresponds to it. Note that the segment array is only # partially initialized--the defaults and requirements, for instance, need @@ -99,6 +103,9 @@ module ActionController if requirement.source =~ %r{\A(\\A|\^)|(\\Z|\\z|\$)\Z} raise ArgumentError, "Regexp anchor characters are not allowed in routing requirements: #{requirement.inspect}" end + if multiline_regexp?(requirement) + raise ArgumentError, "Regexp multiline option not allowed in routing requirements: #{requirement.inspect}" + end segment.regexp = requirement else route_requirements[key] = requirement @@ -194,4 +201,4 @@ module ActionController end end end -end
\ No newline at end of file +end diff --git a/actionpack/lib/action_controller/routing/route.rb b/actionpack/lib/action_controller/routing/route.rb index 94134a284e..a83a599e35 100644 --- a/actionpack/lib/action_controller/routing/route.rb +++ b/actionpack/lib/action_controller/routing/route.rb @@ -62,7 +62,7 @@ module ActionController def generation_requirements requirement_conditions = requirements.collect do |key, req| if req.is_a? Regexp - value_regexp = Regexp.new "\\A#{req.source}\\Z" + value_regexp = Regexp.new "\\A#{req.to_s}\\Z" "hash[:#{key}] && #{value_regexp.inspect} =~ options[:#{key}]" else "hash[:#{key}] == #{req.inspect}" @@ -237,4 +237,4 @@ module ActionController end end -end
\ No newline at end of file +end diff --git a/actionpack/lib/action_controller/routing/segments.rb b/actionpack/lib/action_controller/routing/segments.rb index efac2df1cb..24ea8c7f2d 100644 --- a/actionpack/lib/action_controller/routing/segments.rb +++ b/actionpack/lib/action_controller/routing/segments.rb @@ -171,10 +171,19 @@ module ActionController end def value_regexp - Regexp.new "\\A#{regexp.source}\\Z" if regexp + Regexp.new "\\A#{regexp.to_s}\\Z" if regexp end + def regexp_chunk - regexp ? "(#{regexp.source})" : "([^#{Routing::SEPARATORS.join}]+)" + if regexp + if regexp_has_modifiers? + "(#{regexp.to_s})" + else + "(#{regexp.source})" + end + else + "([^#{Routing::SEPARATORS.join}]+)" + end end def build_pattern(pattern) @@ -183,6 +192,7 @@ module ActionController pattern = "#{chunk}#{pattern}" optional? ? Regexp.optionalize(pattern) : pattern end + def match_extraction(next_capture) # All non code-related keys (such as :id, :slug) are URI-unescaped as # path parameters. @@ -201,6 +211,10 @@ module ActionController [:action, :id].include? key end + def regexp_has_modifiers? + regexp.options & (Regexp::IGNORECASE | Regexp::EXTENDED) != 0 + end + end class ControllerSegment < DynamicSegment #:nodoc: |