Implements Config and Logging plugins, tidies Main

Added Database and Flatfile plugin engines for both Config and Log classes.
Rewrote Main to make use of the new plugins.
Updated config file definitions to make use of plugins.

private/config.php.dist

@@ -10,23 +10,54 @@
  */
 define('Sihnon_Lib', '../lib/');
 
+/**
+ * Sihnon Database Support
+ *
+ * Specifies whether or not to include database support in the Framework
+ *
+ * @var bool
+ */
+define('Sihnon_DatabaseSupport', false);
+
 /**
  * Sihnon Database Configuration
  * 
- * Specifies the absolute or relative path to the Sihnon database configuration file. 
+ * Specifies the absolute or relative path to the Sihnon database configuration file, required when Database support is enabled.
  * This is a standard ini type file, containing the config required to connect to the database.
  * 
  * @var string
  */
-define('Sihnon_DBConfig', '../dbconfig.conf');
+define('Sihnon_DBConfig', '../private/dbconfig.conf');
 
 /**
- * Sihnon Log Table
+ * Sihnon Config Plugin
  * 
- * Specifies the name of the database table used to store log entries for this application.
+ * Specifies the plugin to use for configuration value storage.
+ * Options include:
+ *   - Database (Requires Database Support to be enabled, and the Sihnon_ConfigTable option set)
+ *   - FlatFile (Requires the Sihnon_ConfigFile option set)
  * 
  * @var string
  */
-define('Sihnon_Log_Table', 'logs');
+define('Sihnon_ConfigPlugin', 'FlatFile');
+
+/**
+ * Sihnon Config Table
+ *
+ * Specifies the name of the database table thats used for storing configuration values
+ * when the Database Config Plugin is used.
+ *
+ * @var string
+ */
+define('Sihnon_ConfigTable', 'settings');
+
+/**
+ * Sihnon Config File
+ *
+ * Specifies the name of the file used to store configuration values when the FlatFile Config Plugin is used
+ *
+ * @var string
+ */
+define('Sihnon_ConfigFile', '../private/settings.txt');
 
 ?>

source/lib/Sihnon/Config.class.php

@@ -33,22 +33,10 @@ class Sihnon_Config {
     const TYPE_STRING_LIST = 'array(string)';
     
     /**
-     * Contents of the dbconfig file 
+     * Backend to be used for this Config object
-     * @var string
+     * @var Sihnon_Config_IPlugin
      */
-    private $dbconfig;
+    private $backend;
-    
-    /**
-     * Database object created for the lifetime of this script
-     * @var Sihnon_Database
-     */
-    private $database;
-
-    /**
-     * Associative array of connection parameters for the database configuration
-     * @var array(string=>string)
-     */
-    private $databaseConfig = array();
 
     /**
      * Associative array of settings loaded from the database
@@ -59,56 +47,13 @@ class Sihnon_Config {
     /**
      * Constructs a new instance of the Config class
      *
-     * @param string $dbconfig Database configuration file contents
+     * @param string $backend Backend to use for storing and retrieving configuration items
+     * @param mixed $options Parameters to configure the Config backend
      * @return Sihnon_Config
      */
-    public function __construct($dbconfig) {
+    public function __construct($backend, $options) {
-        $this->dbconfig = $dbconfig;
+        $this->backend = Sihnon_Config_PluginFactory::create($backend, $options);
-        
+        $this->settings = $this->backend->preload();
-        $this->parseDatabaseConfig();
-    }
-
-    /**
-     * Parses the contents of the database configuration file so that individual settings can be retrieved.
-     *
-     */
-    public function parseDatabaseConfig() {
-        $this->databaseConfig = parse_ini_file($this->dbconfig);
-    }
-
-    /**
-     * Returns the value of the named item from the database configuration file
-     *
-     * @param string $key Name of the setting to retrieve
-     */
-    public function getDatabase($key) {
-        if (!isset($this->databaseConfig[$key])) {
-            throw new Sihnon_Exception_DatabaseConfigMissing($key);
-        }
-
-        return $this->databaseConfig[$key];
-    }
-
-    /**
-     * Sets the database instance used by this object
-     * 
-     * @param Sihnon_Database $database Database instance
-     */
-    public function setDatabase(Sihnon_Database $database) {
-        $this->database = $database;
-        $this->preload();
-    }
-
-    /**
-     * Loads the entire list of settings from the database
-     * 
-     */
-    private function preload() {
-        if (!$this->database) {
-            throw new Sihnon_Exception_NoDatabaseConnection();
-        }
-
-        $this->settings = $this->database->selectAssoc('SELECT name,type,value FROM settings', 'name', array('name', 'value', 'type'));
     }
 
     /**

source/lib/Sihnon/Config/IPlugin.class.php

@@ -0,0 +1,29 @@
+<?php
+
+interface Sihnon_Config_IPlugin extends Sihnon_IPlugin {
+    
+    /**
+     * Returns a new instance of the Plugin class
+     * 
+     * @param array(string=>mixed) $options Configuration options for the Plugin object
+     */
+    public static function create($options);
+    
+    /**
+     * Loads all the configuration items from the storage backend
+     * 
+     * @param string $source_filename Filename of the source
+     * @param bool $scan Request that the source be scanned for content. Defaults to true.
+     * @param bool $use_cache Request that the cache be used. Defaults to true.
+     * @return RippingCluster_Source
+     */
+    public function preload();
+    
+    /**
+     * Saves the value of all configuration items back into the storage backend
+     */
+    public function save();
+    
+}
+
+?>

source/lib/Sihnon/Config/Plugin/Database.class.php

@@ -0,0 +1,33 @@
+<?php
+
+class Sihnon_Config_Plugin_Database extends Sihnon_PluginBase implements Sihnon_Config_IPlugin {
+    
+    /**
+     * Name of this plugin
+     * @var string
+     */
+    const PLUGIN_NAME = "Database";
+    
+    private $database;
+    private $table;
+    
+    protected function __construct($options) {
+        $this->database = $options['database'];
+        $this->table    = $options['table'];
+    }
+    
+    public static function create($options) {
+        return new self($options);
+    }
+    
+    public function preload() {
+        return $this->database->selectAssoc("SELECT name,type,value FROM {$this->table}", 'name', array('name', 'value', 'type'));
+    }
+    
+    public function save() {
+        throw new Sihnon_Exception_NotImplemented();
+    }
+    
+}
+
+?>

source/lib/Sihnon/Config/Plugin/FlatFile.class.php

@@ -0,0 +1,31 @@
+<?php
+
+class Sihnon_Config_Plugin_FlatFile extends Sihnon_PluginBase implements Sihnon_Config_IPlugin {
+    
+    /**
+     * Name of this plugin
+     * @var string
+     */
+    const PLUGIN_NAME = "FlatFile";
+    
+    protected $filename;
+    
+    protected function __construct($options) {
+        $this->filename = $options['filename'];
+    }
+    
+    public static function create($options) {
+        return new self($options);
+    }
+    
+    public function preload() {
+        return parse_ini_file($this->filename, true);;
+    }
+    
+    public function save() {
+        throw new Sihnon_Exception_NotImplemented();
+    }
+    
+}
+
+?>

source/lib/Sihnon/Config/PluginFactory.class.php

@@ -0,0 +1,27 @@
+<?php
+
+class Sihnon_Config_PluginFactory extends Sihnon_PluginFactory {
+    
+    const PLUGIN_DIR       = 'Sihnon/Config/Plugin/';
+    const PLUGIN_PREFIX    = 'Sihnon_Config_Plugin_';
+    const PLUGIN_INTERFACE = 'Sihnon_Config_IPlugin';
+    
+    public static function init() {
+        
+    }
+    
+    public static function create($plugin, $options) {
+        self::ensureScanned();
+        
+        if (! self::isValidPlugin($plugin)) {
+            throw new Sihnon_Exception_InvalidPluginName($plugin);
+        }
+        
+        $classname = self::classname($plugin);
+        
+        return call_user_func(array($classname, 'create'), $options);
+    }
+    
+}
+
+?>

source/lib/Sihnon/Database.class.php

@@ -5,6 +5,12 @@ class Sihnon_Database {
     private $config;
     private $dbh;
 
+    /**
+     * Associative array of connection parameters for the database configuration
+     * @var array(string=>string)
+     */
+    private $database_config;
+    
     private $hostname;
     private $username;
     private $password;
@@ -12,13 +18,14 @@ class Sihnon_Database {
 
     private $prepared_statements = array();
 
-    public function __construct(Sihnon_Config $config) {
+    public function __construct($dbconfig) {
-        $this->config   = $config;
+        $this->database_cconfig = parse_ini_file($dbconfig);
+        var_dump($this->database_config);
         
-        $this->hostname = $this->config->getDatabase('hostname');
+        $this->hostname = $this->getDatabaseConfig('hostname');
-        $this->username = $this->config->getDatabase('username');
+        $this->username = $this->getDatabaseConfig('username');
-        $this->password = $this->config->getDatabase('password');
+        $this->password = $this->getDatabaseConfig('password');
-        $this->dbname   = $this->config->getDatabase('dbname');
+        $this->dbname   = $this->getDatabaseConfig('dbname');
 
         try {
             $this->dbh  = new PDO("mysql:host={$this->hostname};dbname={$this->dbname}", $this->username, $this->password);
@@ -32,6 +39,19 @@ class Sihnon_Database {
         $this->dbh = null;
     }
     
+    /**
+     * Returns the value of the named item from the database configuration file
+     *
+     * @param string $key Name of the setting to retrieve
+     */
+    private function getDatabaseConfig($key) {
+        if (!isset($this->database_config[$key])) {
+            throw new Sihnon_Exception_DatabaseConfigMissing($key);
+        }
+
+        return $this->database_config[$key];
+    }
+
     public function selectAssoc($sql, $key_col, $value_cols) {
         $results = array();
 

source/lib/Sihnon/Exceptions.class.php

@@ -2,6 +2,9 @@
 
 class Sihnon_Exception extends Exception {};
 
+class Sihnon_Exception_NotImplemented         extends Sihnon_Exception {};
+class Sihnon_Exception_MissingDefinition      extends Sihnon_Exception {};
+
 class Sihnon_Exception_DatabaseException      extends Sihnon_Exception {};
 class Sihnon_Exception_DatabaseConfigMissing  extends Sihnon_Exception_DatabaseException {};
 class Sihnon_Exception_DatabaseConnectFailed  extends Sihnon_Exception_DatabaseException {};

source/lib/Sihnon/Log.class.php

@@ -9,29 +9,22 @@ class Sihnon_Log {
 
     private static $hostname = '';
     
-    private $database;
+    private $backend;
-    private $config;
+    private $progname;
-    private $table;
     
-    public function __construct(Sihnon_Database $database, Sihnon_Config $config, $table) {
+    public function __construct($backend, $options = array(), $progname = '') {
-        $this->database = $database;
+        $this->progname = $progname;
-        $this->config = $config;
-        $this->table = $table;
         
+        $this->backend = Sihnon_Log_PluginFactory::create($backend, $options);
+        $this->log(self::LEVEL_INFO, "Logging started");
     }
     
-    public function log($severity, $message) {
+    public function __destruct() {
-        $this->database->insert("INSERT INTO {$this->table} (level,ctime,pid,hostname,progname,line,message) VALUES(:level, :ctime, :pid, :hostname, :progname, :line, :message)",
+        $this->log(self::LEVEL_INFO, "Logging shutdown");        
-            array(
+    }
-                array('name' => 'level', 'value' => $severity, 'type' => PDO::PARAM_STR),
+
-                array('name' => 'ctime', 'value' => time(), 'type' => PDO::PARAM_INT),
+    public function log($level, $message) {
-                array('name' => 'pid', 'value' => 0, 'type' => PDO::PARAM_INT),
+        $this->backend->log($level, time(), 0, self::$hostname, $this->progname, 0, $message);
-                array('name' => 'hostname', 'value' => self::$hostname, 'type' => PDO::PARAM_STR),
-                array('name' => 'progname', 'value' => 'webui', 'type' => PDO::PARAM_STR),
-                array('name' => 'line', 'value' => 0, 'type' => PDO::PARAM_INT),
-                array('name' => 'message', 'value' => $message, 'type' => PDO::PARAM_STR)
-            )
-        );        
     }
 
     public function debug($message) {

source/lib/Sihnon/Log/IPlugin.class.php

@@ -0,0 +1,27 @@
+<?php
+
+interface Sihnon_Log_IPlugin extends Sihnon_IPlugin {
+    
+    /**
+     * Returns a new instance of the Plugin class
+     * 
+     * @param array(string=>mixed) $options Configuration options for the Plugin object
+     */
+    public static function create($options);
+    
+
+    /**
+     * Records a new entry in the storage backend used by this logging plugin
+     * 
+     * @param string $level Severity of the log entry
+     * @param int $ctime Time the log entry was created
+     * @param int $pid ID of the process that created the log entry
+     * @param string $hostname Hostname of the system that created the log entry
+     * @param string $progname Name of the application that created the log entry
+     * @param int $line Line number of the code that created the log entry
+     * @param string $message Message to be logged
+     */
+    public function log($level, $ctime, $pid, $hostname, $progname, $line, $message);
+}
+
+?>

source/lib/Sihnon/Log/Plugin/Database.class.php

@@ -0,0 +1,49 @@
+<?php
+
+class Sihnon_Log_Plugin_Database extends Sihnon_PluginBase implements Sihnon_Log_IPlugin {
+    
+    /**
+     * Name of this plugin
+     * @var string
+     */
+    const PLUGIN_NAME = "Database";
+    
+    private $database;
+    private $table;
+    
+    protected function __construct($options) {
+        $this->database = $options['database'];
+        $this->table    = Sihnon_Main::instance()->config()->get('logging.database.table');
+    }
+    
+    public static function create($options) {
+        return new self($options);
+    }
+    
+    /**
+     * Records a new entry in the storage backend used by this logging plugin
+     * 
+     * @param string $level Severity of the log entry
+     * @param int $ctime Time the log entry was created
+     * @param int $pid ID of the process that created the log entry
+     * @param string $hostname Hostname of the system that created the log entry
+     * @param string $progname Name of the application that created the log entry
+     * @param int $line Line number of the code that created the log entry
+     * @param string $message Message to be logged
+     */
+    public function log($level, $ctime, $pid, $hostname, $progname, $line, $message) {
+        $this->database->insert("INSERT INTO {$this->table} (level,ctime,pid,hostname,progname,line,message) VALUES(:level, :ctime, :pid, :hostname, :progname, :line, :message)",
+            array(
+                array('name' => 'level', 'value' => $level, 'type' => PDO::PARAM_STR),
+                array('name' => 'ctime', 'value' => $ctime, 'type' => PDO::PARAM_INT),
+                array('name' => 'pid', 'value' => $pid, 'type' => PDO::PARAM_INT),
+                array('name' => 'hostname', 'value' => $hostname, 'type' => PDO::PARAM_STR),
+                array('name' => 'progname', 'value' => $progname, 'type' => PDO::PARAM_STR),
+                array('name' => 'line', 'value' => $line, 'type' => PDO::PARAM_INT),
+                array('name' => 'message', 'value' => $message, 'type' => PDO::PARAM_STR)
+            )
+        );
+    }    
+}
+
+?>

source/lib/Sihnon/Log/Plugin/FlatFile.class.php

@@ -0,0 +1,44 @@
+<?php
+
+class Sihnon_Log_Plugin_FlatFile extends Sihnon_PluginBase implements Sihnon_Log_IPlugin {
+    
+    /**
+     * Name of this plugin
+     * @var string
+     */
+    const PLUGIN_NAME = "FlatFile";
+    
+    protected $filename;
+    protected $fp;
+    
+    protected function __construct($options) {
+        $this->filename = Sihnon_Main::instance()->config()->get('logging.flatfile.filename');
+        $this->fp = fopen($this->filename, 'a');
+    }
+    
+    public function __destruct() {
+        fclose($this->fp);
+    }
+    
+    public static function create($options) {
+        return new self($options);
+    }
+    
+    /**
+     * Records a new entry in the storage backend used by this logging plugin
+     * 
+     * @param string $level Severity of the log entry
+     * @param int $ctime Time the log entry was created
+     * @param int $pid ID of the process that created the log entry
+     * @param string $hostname Hostname of the system that created the log entry
+     * @param string $progname Name of the application that created the log entry
+     * @param int $line Line number of the code that created the log entry
+     * @param string $message Message to be logged
+     */
+    public function log($level, $ctime, $pid, $hostname, $progname, $line, $message) {
+        $log_entry = implode(',', array($level, $ctime, $pid, $hostname, $progname, $line, $message)) . "\n";
+        fwrite($this->fp, $log_entry, strlen($log_entry));
+    }
+}
+
+?>

source/lib/Sihnon/Log/PluginFactory.class.php

@@ -0,0 +1,27 @@
+<?php
+
+class Sihnon_Log_PluginFactory extends Sihnon_PluginFactory {
+    
+    const PLUGIN_DIR       = 'Sihnon/Log/Plugin/';
+    const PLUGIN_PREFIX    = 'Sihnon_Log_Plugin_';
+    const PLUGIN_INTERFACE = 'Sihnon_Log_IPlugin';
+    
+    public static function init() {
+        
+    }
+    
+    public static function create($plugin, $options) {
+        self::ensureScanned();
+        
+        if (! self::isValidPlugin($plugin)) {
+            throw new Sihnon_Exception_InvalidPluginName($plugin);
+        }
+        
+        $classname = self::classname($plugin);
+        
+        return call_user_func(array($classname, 'create'), $options);
+    }
+    
+}
+
+?>

source/lib/Sihnon/Main.class.php

@@ -2,26 +2,37 @@
 
 class Sihnon_Main {
     
-    private static $instance;
+    protected static $instance;
 
-    private $config;
+    protected $config;
-    private $database;
+    protected $database;
-    private $log;
+    protected $log;
-    private $cache;
+    protected $cache;
     
-    private $base_uri;
+    protected $base_uri;
-
-    private function __construct() {
-        $this->config   = new Sihnon_Config(Sihnon_DBConfig);
-        $this->database = new Sihnon_Database($this->config);
-        $this->config->setDatabase($this->database);
-
-        $this->log      = new Sihnon_Log($this->database, $this->config, Sihnon_Log_Table);
-        $this->cache    = new Sihnon_Cache($this->config);
 
+    protected function __construct() {
         $this->base_uri = dirname($_SERVER['SCRIPT_NAME']) . '/';
     }
     
+    protected function init() {
+        if (Sihnon_DatabaseSupport) {
+            $this->database = new Sihnon_Database(Sihnon_DBConfig);
+        }
+
+        $this->config = new Sihnon_Config(Sihnon_ConfigPlugin, array(
+        	'database' => $this->database,
+        	'table' => Sihnon_ConfigTable, 
+        	'filename' => Sihnon_ConfigFile)
+        );
+        
+        $this->log    = new Sihnon_Log($this->config->get('logging.plugin'), array(
+        	'database' => $this->database)
+        );
+                
+        $this->cache  = new Sihnon_Cache($this->config);
+    }
+
     /**
      * 
      * @return Sihnon_Main
@@ -29,6 +40,7 @@ class Sihnon_Main {
     public static function instance() {
         if (!self::$instance) {
             self::$instance = new Sihnon_Main();
+            self::$instance->init();
         }
 
         return self::$instance;
@@ -111,6 +123,18 @@ class Sihnon_Main {
         }
     }
     
+    /**
+     * Throws an exception if the requested name has not been defined.
+     * 
+     * @param string $name Name of the definition to check for the existence of
+     * @throws Sihnon_Exception_MissingDefinition
+     */
+    public static function ensureDefined($name) {
+        if (! defined($name)) {
+            throw new Sihnon_Exception_MissingDefinition($name);
+        }
+    }
+    
     public static function mkdir_recursive($directory, $permissions=0777) {
         $parts = explode('/', $directory);
         $path = '';

source/lib/Sihnon/PluginFactory.class.php

@@ -4,6 +4,19 @@ abstract class Sihnon_PluginFactory implements Sihnon_IPluginFactory {
     
     static private $validPlugins = array();
     
+    /**
+     * Scan the plugin directory for potential plugins, and load any valid ones found
+     * 
+     * @param bool $force Rescan the plugin directory even if it has already been scanned before
+     */
+    public static function scan($force = false) {
+        if ($force || ! isset(self::$validPlugins[get_called_class()])) {
+            $candidatePlugins = static::findPlugins(static::PLUGIN_DIR);
+            
+            static::loadPlugins($candidatePlugins, static::PLUGIN_PREFIX, static::PLUGIN_INTERFACE);
+        }
+    }
+        
     protected static function ensureScanned() {
         if (! isset(self::$validPlugins[get_called_class()])) {
             static::scan();