0
@@ -219,7 +219,7 @@ module ActionController
0
           next_capture = 1
0
           extraction = segments.collect do |segment|
0
             x = segment.match_extraction(next_capture)
0
-            next_capture += Regexp.new(segment.regexp_chunk).number_of_captures
0
+            next_capture += segment.number_of_captures
0
             x
0
           end
0
           extraction.compact

0
@@ -13,6 +13,10 @@ module ActionController
0
         @is_optional = false
0
       end
0
 
0
+      def number_of_captures
0
+        Regexp.new(regexp_chunk).number_of_captures
0
+      end
0
+
0
       def extraction_code
0
         nil
0
       end
0
@@ -84,6 +88,10 @@ module ActionController
0
         optional? ? Regexp.optionalize(chunk) : chunk
0
       end
0
 
0
+      def number_of_captures
0
+        0
0
+      end
0
+
0
       def build_pattern(pattern)
0
         escaped = Regexp.escape(value)
0
         if optional? && ! pattern.empty?
0
@@ -194,10 +202,16 @@ module ActionController
0
         end
0
       end
0
 
0
+      def number_of_captures
0
+        if regexp
0
+          regexp.number_of_captures + 1
0
+        else
0
+          1
0
+        end
0
+      end
0
+
0
       def build_pattern(pattern)
0
-        chunk = regexp_chunk
0
-        chunk = "(#{chunk})" if Regexp.new(chunk).number_of_captures == 0
0
-        pattern = "#{chunk}#{pattern}"
0
+        pattern = "#{regexp_chunk}#{pattern}"
0
         optional? ? Regexp.optionalize(pattern) : pattern
0
       end
0
 
0
@@ -230,6 +244,10 @@ module ActionController
0
         "(?i-:(#{(regexp || Regexp.union(*possible_names)).source}))"
0
       end
0
 
0
+      def number_of_captures
0
+        1
0
+      end
0
+
0
       # Don't URI.escape the controller name since it may contain slashes.
0
       def interpolation_chunk(value_code = local_name)
0
         "\#{#{value_code}.to_s}"
0
@@ -275,6 +293,10 @@ module ActionController
0
         regexp || "(.*)"
0
       end
0
 
0
+      def number_of_captures
0
+        regexp ? regexp.number_of_captures : 1
0
+      end
0
+
0
       def optionality_implied?
0
         true
0
       end