Changeset 9115 for trunk/actionpack/lib/action_controller/routing/builder.rb

Timestamp:

03/28/08 20:01:21 (7 months ago)

Author:

david

Message:

Added support for regexp flags like ignoring case in the :requirements part of routes declarations (closes #11421) [NeilW]

Files:

• trunk/actionpack/lib/action_controller/routing/builder.rb (modified) (2 diffs)

trunk/actionpack/lib/action_controller/routing/builder.rb

@@ -15 +15 @@
-      def interval_regexp
-        Regexp.new "(.*?)(#{separators.source}|$)"
+      end
+
+      def multiline_regexp?(expression)
+        expression.options & Regexp::MULTILINE == Regexp::MULTILINE
-      end
-
@@ -99 +103 @@
-            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