moved all routing classes into routing namespace.

system/routing/router.php

@@ -0,0 +1,113 @@
+<?php namespace System\Routing;
+
+use System\Request;
+
+class Router {
+
+	/**
+	 * The request method and URI.
+	 *
+	 * @var string
+	 */
+	public $request;
+
+	/**
+	 * All of the loaded routes.
+	 *
+	 * @var array
+	 */
+	public $routes;
+
+	/**
+	 * Create a new router for a request method and URI.
+	 *
+	 * @param  string  $method
+	 * @param  string  $uri
+	 * @param  array   $routes
+	 * @return void
+	 */
+	public function __construct($method, $uri, $routes)
+	{
+		// Put the request method and URI in route form. Routes begin with
+		// the request method and a forward slash.
+		$this->request = $method.' /'.trim($uri, '/');
+		$this->routes = $routes;
+	}
+
+	/**
+	 * Create a new router for a request method and URI.
+	 *
+	 * @param  string  $method
+	 * @param  string  $uri
+	 * @param  array   $routes
+	 * @return Router
+	 */
+	public static function make($method, $uri, $routes = null)
+	{
+		return new static($method, $uri, $routes);
+	}
+
+	/**
+	 * Search a set of routes for the route matching a method and URI.
+	 *
+	 * @return Route
+	 */
+	public function route()
+	{
+		if (isset($this->routes[$this->request]))
+		{
+			return Request::$route = new Route($this->request, $this->routes[$this->request]);
+		}
+
+		foreach ($this->routes as $keys => $callback)
+		{
+			// Only check routes that have multiple URIs or wildcards.
+			// Other routes would have been caught by the check for literal matches.
+			if (strpos($keys, '(') !== false or strpos($keys, ',') !== false )
+			{
+				foreach (explode(', ', $keys) as $key)
+				{
+					if (preg_match('#^'.$this->translate_wildcards($key).'$#', $this->request))
+					{
+						return Request::$route = new Route($keys, $callback, $this->parameters($this->request, $key));
+					}
+				}				
+			}
+		}
+	}
+
+	/**
+	 * Translate route URI wildcards into actual regular expressions.
+	 *
+	 * @param  string  $key
+	 * @return string
+	 */
+	private function translate_wildcards($key)
+	{
+		$replacements = 0;
+
+		// For optional parameters, first translate the wildcards to their
+		// regex equivalent, sans the ")?" ending. We will add the endings
+		// back on after we know how many replacements we made.
+		$key = str_replace(array('/(:num?)', '/(:any?)'), array('(?:/([0-9]+)', '(?:/([a-zA-Z0-9\-_]+)'), $key, $replacements);
+
+		$key .= ($replacements > 0) ? str_repeat(')?', $replacements) : '';
+
+		return str_replace(array(':num', ':any'), array('[0-9]+', '[a-zA-Z0-9\-_]+'), $key);
+	}
+
+	/**
+	 * Extract the parameters from a URI based on a route URI.
+	 *
+	 * Any route segment wrapped in parentheses is considered a parameter.
+	 *
+	 * @param  string  $uri
+	 * @param  string  $route
+	 * @return array
+	 */
+	private function parameters($uri, $route)
+	{
+		return array_values(array_intersect_key(explode('/', $uri), preg_grep('/\(.+\)/', explode('/', $route))));	
+	}	
+
+}