pass match up to avoid having to re-do work

lib/http_router/glob.rb

@@ -1,10 +1,10 @@
 class HttpRouter
   class Glob < Variable
     def matches?(parts)
-      @matches_with.nil? or (!parts.empty? and match = @matches_with.match(parts.first) and match.begin(0))
+      @matches_with.nil? or (!parts.empty? and match = @matches_with.match(parts.first) and match.begin(0)) ? match : nil
     end
 
-    def consume(parts)
+    def consume(match, parts)
       if @matches_with
         params = [parts.shift]
         params << parts.shift while matches?(parts)

lib/http_router/node.rb

@@ -150,9 +150,9 @@ def find_on_parts(request, parts, params)
           response = nil
           dupped_parts = nil
           next_node = @linear.find do |(tester, node)|
-            if tester.respond_to?(:matches?) and tester.matches?(parts)
+            if tester.respond_to?(:matches?) and match = tester.matches?(parts)
               dupped_parts = parts.dup
-              params << tester.consume(dupped_parts)
+              params << tester.consume(match, dupped_parts)
               parts.replace(dupped_parts) if response = node.find_on_parts(request, dupped_parts, params)
             elsif tester.respond_to?(:match) and match = tester.match(parts.whole_path) and match.begin(0) == 0
               dupped_parts = router.split(parts.whole_path[match[0].size, parts.whole_path.size])
@@ -167,7 +167,7 @@ def find_on_parts(request, parts, params)
           parts.shift
           return match.find_on_parts(request, parts, params)
         elsif @catchall
-          params << @catchall.variable.consume(parts)
+          params << @catchall.variable.consume(nil, parts)
           return @catchall.find_on_parts(request, parts, params)
         end
       end

lib/http_router/variable.rb

@@ -9,12 +9,11 @@ def initialize(router, name, matches_with = nil)
     end
 
     def matches?(parts)
-      @matches_with.nil? or (@matches_with and match = @matches_with.match(parts.whole_path) and match.begin(0) == 0)
+      @matches_with.nil? or (@matches_with and match = @matches_with.match(parts.whole_path) and match.begin(0) == 0) ? match : nil
     end
 
-    def consume(parts)
+    def consume(match, parts)
       if @matches_with
-        match = @matches_with.match(parts.whole_path)
         parts.replace(router.split(parts.whole_path[match.end(0), parts.whole_path.size]))
         match[0]
       else