Added a new method to Zepto\Router to parse parameters from the URL

library/Zepto/Router.php

@@ -111,7 +111,7 @@ public function __construct(\Symfony\Component\HttpFoundation\Request $request)
     }
 
     /**
-     * Add HTTP GET routes
+     * Add HTTP GET route
      *
      * @see    Zepto\Router::route()
      * @param  string  $route
@@ -121,11 +121,10 @@ public function __construct(\Symfony\Component\HttpFoundation\Request $request)
     public function get($route, \Closure $callback)
     {
         $this->route(new Route($route, $callback));
-        // return $this->route($route, $callback, 'GET');
     }
 
     /**
-     * Add HTTP POST routes
+     * Add HTTP POST route
      *
      * @see    Zepto\Router::route()
      * @param  string  $route
@@ -159,9 +158,9 @@ public function match($http_method = 'GET', $url)
 
     /**
      * Tries to match one of the URL routes to the current URL, otherwise
-     * execute the default function and return false.
+     * execute the not found handler
      *
-     * @return array
+     * @return
      */
     public function run()
     {
@@ -170,15 +169,21 @@ public function run()
             throw new \Exception('No routes exist in the routing table. Add some');
         }
 
+        // Try and get a matching route for the current URL
         $route = $this->match($this->request->getMethod(), $this->request->getPathInfo());
 
         // Call not found handler if no match was found
         if ($route === null) {
             $this->not_found();
         }
         else {
+            // Set current route
             $this->current_route = $route;
-            $params = array();
+
+            // Get parameters from request
+            $params = $this->parse_parameters($route);
+
+            // Execute callback
             call_user_func_array($route->get_callback(), $params);
         }
     }
@@ -260,6 +265,29 @@ protected function route(Route $route, $http_method = 'GET')
         return true;
     }
 
+    /**
+     * Parses parameters from URI as per the given route's pattern
+     *
+     * @param  Route  $route
+     * @return array
+     */
+    protected function parse_parameters(Route $route)
+    {
+        // Get all parameter matches from URL for this route
+        preg_match($route->get_pattern(), "{$this->request->getPathInfo()}/", $matches);
+
+        $params = array();
+
+        // Retrieve any matches
+        foreach ($matches as $key => $value) {
+            if (is_string($key)) {
+                $params[] = $value;
+            }
+        }
+
+        return $params;
+    }
+
     protected function default_not_found_handler()
     {
         // Use Twig to do something nice