Changeset 1166

Timestamp:

12/20/07 11:17:29 (8 months ago)

Author:

richi

Message:

enhancement #115: [part II] added template driven generation of service url and added also the class stubRegexFilterDecorator

Files:

• trunk/src/main/php/net/stubbles/ipo/request/filters/stubAbstractFilterDecorator.php (added)
• trunk/src/main/php/net/stubbles/ipo/request/filters/stubRegexFilterDecorator.php (added)
• trunk/src/main/php/net/stubbles/ipo/request/filters/stubSimpleStringFilter.php (added)
• trunk/src/main/php/net/stubbles/ipo/request/filters/stubStringFilter.php (modified) (2 diffs)
• trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisProcessor.php (modified) (15 diffs)
• trunk/src/test/php/net/stubbles/ipo/IPOTestSuite.php (modified) (1 diff)
• trunk/src/test/php/net/stubbles/ipo/request/filters/stubRegexFilterDecoratorTestCase.php (added)
• trunk/src/test/php/net/stubbles/ipo/request/filters/stubStringFilterTestCase.php (modified) (2 diffs)
• trunk/src/test/php/net/stubbles/websites/memphis/stubMemphisProcessorTestCase.php (modified) (2 diffs)

trunk/src/main/php/net/stubbles/ipo/request/filters/stubStringFilter.php

@@ -8 +8 @@
- */
-stubClassLoader::load('net.stubbles.ipo.request.filters.stubAbstractStringFilter');
+stubClassLoader::load('net.stubbles.ipo.request.filters.stubSimpleStringFilter');
-/**
- * Class for filtering strings (singe line).
@@ -59 +60 @@
-    {
-        if (null != $value) {
-
-
-
+
+
-
-            if ($this->regex->validate($value) == false) {

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

@@ -8 +8 @@
- */
-stubClassLoader::load('net.stubbles.ipo.request.stubRequestPrefixDecorator',
+                      'net.stubbles.ipo.request.stubRequestValueErrorXJConfFactory',
+                      'net.stubbles.ipo.request.filters.stubSimpleStringFilter',
+                      'net.stubbles.ipo.request.filters.stubRegexFilterDecorator',
-                      'net.stubbles.lang.stubMode',
-                      'net.stubbles.util.stubRegistry',
@@ -91 +94 @@
-            $template->enableCache();
-        }
-
+
-        return $template;
-    }
@@ -114 +117 @@
-            }
-        }
-
+
-        $this->template      = $this->createTemplate();
-        $context['template'] = $this->template;
@@ -124 +127 @@
-                $this->cache->store($this->request, $this->response, $pageName);
-            }
-
+
-            $contents = str_replace('$SID', $this->session->getName() . '=' . $this->session->getId(), $this->response->getData());
-            $contents = str_replace('$SESSION_NAME', $this->session->getName(), $contents);
@@ -150 +153 @@
-            $sslMode = 'yes';
-        }
-
+
-        $this->cache->addCacheVar('ssl', $sslMode);
-        foreach ($this->config->getParts() as $part) {
@@ -162 +165 @@
-                    return false;
-                }
-
+
-                $this->cache->addCacheVars($defaultElement->getCacheVars());
-                $this->cache->addUsedFiles($defaultElement->getUsedFiles());
-            }
-
+
-            foreach ($elements as $name => $element) {
-                $prefixRequest->setPrefix($name);
@@ -175 +178 @@
-                    return false;
-                }
-
+
-                $this->cache->addCacheVars($element->getCacheVars());
-                $this->cache->addUsedFiles($element->getUsedFiles());
-            }
-        }
-
+
-        return true;
-    }
@@ -202 +205 @@
-                    continue;
-                }
-
+
-                $content .= $defaultElement->process();
-                if ($prefixRequest->isCancelled() === true) {
@@ -208 +211 @@
-                }
-            }
-
+
-            foreach ($elements as $name => $element) {
-                $prefixRequest->setPrefix($name);
@@ -215 +218 @@
-                    continue;
-                }
-
+
-                $content .= $element->process();
-                if ($prefixRequest->isCancelled() === true) {
@@ -221 +224 @@
-                }
-            }
-
+
-            $this->template->addGlobalVar($part, $content);
-        }
-
+
-        $this->response->write($this->template->getParsedTemplate('frame'));
-    }
@@ -247 +250 @@
-            $frame = $page->getProperty('frame');
-        }
-
+
-        if (null == $frame) {
-            return 'default';
-        }
-
+
-        return $frame;
-    }
@@ -268 +271 @@
-        $this->template->addGlobalVar('PAGE_NAME', $pageName);
-        $this->template->addGlobalVar('VARIANT', $this->session->getValue('net.stubbles.websites.variantmanager.variant', ''));
+
+        $rve            = new stubRequestValueErrorXJConfFactory();
+        $ssFilter       = new stubSimpleStringFilter($rve);
+        $uriRegex       = '/\/.*(?=\?)|\/.*/';
+        $regexDecorator = new stubRegexFilterDecorator($ssFilter, $uriRegex, stubRegexFilterDecorator::STRATEGY_AFTER);
+
+        $requestUri = $this->request->getFilteredValue($regexDecorator, 'REQUEST_URI', stubRequest::SOURCE_HEADER);
+        $serviceUrl = $requestUri . '?processor=jsonrpc';
+        $this->template->addGlobalVar('SERVICE_URL', $serviceUrl);
+
-        if (null === $this->cache) {
-            $this->template->addGlobalVar('SID', $this->session->getName() . '=' . $this->session->getId());
@@ -277 +290 @@
-            $this->template->addGlobalVar('SESSION_ID', '$SESSION_ID');
-        }
-
+
-        // check for user data
-        if ($this->session->hasValue('_userData') === true) {
@@ -287 +300 @@
-            $this->template->addVar('frame', 'META_' . $key, htmlentities($value));
-        }
-
+
-        $sslMode = 'no';
-        if ($this->request->validateValue(new stubEqualValidator(443), 'SERVER_PORT', stubRequest::SOURCE_HEADER) === true) {
-            $sslMode = 'yes';
-        }
-
+
-        $this->template->addGlobalVar('SSL_MODE', $sslMode);
-    }

trunk/src/test/php/net/stubbles/ipo/IPOTestSuite.php

@@ -46 +46 @@
-        $this->addTestFile($dir . '/request/filters/stubPassThruFilterTestCase.php');
-        $this->addTestFile($dir . '/request/filters/stubPasswordFilterTestCase.php');
+        $this->addTestFile($dir . '/request/filters/stubRegexFilterDecoratorTestCase.php');
-        $this->addTestFile($dir . '/request/filters/stubStringFilterTestCase.php');
-        $this->addTestFile($dir . '/request/filters/stubTextFilterTestCase.php');

trunk/src/test/php/net/stubbles/ipo/request/filters/stubStringFilterTestCase.php

@@ -2 +2 @@
-/**
- * Tests for ipo.request.filters.stubStringFilter
+ *         & ipo.request.filters.stubSimpleStringFilter
- *
- * @author      Frank Kleine <frank@kl-s.com>
@@ -13 +14 @@
-/**
- * Tests for ipo.request.filters.stubStringFilter
+ *         & ipo.request.filters.stubSimpleStringFilter
- *
- * @package     stubbles

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

@@ -747 +747 @@
-        $this->mockMemphisTemplate->expectAt(2, 'addGlobalVar', array('PAGE_NAME', 'baz'));
-        $this->mockMemphisTemplate->expectAt(3, 'addGlobalVar', array('VARIANT', null));
-
-
-
-
+
+
+
+
+
-        $this->mockMemphisTemplate->expectAt(0, 'addVar', array('frame', 'META_description', 'This is a description.'));
-        $this->mockMemphisTemplate->expectAt(1, 'addVar', array('frame', 'META_keywords', 'keyword1, keyword2'));
@@ -775 +776 @@
-        $this->mockMemphisTemplate->expectAt(2, 'addGlobalVar', array('PAGE_NAME', 'baz'));
-        $this->mockMemphisTemplate->expectAt(3, 'addGlobalVar', array('VARIANT', 'variant'));
-
-
-
-
+
+
+
+
+
-        $this->mockMemphisTemplate->expectNever('addVar');
-        $this->mockMemphisTemplate->expectOnce('addGlobalVars', array(array('name' => 'mikey'), 'USER_'));