Changeset 537

Timestamp:

2008年10月04日 16時15分43秒 (2 months ago)

Author:

iteman

Message:

- Refactored.

Location:

trunk

Files:

• src/Piece/ORM/Config/Reader.php (moved) (moved from trunk/src/Piece/ORM/Config/ConfigFactory.php) (8 diffs)
• tests/Piece/ORM/Config/ReaderTest (moved) (moved from trunk/tests/Piece/ORM/Config/ConfigFactoryTest)
• tests/Piece/ORM/Config/ReaderTest.php (moved) (moved from trunk/tests/Piece/ORM/Config/ConfigFactoryTest.php) (8 diffs)

trunk/src/Piece/ORM/Config/Reader.php

@@ -45 +45 @@
 require_once 'spyc.php5';
 
-// {{{ Piece::ORM::Config::ConfigFactory
+// {{{ Piece::ORM::Config::Reader
 
 /**
@@ -56 +56 @@
  * @since      Class available since Release 0.1.0
  */
-class ConfigFactory
+class Reader
 {
 
@@ -77 +77 @@
      */
 
+    private $_configDirectory;
+
     /**#@-*/
 
@@ -84 +86 @@
 
     // }}}
-    // {{{ factory()
+    // {{{ __construct()
+
+    /**
+     * @param string $configDirectory
+     */
+    public function __construct($configDirectory = null)
+    {
+        $this->_configDirectory = $configDirectory;
+    }
+
+    // }}}
+    // {{{ read()
 
     /**
      * Creates a Piece::ORM::Config object from a configuration file or a cache.
      *
-     * @param string $configDirectory
      * @return Piece::ORM::Config
      * @throws Piece::ORM::Exception
      */
-    public static function factory($configDirectory = null)
-    {
-        if (is_null($configDirectory)) {
+    public function read()
+    {
+        if (is_null($this->_configDirectory)) {
             return new Config();
         }
 
-        if (!file_exists($configDirectory)) {
-            throw new Exception("The configuration directory [ $configDirectory ] is not found.");
-        }
-
-        $dslFile = "$configDirectory/piece-orm-config.yaml";
+        if (!file_exists($this->_configDirectory)) {
+            throw new Exception("The configuration directory [ {$this->_configDirectory} ] is not found.");
+        }
+
+        $dslFile = "{$this->_configDirectory}/piece-orm-config.yaml";
         if (!file_exists($dslFile)) {
             throw new Exception("The configuration file [ $dslFile ] is not found.");
@@ -113 +125 @@
 
         if (is_null(Registry::getContext()->getCacheDirectory())) {
-            return self::_createConfigurationFromFile($dslFile);
+            return $this->_createConfigurationFromFile($dslFile);
         }
 
@@ -122 +134 @@
                           E_USER_WARNING
                           );
-            return self::_createConfigurationFromFile($dslFile);
+            return $this->_createConfigurationFromFile($dslFile);
         }
 
@@ -132 +144 @@
                           E_USER_WARNING
                           );
-            return self::_createConfigurationFromFile($dslFile);
-        }
-
-        return self::_getConfiguration($dslFile);
+            return $this->_createConfigurationFromFile($dslFile);
+        }
+
+        return $this->_getConfiguration($dslFile);
     }
 
@@ -183 +195 @@
                           E_USER_WARNING
                           );
-            return self::_createConfigurationFromFile($dslFile);
+            return $this->_createConfigurationFromFile($dslFile);
         }
 
         if (!$config) {
-            $config = self::_createConfigurationFromFile($dslFile);
+            $config = $this->_createConfigurationFromFile($dslFile);
             $result = $cache->save($config);
             if (::PEAR::isError($result)) {

trunk/tests/Piece/ORM/Config/ReaderTest.php

@@ -38 +38 @@
 namespace Piece::ORM::Config;
 
-use Piece::ORM::Config::ConfigFactory;
+use Piece::ORM::Config::Reader;
 use Piece::ORM::Context;
 use Piece::ORM::Context::Registry;
@@ -44 +44 @@
 require_once 'spyc.php5';
 
-// {{{ Piece::ORM::Config::ConfigFactoryTest
+// {{{ Piece::ORM::Config::ReaderTest
 
 /**
- * Some tests for Piece::ORM::Config::ConfigFactory.
+ * Some tests for Piece::ORM::Config::Reader.
  *
  * @package    Piece_ORM
@@ -55 +55 @@
  * @since      Class available since Release 0.1.0
  */
-class ConfigFactoryTest extends ::PHPUnit_Framework_TestCase
+class ReaderTest extends ::PHPUnit_Framework_TestCase
 {
 
@@ -102 +102 @@
     public function testShouldCreateAnObjectWithoutConfigurationFile()
     {
-        $this->assertType('Piece::ORM::Config', ConfigFactory::factory());
+        $reader = new Reader();
+
+        $this->assertType('Piece::ORM::Config', $reader->read());
     }
 
@@ -110 +112 @@
     public function testShouldRaiseAnExceptionWhenAGivenConfigurationDirectoryIsNotFound()
     {
-        ConfigFactory::factory(dirname(__FILE__) . '/foo', $this->_cacheDirectory);
+        $reader = new Reader(dirname(__FILE__) . '/foo');
+        $reader->read();
     }
 
@@ -118 +121 @@
     public function testShouldRaiseAnExceptionWhenAGivenConfigurationFileIsNotFound()
     {
-        ConfigFactory::factory(dirname(__FILE__), $this->_cacheDirectory);
+        $reader = new Reader(dirname(__FILE__));
+        $reader->read();
     }
 
     public function testShouldCreateAnObjectEvenThoughAGivenCacheDirectoryIsNotFound()
     {
-        $this->assertType('Piece::ORM::Config',
-                          @ConfigFactory::factory($this->_cacheDirectory,
-                                                  dirname(__FILE__) . '/foo')
-                          );
+        $reader = new Reader($this->_cacheDirectory);
+
+        $this->assertType('Piece::ORM::Config', $reader->read());
     }
 
@@ -132 +135 @@
     {
         $dsl = ::Spyc::YAMLLoad("{$this->_cacheDirectory}/piece-orm-config.yaml");
-        $config = ConfigFactory::factory($this->_cacheDirectory, $this->_cacheDirectory);
+        $reader = new Reader($this->_cacheDirectory);
+        $config = $reader->read();
 
         $this->assertEquals(2, count($dsl['databases']));
@@ -151 +155 @@
         $oldDirectory = getcwd();
         chdir("{$this->_cacheDirectory}/CacheIDsShouldBeUniqueInOneCacheDirectory1");
-        ConfigFactory::factory('.', $this->_cacheDirectory);
+        $reader = new Reader('.');
+        $reader->read();
 
         $this->assertEquals(1, $this->_getCacheFileCount($this->_cacheDirectory));
 
         chdir("{$this->_cacheDirectory}/CacheIDsShouldBeUniqueInOneCacheDirectory2");
-        ConfigFactory::factory('.', $this->_cacheDirectory);
+        $reader = new Reader('.');
+        $reader->read();
 
         $this->assertEquals(2, $this->_getCacheFileCount($this->_cacheDirectory));