ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed application file structure and routing definitions.

Browse Source
This commit is contained in:
Taylor Otwell
2011-08-02 21:23:13 -05:00
parent 32f383205e
commit e40faa1945
6 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
application/filters.php → application/routes/filters.php
View File

0
application/routes.php → application/routes/routes.php
View File

0
application/composers.php → application/views/composers.php
View File

4
public/index.php
View File

@@ -158,7 +158,7 @@ require SYS_PATH.'routing/filter'.EXT;
// -------------------------------------------------------------- // --------------------------------------------------------------
// Register the route filters. // Register the route filters.
// -------------------------------------------------------------- // --------------------------------------------------------------
System\Routing\Filter::register(require APP_PATH.'filters'.EXT); System\Routing\Filter::register(require ROUTE_PATH.'filters'.EXT);
// -------------------------------------------------------------- // --------------------------------------------------------------
// Execute the global "before" filter. // Execute the global "before" filter.
@@ -170,7 +170,7 @@ $response = System\Routing\Filter::call('before', array(), true);
// ---------------------------------------------------------- // ----------------------------------------------------------
if (is_null($response)) if (is_null($response))
{ {
$route = System\Routing\Router::make(System\Request::method(), System\Request::uri(), new System\Routing\Loader(APP_PATH))->route(); $route = System\Routing\Router::make(System\Request::method(), System\Request::uri(), new System\Routing\Loader(ROUTE_PATH))->route();
$response = (is_null($route)) ? System\Response::error('404') : $route->call(); $response = (is_null($route)) ? System\Response::error('404') : $route->call();
} }

40
system/routing/loader.php
View File

@@ -35,14 +35,7 @@ class Loader {
*/ */
public function load($uri) public function load($uri)
{ {
$base = require $this->path.'routes'.EXT; return array_merge($this->load_nested_routes($uri), require $this->path.'routes'.EXT);
if ( ! is_dir($this->path.'routes') or $uri == '')
{
return $base;
}
return array_merge($this->load_nested_routes($uri), $base);
} }
/** /**
@@ -56,12 +49,12 @@ class Loader {
$segments = explode('/', $uri); $segments = explode('/', $uri);
// Work backwards through the URI segments until we find the deepest possible // Work backwards through the URI segments until we find the deepest possible
// matching route file in the routes directory. // matching route directory. Once we find it, we will return those routes.
foreach (array_reverse($segments, true) as $key => $value) foreach (array_reverse($segments, true) as $key => $value)
{ {
if (file_exists($path = $this->path.'routes/'.implode('/', array_slice($segments, 0, $key + 1)).EXT)) if (is_dir($path = $this->path.implode('/', array_slice($segments, 0, $key + 1))))
{ {
return require $path; return require $path.'/routes'.EXT;
} }
} }
@@ -78,28 +71,23 @@ class Loader {
* @param string $path * @param string $path
* @return array * @return array
*/ */
public static function all($reload = false, $path = null) public static function all($reload = false, $path = ROUTE_PATH)
{ {
if ( ! is_null(static::$routes) and ! $reload) return static::$routes; if ( ! is_null(static::$routes) and ! $reload) return static::$routes;
if (is_null($path)) $path = APP_PATH;
$routes = require $path.'routes'.EXT; $routes = require $path.'routes'.EXT;
if (is_dir($path.'routes')) // Since route files can be nested deep within the route directory, we need to
// recursively spin through the directory to find every file.
$directoryIterator = new \RecursiveDirectoryIterator($path);
$recursiveIterator = new \RecursiveIteratorIterator($directoryIterator, \RecursiveIteratorIterator::SELF_FIRST);
foreach ($recursiveIterator as $file)
{ {
// Since route files can be nested deep within the route directory, we need to if (filetype($file) === 'file' and strpos($file, EXT) !== false and strpos($file, 'filters'.EXT) === false)
// recursively spin through the directory to find every file.
$directoryIterator = new \RecursiveDirectoryIterator($path.'routes');
$recursiveIterator = new \RecursiveIteratorIterator($directoryIterator, \RecursiveIteratorIterator::SELF_FIRST);
foreach ($recursiveIterator as $file)
{ {
if (filetype($file) === 'file' and strpos($file, EXT) !== false) $routes = array_merge(require $file, $routes);
{
$routes = array_merge(require $file, $routes);
}
} }
} }

2
system/view.php
View File

@@ -61,7 +61,7 @@ class View {
{ {
if (is_null(static::$composers)) if (is_null(static::$composers))
{ {
static::$composers = require APP_PATH.'composers'.EXT; static::$composers = require VIEW_PATH.'composers'.EXT;
} }
$instance = new static($view, $data); $instance = new static($view, $data);