Changeset 1140

Timestamp:

12/13/07 15:38:37 (1 year ago)

Author:

mikey

Message:

added possibility to deny caching for a page element (part of enhancement #116)
(makes more then 4000 tests now...)

Files:

• trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisAbstractExtension.php (modified) (1 diff)
• trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisExtension.php (modified) (1 diff)
• trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisLoadExtensionPageElement.php (modified) (1 diff)
• trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisProcessor.php (modified) (6 diffs)
• trunk/src/main/php/net/stubbles/websites/stubAbstractPageElement.php (modified) (1 diff)
• trunk/src/main/php/net/stubbles/websites/stubPageElement.php (modified) (1 diff)
• trunk/src/main/php/net/stubbles/websites/xml/stubXMLPageElementDecorator.php (modified) (1 diff)
• trunk/src/test/php/net/stubbles/websites/memphis/stubMemphisProcessorTestCase.php (modified) (9 diffs)

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

@@ -69 +69 @@
-
-    /**
+     * checks whether extension is cachable or not
+     *
+     * @return  bool
+     */
+    public function isCachable()
+    {
+        return true;
+    }
+
+    /**
-     * returns a list of variables that have an influence on caching
-     *

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

@@ -36 +36 @@
-
-    /**
+     * checks whether extension is cachable or not
+     *
+     * @return  bool
+     */
+    public function isCachable();
+
+    /**
-     * returns a list of variables that have an influence on caching
-     *

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

@@ -85 +85 @@
-
-    /**
+     * checks whether page element is cachable or not
+     *
+     * @return  bool
+     */
+    public function isCachable()
+    {
+        return $this->extension->isCachable();
+    }
+
+    /**
-     * returns a list of variables that have an influence on caching
-     *

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

@@ -109 +109 @@
-        $frameId       = $this->getFrameId($page);
-        if (null !== $this->cache) {
-
-
+cachable = $
+true === $cachable && 
-                return;
-            }
@@ -121 +121 @@
-        $this->processPageElements($prefixRequest, $elements, $context);
-        if (null !== $this->cache) {
-
+
+
+
+
-            $contents = str_replace('$SID', $this->session->getName() . '=' . $this->session->getId(), $this->response->getData());
-            $contents = str_replace('$SESSION_NAME', $this->session->getName(), $contents);
@@ -159 +162 @@
-     * helper method to set the cache variables
-     *
-
-
-
-
-
+
+
+
+
+
+
-     */
-    protected function processCacheVars(stubRequest $prefixRequest, array $elements, $pageName, $frameId, array $context)
@@ -183 +187 @@
-                if ($defaultElement->isAvailable() === false) {
-                    continue;
+                } elseif ($defaultElement->isCachable() === false) {
+                    return false;
-                }
-                
@@ -194 +200 @@
-                if ($element->isAvailable() === false) {
-                    continue;
+                } elseif ($element->isCachable() === false) {
+                    return false;
-                }
-                
@@ -200 +208 @@
-            }
-        }
+        
+        return true;
-    }
-

trunk/src/main/php/net/stubbles/websites/stubAbstractPageElement.php

@@ -104 +104 @@
-
-    /**
+     * checks whether page element is cachable or not
+     *
+     * @return  bool
+     */
+    public function isCachable()
+    {
+        return true;
+    }
+
+    /**
-     * returns a list of variables that have an influence on caching
-     *

trunk/src/main/php/net/stubbles/websites/stubPageElement.php

@@ -59 +59 @@
-
-    /**
+     * checks whether page element is cachable or not
+     *
+     * @return  bool
+     */
+    public function isCachable();
+
+    /**
-     * returns a list of variables that have an influence on caching
-     *

trunk/src/main/php/net/stubbles/websites/xml/stubXMLPageElementDecorator.php

@@ -115 +115 @@
-
-    /**
+     * checks whether page element is cachable or not
+     *
+     * @return  bool
+     */
+    public function isCachable()
+    {
+        return $this->element->isCachable();
+    }
+
+    /**
-     * returns a list of variables that have an influence on caching
-     *

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

@@ -132 +132 @@
-     * helper method to access protected method processCacheVars()
-     *
-
-
-
-
-
+
+
+
+
+
+
-     */
-    public function callProcessCacheVars(stubRequest $prefixRequest, array $elements, $pageName, $frameId, array $context)
-    {
-
+return 
-    }
-
@@ -351 +352 @@
-        $this->mockPage->setReturnValue('getElements', array('baz' => $mockPageElement));
-        $memphisProcessor->expectOnce('processCacheVars', array('*', array('baz' => $mockPageElement), 'foo', 'bar', '*'));
+        $memphisProcessor->setReturnValue('processCacheVars', true);
-        $this->mockMemphisConfig->expectOnce('getFrame', array('bar'));
-        $this->mockMemphisConfig->setReturnValue('getFrame', 'frame/default.tmpl');
@@ -372 +374 @@
-     * test the processing algorithm using a cache
-     */
+    public function testDoProcessWithCacheButUncachableElement()
+    {
+        $memphisProcessor = new TestPartialMockstubMemphisProcessor($this->mockRequest, $this->mockSession, $this->mockResponse, $this->mockPageFactory);
+        $memphisProcessor->setConfig($this->mockMemphisConfig);
+        $memphisProcessor->setReturnValue('createTemplate', $this->mockMemphisTemplate);
+        $memphisProcessor->setReturnValue('getPageName', 'foo');
+        $memphisProcessor->setReturnValue('getFrameId', 'bar');
+        $memphisProcessor->setReturnValue('getPage', $this->mockPage);
+        $mockPageElement = new MockstubPageElement();
+        $this->mockPage->setReturnValue('getElements', array('baz' => $mockPageElement));
+        $memphisProcessor->expectOnce('processCacheVars', array('*', array('baz' => $mockPageElement), 'foo', 'bar', '*'));
+        $memphisProcessor->setReturnValue('processCacheVars', false);
+        $this->mockMemphisConfig->expectOnce('getFrame', array('bar'));
+        $this->mockMemphisConfig->setReturnValue('getFrame', 'frame/default.tmpl');
+        $this->mockMemphisTemplate->expectOnce('readTemplatesFromInput', array('frame/default.tmpl'));
+        $memphisProcessor->expectOnce('setTemplateVars', array('*', 'foo', 'bar'));
+        $memphisProcessor->expectOnce('processPageElements', array('*', array('baz' => $mockPageElement), '*'));
+        $mockCache = new MockstubWebsiteCache();
+        $mockCache->expectNever('retrieve');
+        $mockCache->expectNever('store');
+        $memphisProcessor->setWebsiteCache($mockCache);
+        $this->mockResponse->expectOnce('getData');
+        $this->mockResponse->setReturnValue('getData', '$SID$SESSION_NAME$SESSION_ID');
+        $this->mockSession->setReturnValue('getId', 'id');
+        $this->mockSession->setReturnValue('getName', 'name');
+        $this->mockResponse->expectOnce('replaceData', array('name=idnameid'));
+        $memphisProcessor->callDoProcess();
+    }
+
+    /**
+     * test the processing algorithm using a cache
+     */
-    public function testDoProcessWithCacheAndCached()
-    {
@@ -383 +417 @@
-        $this->mockPage->setReturnValue('getElements', array('baz' => $mockPageElement));
-        $memphisProcessor->expectOnce('processCacheVars', array('*', array('baz' => $mockPageElement), 'foo', 'bar', '*'));
+        $memphisProcessor->setReturnValue('processCacheVars', true);
-        $this->mockMemphisConfig->expectNever('getFrame');
-        $this->mockMemphisTemplate->expectNever('readTemplatesFromInput');
@@ -445 +480 @@
-        $mockDefaultPageElement1->expectAt(1, 'init', array($prefixRequest, $this->mockSession, $this->mockResponse, array('part' => 'teaser')));
-        $mockDefaultPageElement1->setReturnValue('isAvailable', false);
+        $mockDefaultPageElement1->expectNever('isCachable');
-        $mockDefaultPageElement1->expectNever('getCacheVars');
-        $mockDefaultPageElement1->expectNever('getUsedFiles');
@@ -453 +489 @@
-        $mockDefaultPageElement2->expectAt(1, 'init', array($prefixRequest, $this->mockSession, $this->mockResponse, array('part' => 'teaser')));
-        $mockDefaultPageElement2->setReturnValue('isAvailable', true);
+        $mockDefaultPageElement2->setReturnValue('isCachable', true);
-        $mockDefaultPageElement2->expectCallCount('getCacheVars', 2);
-        $mockDefaultPageElement2->setReturnValue('getCacheVars', array('one' => 'defaultMock2'));
@@ -464 +501 @@
-        $mockPageElement1->expectAt(1, 'init', array($prefixRequest, $this->mockSession, $this->mockResponse, array('part' => 'teaser')));
-        $mockPageElement1->setReturnValue('isAvailable', false);
+        $mockPageElement1->expectNever('isCachable');
-        $mockPageElement1->expectNever('getCacheVars');
-        $mockPageElement1->expectNever('getUsedFiles');
@@ -472 +510 @@
-        $mockPageElement2->expectAt(1, 'init', array($prefixRequest, $this->mockSession, $this->mockResponse, array('part' => 'teaser')));
-        $mockPageElement2->setReturnValue('isAvailable', true);
+        $mockPageElement2->setReturnValue('isCachable', true);
-        $mockPageElement2->expectCallCount('getCacheVars', 2);
-        $mockPageElement2->setReturnValue('getCacheVars', array('two' => 'Mock2'));
@@ -493 +532 @@
-        $mockCache->expectCallcount('addUsedFiles', 4);
-        $this->memphisProcessor->setWebsiteCache($mockCache);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-