Changeset 1136

Timestamp:

12/11/07 12:18:30 (9 months ago)

Author:

mikey

Message:

net::stubbles::websites::memphis::stubMemphisProcessor is now reference implementation for enhancement #116

Files:

• trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisProcessor.php (modified) (13 diffs)
• trunk/src/test/php/net/stubbles/websites/WebsitesTestSuite.php (modified) (1 diff)
• trunk/src/test/php/net/stubbles/websites/memphis/stubMemphisProcessorTestCase.php (modified) (4 diffs)

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

@@ -8 +8 @@
- */
-stubClassLoader::load('net.stubbles.ipo.request.stubRequestPrefixDecorator',
-                      'net.stubbles.ipo.response.stubBaseResponse',
-                      'net.stubbles.lang.stubMode',
-                      'net.stubbles.util.stubRegistry',
-                      'net.stubbles.util.validators.stubEqualValidator',
-                      'net.stubbles.util.validators.stubPreSelectValidator',
+                      'net.stubbles.websites.cache.stubCachableProcessor',
-                      'net.stubbles.websites.processors.stubAbstractProcessor',
-                      'net.stubbles.websites.memphis.stubMemphisConfig',
@@ -23 +23 @@
- * @subpackage  websites_memphis
- */
-
+ implements stubCachableProcessor
-{
-    /**
@@ -37 +37 @@
-     */
-    protected $config;
+    /**
+     * website cache to be used
+     *
+     * @var  stubWebsiteCache
+     */
+    protected $cache;
-
-    /**
@@ -51 +57 @@
-        parent::__construct($request, $session, $response, $pageFactory);
-        $this->config   = $this->createConfig();
-
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -72 +87 @@
-    protected function createTemplate()
-    {
- 
+
-        if (stubMode::$CURRENT->isCacheEnabled() === true) {
-            $template->enableCache();
@@ -85 +100 @@
-    protected function doProcess()
-    {
-
-
-
-
-
-
-
+
+
-        $elements      = $page->getElements();
-        $prefixRequest = new stubRequestPrefixDecorator($this->request, '');
-
-
-
-
+
+
-                         );
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        foreach ($this->config->getParts() as $part) {
-            $content         = '';
@@ -107 +207 @@
-            foreach ($this->config->getDefaultElements($part) as $defaultElement) {
-                $prefixRequest->setPrefix($defaultElement->getName());
-
+
+
+
+
+
+
-                if ($prefixRequest->isCancelled() === true) {
-                    return;
@@ -115 +220 @@
-            foreach ($elements as $name => $element) {
-                $prefixRequest->setPrefix($name);
-
+
+
+
+
+
+
-                if ($prefixRequest->isCancelled() === true) {
-                    return;
@@ -128 +238 @@
-
-    /**
-     * helper method to process a page element
-     *
-     * @param   stubPageElement  $element
-     * @param   array            $context
-     * @return  string
-     * @todo    better error handling
-     */
-    protected function processElement(stubPageElement $element, stubRequest $request, array $context)
-    {
-        $element->init($request, $this->session, $this->response, $context);
-        if ($element->isAvailable() === false) {
-            return '';
-        }
-                
-        try {
-            $content = $element->process();
-        } catch (Exception $e) {
-            $content = 'An error occurred: ' . $e->getMessage();
-        }
-         
-        return $content;
-    }
-
-    /**
-     * helper method to get the name of the frame to use
-     *
@@ -159 +245 @@
-    protected function getFrameId(stubPage $page)
-    {
-
+
+
+
+
+
-            $frame = $this->request->getValidatedValue(new stubPreSelectValidator(array_keys($this->config->getFrames())), 'frame');
-
+=
-            $frame = $this->session->getValue('net.stubbles.websites.memphis.frame');
-        } else {
@@ -178 +268 @@
-     *
-     * @param  stubPage  $page
-
-
-
-
+
+
+
+
+
+
-        $this->template->addGlobalVar('PAGE_TITLE', htmlentities($page->getProperty('title')));
-this->getPageName()
+pageName
-        $this->template->addGlobalVar('VARIANT', $this->session->getValue('net.stubbles.websites.variantmanager.variant', ''));
-        $this->template->addGlobalVar('SID', $this->session->getName() . '=' . $this->session->getId());
@@ -190 +282 @@
-        
-        // check for user data
-
+=
-            $this->template->addGlobalVars($this->session->getValue('_userData'), 'USER_');
-        }
@@ -200 +292 @@
-        
-        $sslMode = 'no';
-
+=
-            $sslMode = 'yes';
-        }

trunk/src/test/php/net/stubbles/websites/WebsitesTestSuite.php

@@ -34 +34 @@
-        $this->addTestFile($dir . '/memphis/stubMemphisIncludeFilePageElementTestCase.php');
-        $this->addTestFile($dir . '/memphis/stubMemphisPageElementTestCase.php');
-#
+
-
-        // processors tests

trunk/src/test/php/net/stubbles/websites/memphis/stubMemphisProcessorTestCase.php

@@ -1 +1 @@
-<?php
-/**
-.stubbles.websites.memphis.stubMemphisProcessor
+::stubbles::websites::memphis::stubMemphisProcessor.
- *
- * @author      Frank Kleine <mikey@stubbles.net>
@@ -13 +13 @@
-Mock::generate('stubPageElement');
-Mock::generate('stubPageFactory');
+Mock::generate('stubMemphisConfig');
+Mock::generate('stubMemphisTemplate');
+Mock::generate('stubWebsiteCache');
+Mock::generatePartial('stubMemphisProcessor',
+                      'PartialMockstubMemphisProcessor',
+                      array('createTemplate',
+                            'getPageName',
+                            'getPage',
+                            'getFrameId',
+                            'processCacheVars',
+                            'setTemplateVars',
+                            'processPageElements'
+                      )
+);
-/**
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- *
- * @package     stubbles
@@ -57 +267 @@
-     */
-    protected $mockPage;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /**
-     * set up test environment
@@ -63 +291 @@
-    public function setUp()
-    {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        $this->mockPage = new MockstubPage();
-        $this->mockPageFactory->setReturnValue('getPage', $this->mockPage);
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $this->mockRequest->setReturnValue('hasValue', false);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+