Changeset 807

Timestamp:

08/13/07 18:16:16 (1 year ago)

Author:

mikey

Message:

refactored net.stubbles.websites.memphis.stubMemphisConfig, added integration test

Files:

• trunk/config/xml/memphis.xml (modified) (1 diff)
• trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisConfig.php (modified) (5 diffs)
• trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisProcessor.php (modified) (2 diffs)
• trunk/src/main/resources/xjconf/websites.xml (modified) (4 diffs)
• trunk/src/test/php/net/stubbles/integration/MemphisConfigTestCase.php (added)
• trunk/src/test/runIntegration.php (modified) (1 diff)

trunk/config/xml/memphis.xml

@@ -36 +36 @@
-    </frames>
-    <metaTags>
-1und1.de, das Portal für Produkte rund um das Internet. DSL, Webhosting, Mobiles Internet, Server und vieles mehr..
-1&amp;1, Webhosting, Domain, Puretec, 0700, Shop, Shops, surfen, Internet-Zugang, Internet, E-Mail, Outlook, Messaging, billig, schnell, günstig, DSL, ADSL, Netzanschluss, Flatrate, Hardware, Modem, Voip, Video-on-Demand, 3DSL, DSL2+, Server, Sofort-Start, AmericaŽs Cup, United Internet Team Germany, Postfach, Speicherplatz, Pocket Web, Mobiles Internet, Pocket-Web, Telefon-Flat, Flat, 16.000, Highspeed-Netzanschluss, 1und1, 1+1, E-Shops, SharePoint, Outlook, Exchange, Schlund, Schlund+Partner, S+P, Highspeed-Download, Upstream, Downstream, Fastpath, Ping, Homepage, Platin Service, Wunschdomain, Domaincheck, Verfügbarkeitscheck
+This is a description
+keyword1, keyword2
-    </metaTags>
-  </config>

trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisConfig.php

@@ -14 +14 @@
- * @subpackage  websites_memphis
- */
-BaseObject
+XJConfAbstractInitializer
-{
-    /**
-     * holds the configuration data
-     *
-
+<string,mixed>
-     */
-    protected $config;
@@ -32 +32 @@
-    public function __construct($cachePath = null, $configPath = null)
-    {
-
-
-
+
+
-        if (isset($this->config['parts']) == false || count($this->config['parts']) == 0) {
-            throw new stubException('No parts configured.');
@@ -45 +44 @@
-
-    /**
+     * returns the descriptor that identifies the initializer
+     *
+     * @param   string  $type  type of descriptor: config or definition
+     * @return  string
+     */
+    public function getDescriptor($type)
+    {
+        return 'memphis';
+    }
+
+    /**
+     * returns the data to cache 
+     *
+     * @return  array
+     */
+    public function getCacheData()
+    {
+        $cacheData = array('classes' => array(), 'data' => serialize($this->config));
+        foreach ($this->config['parts'] as $part) {
+            if (isset($part['defaultElements']) == false) {
+                continue;
+            }
+            
+            foreach ($part['defaultElements'] as $defaultElement) {
+                $cacheData['classes'][] = $defaultElement->getClassName();
+                foreach ($defaultElement->getRequiredClassNames() as $requiredClassName) {
+                    $cacheData['classes'][] = $requiredClassName;
+                }
+            }
+            
+        }
+        
+        return $cacheData;
+    }
+
+    /**
+     * sets the data from the cache
+     *
+     * @param  array  $cacheData
+     */
+    public function setCacheData(array $cacheData)
+    {
+        foreach ($cacheData['classes'] as $class) {
+            stubClassLoader::load($class);
+        }
+            
+        $this->config = unserialize($cacheData['data']);
+    }
+
+    /**
+     * returns definitions that are additionally required beyond the default definition
+     *
+     * @return  array<string>
+     */
+    public function getAdditionalDefinitions()
+    {
+        return array('xjconf/websites.xml');
+    }
+
+    /**
+     * will be called in case the stubXJConfProxy did not found the data in the
+     * cache and the initializer has to load values from the facade
+     *
+     * @param  stubXJConfFacade  $xjconf
+     */
+    public function loadData(stubXJConfFacade $xjconf)
+    {
+        $this->config = $xjconf->getConfigValue('config');
+    }
+
+    /**
-     * returns the list of parts
-     *
@@ -51 +121 @@
-    public function getParts()
-    {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -86 +171 @@
-        return array();
-    }
-
-    /**
-     * returns the configuration
-     *
-     * @return  array
-     * @throws  stubException
-     */
-    protected function getConfig($configPath, $cachePath)
-    {
-        $cacheSource  = $cachePath . 'memphis.cache';
-        $configSource = $configPath . 'memphis.xml';
-        if (file_exists($cacheSource) && filemtime($cacheSource) >= filemtime($configSource)) {
-            $cacheData = unserialize(file_get_contents($cacheSource));
-            foreach ($cacheData['classes'] as $class) {
-                stubClassLoader::load($class);
-            }
-            
-            $config = unserialize($cacheData['data']);
-            return $config;
-        }
-        
-        $config    = $this->getFromXJConf($configSource);
-        $cacheData = array('classes' => array(), 'data' => serialize($config));
-        foreach ($config['parts'] as $part) {
-            if (isset($part['defaultElements']) == false) {
-                continue;
-            }
-            
-            foreach ($part['defaultElements'] as $defaultElement) {
-                $cacheData['classes'][] = $defaultElement->getClassName();
-                foreach ($defaultElement->getRequiredClassNames() as $requiredClassName) {
-                    $cacheData['classes'][] = $requiredClassName;
-                }
-            }
-            
-        }
-        
-        if (file_exists(dirname($cacheSource)) == false) {
-            mkdir(dirname($cacheSource), 0700, true);
-        }
-        
-        file_put_contents($cacheSource, serialize($cacheData));
-        return $config;
-    }
-
-    /**
-     * returns the configured stubPage instance
-     *
-     * @param   string    $configSource   source of the page configuration to use
-     * @return  array
-     * @throws  stubException
-     */
-    protected function getFromXJConf($configSource)
-    {
-        stubClassLoader::load('net.stubbles.util.stubFactory',
-                              'net.stubbles.util.xjconf.xjconfReal'
-        );
-        $xjconf = new stubXJConfFacade(new XJConfFacade(array('__default' => stubXJConfLoader::getInstance())));
-        $xjconf->addDefinitions(stubFactory::getResourceURIs('xjconf/websites.xml'));
-        $xjconf->addDefinitions(stubFactory::getResourceURIs('xjconf/memphis.xml'));
-        $xjconf->addExtension(new stubConfigXJConfExtension());
-
-        try {
-            $xjconf->parse($configSource);
-            return $xjconf->getConfigValue('config');
-        } catch (stubXJConfException $xjce) {
-            throw new stubException('Can not read configuration from ' . $configSource, $xjce);
-        }
-    }
-}
-?>

trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisProcessor.php

@@ -46 +46 @@
-    {
-        parent::__construct($request, $session, $response, $pageFactory);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -66 +86 @@
-        $content       = array();
-        $context       = array('part' => null,
-
+
+
-                         );
-        
-        $this->template->readTemplatesFromFile($this->config->getFrame($this->getFrameId($page)));
-        $this->setTemplateVars($page);
-
-
+
-            $content         = '';
-            $context['part'] = $part;
-
-
-
-
-
+
+
+
-            }
-            

trunk/src/main/resources/xjconf/websites.xml

@@ -12 +12 @@
-    <tag name="property" type="string" keyAttribute="name" />
-    
-
+ key="__none"
-      <attribute name="name" type="string" />
-    </abstractTag>
-    
-    <!-- Memphis -->
-
+ key="__none"
-      <attribute name="parts" type="string" />
-    </abstractTag>
-    
-
+ key="__none"
-      <attribute name="source" type="string" />
-    </tag>
-    
-
+ key="__none"
-      <attribute name="source" type="string" />
-    </tag>
-    
-
+ key="__none"
-      <attribute name="extension" type="string" />
-    </tag-->
@@ -39 +39 @@
-    
-    <!-- XML/XSL -->
-
+key="__none" 
-
-
+ key="__none"
-      <attribute name="directory" type="string"/>
-      <attribute name="fileName" type="string"/>
@@ -47 +47 @@
-    
-    <!-- Decorators -->
-
+ key="__none"
-      <constructor>
-        <child name="xmlElement"/>
@@ -53 +53 @@
-    </abstractTag>
-
-
+ key="__none"
-      <attribute name="lifetime" type="int"/>
-    </tag>

trunk/src/test/runIntegration.php

@@ -36 +36 @@
-        $testSuite->addTestFile(TEST_SRC_PATH . '/php/net/stubbles/integration/InterceptorTestCase.php');
-        $testSuite->addTestFile(TEST_SRC_PATH . '/php/net/stubbles/integration/LoggerTestCase.php');
+        $testSuite->addTestFile(TEST_SRC_PATH . '/php/net/stubbles/integration/MemphisConfigTestCase.php');
-        $testSuite->addTestFile(TEST_SRC_PATH . '/php/net/stubbles/integration/ProcessorTestCase.php');
-        $testSuite->addTestFile(TEST_SRC_PATH . '/php/net/stubbles/integration/RegistryTestCase.php');