Changeset 1355

Timestamp:

02/22/08 12:11:41 (7 months ago)

Author:

mikey

Message:

addes support for variants in xml/xsl view engine

Files:

• trunk/build/stubbles/MasterXslStarFile.php (modified) (1 diff)
• trunk/examples/config/xml/interceptors-xml.xml (modified) (1 diff)
• trunk/examples/config/xml/variantmanager.xml (modified) (1 diff)
• trunk/examples/pages/conf/variants.xml (added)
• trunk/examples/pages/txt/main_variants.xml (added)
• trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisProcessor.php (modified) (2 diffs)
• trunk/src/main/php/net/stubbles/websites/variantmanager/stubVariantsPreInterceptor.php (modified) (2 diffs)
• trunk/src/main/php/net/stubbles/websites/xml/stubXMLProcessor.php (modified) (1 diff)
• trunk/src/main/resources/xsl/master.xsl (modified) (1 diff)
• trunk/src/main/resources/xsl/variant.xsl (added)
• trunk/src/test/php/net/stubbles/websites/memphis/stubMemphisProcessorTestCase.php (modified) (2 diffs)
• trunk/src/test/php/net/stubbles/websites/variantmanager/stubVariantsPreInterceptorProcessTestCase.php (modified) (3 diffs)
• trunk/src/test/php/net/stubbles/websites/xml/stubXMLProcessorTestCase.php (modified) (2 diffs)

trunk/build/stubbles/MasterXslStarFile.php

@@ -102 +102 @@
-        $contents = str_replace('<xsl:import href="copy.xsl"/>', '<xsl:import href="?xsl/copy.xsl"/>', $contents);
-        $contents = str_replace('<xsl:import href="stub.xsl"/>', '<xsl:import href="?xsl/stub.xsl"/>', $contents);
+        $contents = str_replace('<xsl:import href="variant.xsl"/>', '<xsl:import href="?xsl/variant.xsl"/>', $contents);
-        return $contents;
-    }

trunk/examples/config/xml/interceptors-xml.xml

@@ -7 +7 @@
-    <preInterceptor type="net::stubbles::ioc::stubIOCPreInterceptor" />
-    <preInterceptor type="net::stubbles::ipo::session::resourcemanager::stubSessionResourceManagerPreInterceptor" />
+    <preInterceptor type="net::stubbles::websites::variantmanager::stubVariantsPreInterceptor" />
-  </preInterceptors>
-  <postInterceptors>

trunk/examples/config/xml/variantmanager.xml

@@ -4 +4 @@
-    xmlns="http://stubbles.net/websites/variantmanager">
-  <variants name="default">
- 
+
-    <random name="random1" title="random1" weight="1">
- 
+
-    </random>
-
+alias="preferred"
-  </variants>
-</xj:configuration>

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

@@ -147 +147 @@
-        $this->cache->addCacheVar('page', $pageName);
-        $this->cache->addCacheVar('frame', $frameId);
-
+.name
-        $sslMode = 'no';
-        if ($this->isSSL() === true) {
@@ -269 +269 @@
-        $this->template->addGlobalVar('PAGE_TITLE', htmlentities($page->getProperty('title')));
-        $this->template->addGlobalVar('PAGE_NAME', $pageName);
-
+
+
-
-        $regexDecorator = new stubRegexFilterDecorator(new stubStringFilter(), '/\/.*(?=\?)|\/.*/');

trunk/src/main/php/net/stubbles/websites/variantmanager/stubVariantsPreInterceptor.php

@@ -56 +56 @@
-    public function preProcess(stubRequest $request, stubSession $session, stubResponse $response)
-    {
-
+.name
-            return;
-        }
@@ -81 +81 @@
-        }
-        
-
+
+
-        $expiring   = stubRegistry::getConfig('net.stubbles.websites.variantmanager.cookie.expiring', (86400 * 90)); // 90 days default
-        $cookieURL  = stubRegistry::getConfig('net.stubbles.websites.variantmanager.cookie.url', null);

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

@@ -139 +139 @@
-        $xmlStreamWriter->writeElement('id', array(), $this->session->getId());
-        $xmlStreamWriter->writeElement('name', array(), stubRegistry::getConfig(stubSession::NAME_REGISTRY_KEY, stubSession::DEFAULT_SESSION_NAME));
-
+
+
+
+
+
-        $xmlStreamWriter->writeStartElement('token');
-        $xmlStreamWriter->writeElement('current', array(), $this->session->getCurrentToken());

trunk/src/main/resources/xsl/master.xsl

@@ -9 +9 @@
-  <xsl:import href="copy.xsl"/>
-  <xsl:import href="stub.xsl"/>
-
+
+
-
-  <xsl:param name="__path" select="@path"/>

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

@@ -841 +841 @@
-        $this->mockMemphisTemplate->expects($this->at(4))
-                                  ->method('addGlobalVar')
+                                  ->with($this->equalTo('VARIANT_ALIAS'), $this->equalTo(null));
+        $this->mockMemphisTemplate->expects($this->at(5))
+                                  ->method('addGlobalVar')
-                                  ->with($this->equalTo('SERVICE_URL'), $this->equalTo('?processor=jsonrpc'));
-5
+6
-                                  ->method('addGlobalVar')
-                                  ->with($this->equalTo('SID'), $this->equalTo('sessionid=313'));
-6
+7
-                                  ->method('addGlobalVar')
-                                  ->with($this->equalTo('SESSION_NAME'), $this->equalTo('sessionid'));
-7
+8
-                                  ->method('addGlobalVar')
-                                  ->with($this->equalTo('SESSION_ID'), $this->equalTo(313));
@@ -893 +896 @@
-        $this->mockMemphisTemplate->expects($this->at(4))
-                                  ->method('addGlobalVar')
+                                  ->with($this->equalTo('VARIANT_ALIAS'), $this->equalTo('variant'));
+        $this->mockMemphisTemplate->expects($this->at(5))
+                                  ->method('addGlobalVar')
-                                  ->with($this->equalTo('SERVICE_URL'), $this->equalTo('?processor=jsonrpc'));
-5
+6
-                                  ->method('addGlobalVar')
-                                  ->with($this->equalTo('SID'), $this->equalTo('$SID'));
-6
+7
-                                  ->method('addGlobalVar')
-                                  ->with($this->equalTo('SESSION_NAME'), $this->equalTo('$SESSION_NAME'));
-7
+8
-                                  ->method('addGlobalVar')
-                                  ->with($this->equalTo('SESSION_ID'), $this->equalTo('$SESSION_ID'));
-        $this->memphisProcessor->setSSL(true);
-8
+9
-                                  ->method('addGlobalVar')
-                                  ->with($this->equalTo('SSL_MODE'), $this->equalTo('yes'));

trunk/src/test/php/net/stubbles/websites/variantmanager/stubVariantsPreInterceptorProcessTestCase.php

@@ -119 +119 @@
-        $mockNewVariant = $this->getMock('stubVariant');
-        $mockNewVariant->expects($this->any())->method('getName')->will($this->returnValue('variantName'));
+        $mockNewVariant->expects($this->any())->method('getAlias')->will($this->returnValue('variantAlias'));
-        $mockNewVariant->expects($this->any())->method('getFullQualifiedName')->will($this->returnValue('foo:variantName'));
-        $this->mockSession->expects($this->once())->method('hasValue')->will($this->returnValue(false));
-once(
-
-
+at(1
+
+.name
-                                 $this->equalTo('foo:variantName')
+                            );
+        $this->mockSession->expects($this->at(2))
+                          ->method('putValue')
+                          ->with($this->equalTo('net.stubbles.websites.variantmanager.variant.alias'),
+                                 $this->equalTo('variantAlias')
-                            );
-        $this->mockResponse->expects($this->once())->method('setCookie');
@@ -152 +158 @@
-        $mockNewVariant = $this->getMock('stubVariant');
-        $mockNewVariant->expects($this->any())->method('getName')->will($this->returnValue('new'));
+        $mockNewVariant->expects($this->any())->method('getAlias')->will($this->returnValue('fresh'));
-        $mockNewVariant->expects($this->any())->method('getFullQualifiedName')->will($this->returnValue('foo:new'));
-        $mockCookieVariant = $this->getMock('stubVariant');
-        $mockCookieVariant->expects($this->any())->method('getName')->will($this->returnValue('cookie'));
+        $mockCookieVariant->expects($this->any())->method('getAlias')->will($this->returnValue('notthatfresh'));
-        $mockCookieVariant->expects($this->any())->method('getFullQualifiedName')->will($this->returnValue('foo:cookie'));
-        $this->mockSession->expects($this->once())->method('hasValue')->will($this->returnValue(false));
-once(
-
-
+at(1
+
+.name
-                                 $this->equalTo('foo:new')
+                            );
+        $this->mockSession->expects($this->at(2))
+                          ->method('putValue')
+                          ->with($this->equalTo('net.stubbles.websites.variantmanager.variant.alias'),
+                                 $this->equalTo('fresh')
-                            );
-        $this->mockResponse->expects($this->once())->method('setCookie');
@@ -190 +203 @@
-        $mockNewVariant = $this->getMock('stubVariant');
-        $mockNewVariant->expects($this->any())->method('getName')->will($this->returnValue('new'));
+        $mockNewVariant->expects($this->any())->method('getAlias')->will($this->returnValue('fresh'));
-        $mockNewVariant->expects($this->any())->method('getFullQualifiedName')->will($this->returnValue('foo:new'));
-        $mockCookieVariant = $this->getMock('stubVariant');
-        $mockCookieVariant->expects($this->any())->method('getName')->will($this->returnValue('cookie'));
+        $mockCookieVariant->expects($this->any())->method('getAlias')->will($this->returnValue('notthatfresh'));
-        $mockCookieVariant->expects($this->any())->method('getFullQualifiedName')->will($this->returnValue('foo:cookie'));
-        $this->mockSession->expects($this->once())->method('hasValue')->will($this->returnValue(false));
-once(
-
-
+at(1
+
+.name
-                                 $this->equalTo('foo:cookie')
+                            );
+        $this->mockSession->expects($this->at(2))
+                          ->method('putValue')
+                          ->with($this->equalTo('net.stubbles.websites.variantmanager.variant.alias'),
+                                 $this->equalTo('notthatfresh')
-                            );
-        $this->mockResponse->expects($this->once())->method('setCookie');

trunk/src/test/php/net/stubbles/websites/xml/stubXMLProcessorTestCase.php

@@ -154 +154 @@
-        $this->mockRequest->expects($this->once())->method('hasValue')->will($this->returnValue(false));
-        $this->mockPageFactory->expects($this->once())->method('getPage')->with($this->equalTo('conf/index'));
-4
-4
+5
+5
-        $this->mockXMLSerializer->expects($this->once())->method('serialize');
-        $return = $this->xmlProcessor->process();
@@ -188 +188 @@
-        $this->page->addElement($pageElement2);
-        $this->page->addElement($pageElement3);
-4
-4
+5
+5
-        $this->mockXMLSerializer->expects($this->at(0))
-                                ->method('serialize')