Broken up config data (Issue #52).

README.md

@@ -61,7 +61,7 @@ Tempest makes use of various tools to streamline the development process:
 
 ### Configuration.
 
-* Application configuration is stored in `config.php`. More instructions on configuration are provided at the top of the file.
+* Application configuration is stored in `/config/*.php`. More instructions on configuration are provided at the top of the file.
 
 ## Releases.
 

config/general.php

@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * General configuration that is accessible via <code>tempest()->config(key, fallback)</code>.
+ */
+return array(
+
+	'*' => array(
+		'timezone' => 'Australia/Sydney'
+	),
+
+	'localhost' => array(
+		'dev' => true
+	)
+
+);

config/routes.php

@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * Application routes.
+ */
+return array(
+
+	'*' => array(
+		'/sample' => array('controller' => 'SampleController', 'vars' => array('property' => 'value'))
+	)
+
+);

config/twig.php

@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * Configuration data is accessible in Twig templates via <code>{{ config.<key> }}</code>.
+ */
+return array(
+
+	'*' => array(
+		'title' => 'New App'
+	)
+
+);

server/app/App.php

@@ -14,13 +14,6 @@ protected function setup()
 	}
 
 
-	protected function defineRoutes(Router $router)
-	{
-		// Use the routes defined in the app configuration.
-		return tempest()->config('routes', array());
-	}
-
-
 	protected function defineServices()
 	{
 		return array(

server/tempest/Tempest/Config.php

@@ -2,7 +2,8 @@
 
 
 /**
- * Manages application configuration, defined in <code>/config.php</code>.
+ * Manages application configuration, defined in <code>/config/*.php</code>.
+ *
  * @author Marty Wallace.
  */
 class Config
@@ -11,9 +12,14 @@ class Config
 	private $data = array();
 
 
-	public function __construct()
+	/**
+	 * Constructor.
+	 *
+	 * @param string $name The name of the config file being managed by this instace.
+	 */
+	public function __construct($name)
 	{
-		$data = require_once(APP_ROOT . 'config.php');
+		$data = require_once(APP_ROOT . 'config/' . $name . '.php');
 
 		// Also allow www.{SERVER_NAME}, a common ServerAlias in Apache.
 		$compareHost = preg_replace('/^www\./', '', HOST);
@@ -33,9 +39,6 @@ public function __construct()
 			// No cascading config - use the entire top level set.
 			$this->data = $data;
 		}
-
-		// General configuration.
-		if ($this->data('timezone')) date_default_timezone_set($this->data('timezone'));
 	}
 
 

server/tempest/Tempest/MySQL/Database.php

@@ -8,12 +8,6 @@
 class Database extends PDO implements IService
 {
 
-	/**
-	 * @var PDO
-	 */
-	private $provider;
-
-
 	public function __construct()
 	{
 		$connection = tempest()->config('db');

server/tempest/Tempest/Tempest.php

@@ -75,9 +75,10 @@ public static function getInstance()
 	 */
 	public function __construct()
 	{
-		$this->config = new Config();
+		$this->config = new Config('general');
 
 		error_reporting($this->config('dev', false) ? -1 : 0);
+		date_default_timezone_set($this->config('timezone', 'Australia/Sydney'));
 		set_error_handler(array($this, 'error'));
 
 		static::$instance = $this;
@@ -89,14 +90,16 @@ public function __construct()
 	 */
 	public function start()
 	{
+		$routes = new Config('routes');
+
 		$this->services = array_merge($this->defineServices(), array(
 			'twig' => new Twig(),
 			'db' => new Database(),
 			'platform' => new Platform()
 		));
 
 		$this->router = new Router();
-		$this->router->register($this->defineRoutes($this->router));
+		$this->router->register($routes->data());
 		$this->setup();
 
 		$request = $this->router->getRequest();
@@ -159,7 +162,7 @@ public function start()
 	 *
 	 * @return mixed
 	 */
-	public function config($prop, $fallback = null)
+	public function config($prop = null, $fallback = null)
 	{
 		return $this->config->data($prop, $fallback);
 	}
@@ -186,22 +189,6 @@ protected function defineServices()
 	}
 
 
-	/**
-	 * Defines the routes that this application will handle.
-	 * Override in your application class to defined additional routes.
-	 *
-	 * @param Router $router The Router managing the returned routes.
-	 *
-	 * @return array
-	 */
-	protected function defineRoutes(Router $router)
-	{
-		return array(
-			//
-		);
-	}
-
-
 	/**
 	 * Abort the application.
 	 *

server/tempest/Tempest/Twig/Twig.php

@@ -1,6 +1,7 @@
 <?php namespace Tempest\Twig;
 
 use Tempest\IService;
+use Tempest\Config;
 use Tempest\Utils\Path;
 use \Twig_Loader_Filesystem;
 use \Twig_Environment;
@@ -18,10 +19,13 @@ class Twig implements IService
 	private $environment;
 	private $functions;
 	private $filters;
+	private $config;
 
 
 	public function __construct()
 	{
+		$this->config = new Config('twig');
+
 		$this->loader = new Twig_Loader_Filesystem(array(
 			Path::create(APP_ROOT . 'html', Path::DELIMITER_RETAIN)->rpad()
 		));
@@ -50,7 +54,7 @@ public function render($file, $context = array())
 			return new TwigResponse($this->environment->render($file, array_merge($context, array(
 				'T' => tempest()->getServices(),
 				'root' => tempest()->getRoot(),
-				'config' => tempest()->config('twig', array()),
+				'config' => $this->config->data(),
 				'request' => tempest()->getRouter()->getRequest()
 			))));
 		}
@@ -59,6 +63,20 @@ public function render($file, $context = array())
 	}
 
 
+	/**
+	 * Returns configuration data stored in <code>/config/twig.php</code>.
+	 *
+	 * @param string $prop The config property to get.
+	 * @param mixed $fallback A fallback value to use if the property is not defined.
+	 *
+	 * @return mixed
+	 */
+	public function config($prop = null, $fallback = null)
+	{
+		return $this->config->data($prop, $fallback);
+	}
+
+
 	/**
 	 * A reference to the Twig_Environment instance.
 	 *