[Wact-cvs] SF.net SVN: wact: [358] trunk/wact/template

[<nor...@us...>]

Revision: 358
          http://svn.sourceforge.net/wact/?rev=358&view=rev
Author:   norbertmocsnik
Date:     2006-12-30 08:45:01 -0800 (Sat, 30 Dec 2006)

Log Message:
-----------
Upgraded generic tags.

Modified Paths:
--------------
    trunk/wact/template/compiler/tag/generictag.test.php
    trunk/wact/template/tags/html/generics.tag.php

Modified: trunk/wact/template/compiler/tag/generictag.test.php
===================================================================
--- trunk/wact/template/compiler/tag/generictag.test.php	2006-12-30 16:43:39 UTC (rev 357)
+++ trunk/wact/template/compiler/tag/generictag.test.php	2006-12-30 16:45:01 UTC (rev 358)
@@ -4,207 +4,222 @@
 * @version $Id: generictag.test.php,v 1.10 2006/01/28 21:46:46 norbertmocsnik Exp $
 */
 
-require_once WACT_ROOT . '/template/factory.inc.php';
-require_once WACT_ROOT . '/template/template.inc.php';
+require_once 'wact/cache/storage/transient.inc.php';
+require_once 'wact/compiler/source/organizer/transient.inc.php';
+require_once 'wact/template/finder.inc.php';
 
-class GenericTagTestCase extends UnitTestCase {
+class WactGenericTagTestCase extends UnitTestCase {
 
     function setUp() {
-        $this->TemplateFinder =& new TemplateFinder();
+        $this->organizer = new WactTransientSourceOrganizer();
+        $this->cache = new WactTransientCache();
+        $this->finder = new WactTemplateFinder($this->organizer, $this->cache);
     }
 
     function testGenericTag() {
-        $Template = '<Img ID="runtime" runat="server">';
+        $source = '<Img ID="runtime" runat="server">';
 
-        RegisterTestingTemplate('/tags/generictag1.html', $Template);
-        $Page =& $this->TemplateFinder->getResource('/tags/generictag1.html');
+        $this->organizer->writeSource('/tags/generictag1.html', $source);
+        $tmpl = $this->finder->getResource('/tags/generictag1.html');
 
-        $Component =& $Page->getChild('runtime');
+        $view = $tmpl->getChild('runtime');
 
-		$this->assertFalse($Component->IsDynamicallyRendered);
+        $this->assertTrue($view instanceof WactTagView);
+        $this->assertFalse($view instanceof WactGenericContainerTagView);
 
-        $Component->setAttribute("Src", "Img.gif");
+        $view->setAttribute("Src", "Img.gif");
 
-        $output = $Page->capture();
-        $this->assertEqual($output, '<Img ID="runtime" Src="Img.gif">');
+        $output = $tmpl->capture();
+        $this->assertEqual($output, '<Img ID="runtime" Src="Img.gif"/>');
 
     }
 
     function testGenericContainerTag() {
-        $Template = '<DIV ID="runtime" runat="server">Testing<br />Testing</DIV>';
+        $source = '<DIV ID="runtime" runat="server">Testing<br />Testing</DIV>';
 
-        RegisterTestingTemplate('/tags/generictag2.html', $Template);
-        $Page =& $this->TemplateFinder->getResource('/tags/generictag2.html');
+        $this->organizer->writeSource('/tags/generictag2.html', $source);
+        $tmpl = $this->finder->getResource('/tags/generictag2.html');
 
-        $Component =& $Page->getChild('runtime');
+        $view = $tmpl->getChild('runtime');
 
-		$this->assertTrue($Component->IsDynamicallyRendered);
+        $this->assertTrue($view instanceof WactGenericContainerTagView);
 
-        $Component->setAttribute("Align", "center");
+        $view->setAttribute("Align", "center");
 
-        $output = $Page->capture();
+        $output = $tmpl->capture();
         $this->assertEqual($output, '<DIV ID="runtime" Align="center">Testing<br />Testing</DIV>');
 
     }
 
-	function testGenericContainerTagNesting() {
-        $Template = '<DIV ID="runtime" runat="server"><DIV></DIV></DIV>';
+    function testGenericContainerTagNesting() {
+        $source = '<DIV ID="runtime" runat="server"><DIV></DIV></DIV>';
 
-        RegisterTestingTemplate('/tags/generictag3.html', $Template);
-        $Page =& $this->TemplateFinder->getResource('/tags/generictag3.html');
+        $this->organizer->writeSource('/tags/generictag3.html', $source);
+        $tmpl = $this->finder->getResource('/tags/generictag3.html');
 
-        $Component =& $Page->getChild('runtime');
+        $view = $tmpl->getChild('runtime');
 
-		$this->assertTrue($Component->IsDynamicallyRendered);
+        $this->assertTrue($view instanceof WactGenericContainerTagView);
 
-        $Component->setAttribute("Align", "center");
+        $view->setAttribute("Align", "center");
 
-        $output = $Page->capture();
+        $output = $tmpl->capture();
         $this->assertEqual($output, '<DIV ID="runtime" Align="center"><DIV></DIV></DIV>');
 
-	}
+    }
 
-	function testGenericContainerTagNestingCaseInsensitive() {
-        $Template = '<DIV ID="runtime" runat="server"><DIV></DIV></DIV>';
+    function testGenericContainerTagNestingCaseInsensitive() {
+        $source = '<DIV ID="runtime" runat="server"><DIV></DIV></DIV>';
 
-        RegisterTestingTemplate('/tags/generictag4.html', $Template);
-        $Page =& $this->TemplateFinder->getResource('/tags/generictag4.html');
+        $this->organizer->writeSource('/tags/generictag4.html', $source);
+        $tmpl = $this->finder->getResource('/tags/generictag4.html');
 
-        $Component =& $Page->getChild('runtime');
+        $view = $tmpl->getChild('runtime');
 
-		$this->assertTrue($Component->IsDynamicallyRendered);
+        $this->assertTrue($view instanceof WactGenericContainerTagView);
 
-        $Component->setAttribute("Align", "center");
+        $view->setAttribute("Align", "center");
 
-        $output = $Page->capture();
+        $output = $tmpl->capture();
         $this->assertEqual($output, '<DIV ID="runtime" Align="center"><DIV></DIV></DIV>');
 
-	}
+    }
 
     function testNotAServerComponent() {
-        $Template = '<DIV><DIV ID="runtime" runat="client"></DIV></DIV>';
+        $source = '<DIV><DIV ID="runtime" runat="client"></DIV></DIV>';
 
-        RegisterTestingTemplate('/tags/generictag5.html', $Template);
-        $Page =& $this->TemplateFinder->getResource('/tags/generictag5.html');
+        $this->organizer->writeSource('/tags/generictag5.html', $source);
+        $tmpl = $this->finder->getResource('/tags/generictag5.html');
 
-        $this->assertFalse($Page->findChild('runtime'));
+        $this->assertFalse($tmpl->findChild('runtime'));
 
-        $output = $Page->capture();
+        $output = $tmpl->capture();
         $this->assertEqual($output, '<DIV><DIV ID="runtime"></DIV></DIV>');
 
     }
 
     function testNotAServerComponent2() {
-        $Template = '<DIV><DIV runat="client"></DIV></DIV>';
+        $source = '<DIV><DIV runat="client"></DIV></DIV>';
 
-        RegisterTestingTemplate('/tags/generictag6.html', $Template);
-        $Page =& $this->TemplateFinder->getResource('/tags/generictag6.html');
+        $this->organizer->writeSource('/tags/generictag6.html', $source);
+        $tmpl = $this->finder->getResource('/tags/generictag6.html');
 
-        $this->assertFalse($Page->findChild('runtime'));
+        $this->assertFalse($tmpl->findChild('runtime'));
 
-        $output = $Page->capture();
+        $output = $tmpl->capture();
         $this->assertEqual($output, '<DIV><DIV></DIV></DIV>');
     }
 
-	/**
-	* Tests for tags registered as special cases in
-	* WACT_ROOT . '/template/tags/html/generics.tag.php'
-	*/
+    /**
+    * Tests for tags registered as special cases in
+    * WACT_ROOT . '/template/tags/html/generics.tag.php'
+    */
     function testBrTag() {
-        $Template = '<br id="runtime" runat="server">';
+        $source = '<br id="runtime" runat="server">';
 
-        RegisterTestingTemplate('/tags/generictag7.html', $Template);
-        $Page =& $this->TemplateFinder->getResource('/tags/generictag7.html');
+        $this->organizer->writeSource('/tags/generictag7.html', $source);
+        $tmpl = $this->finder->getResource('/tags/generictag7.html');
 
-		$Component = & $Page->findChild('runtime');
-        $this->assertFalse($Component->IsDynamicallyRendered);
+        $view = $tmpl->findChild('runtime');
+
+        $this->assertTrue($view instanceof WactTagView);
+        $this->assertFalse($view instanceof WactGenericContainerTagView);
     }
 
     function testHrTag() {
-        $Template = '<hr id="runtime" runat="server">';
+        $source = '<hr id="runtime" runat="server">';
 
-        RegisterTestingTemplate('/tags/generictag8.html', $Template);
-        $Page =& $this->TemplateFinder->getResource('/tags/generictag8.html');
+        $this->organizer->writeSource('/tags/generictag8.html', $source);
+        $tmpl = $this->finder->getResource('/tags/generictag8.html');
 
-		$Component = & $Page->findChild('runtime');
-        $this->assertFalse($Component->IsDynamicallyRendered);
+        $view = $tmpl->findChild('runtime');
+
+        $this->assertTrue($view instanceof WactTagView);
+        $this->assertFalse($view instanceof WactGenericContainerTagView);
     }
 
     function testImgTag() {
-        $Template = '<img id="runtime" runat="server">';
+        $source = '<img id="runtime" runat="server">';
 
-        RegisterTestingTemplate('/tags/generictag9.html', $Template);
-        $Page =& $this->TemplateFinder->getResource('/tags/generictag9.html');
+        $this->organizer->writeSource('/tags/generictag9.html', $source);
+        $tmpl = $this->finder->getResource('/tags/generictag9.html');
 
-		$Component = & $Page->findChild('runtime');
-        $this->assertFalse($Component->IsDynamicallyRendered);
+        $view = $tmpl->findChild('runtime');
+
+        $this->assertTrue($view instanceof WactTagView);
+        $this->assertFalse($view instanceof WactGenericContainerTagView);
     }
 
     function testLinkTag() {
-        $Template = '<link id="runtime" runat="server">';
+        $source = '<link id="runtime" runat="server">';
 
-        RegisterTestingTemplate('/tags/generictag10.html', $Template);
-        $Page =& $this->TemplateFinder->getResource('/tags/generictag10.html');
+        $this->organizer->writeSource('/tags/generictag10.html', $source);
+        $tmpl = $this->finder->getResource('/tags/generictag10.html');
 
-		$Component = & $Page->findChild('runtime');
-        $this->assertFalse($Component->IsDynamicallyRendered);
+        $view = $tmpl->findChild('runtime');
+
+        $this->assertTrue($view instanceof WactTagView);
+        $this->assertFalse($view instanceof WactGenericContainerTagView);
     }
 
     function testPTag() {
-        $Template = '<p id="runtime" runat="server"></p>';
+        $source = '<p id="runtime" runat="server"></p>';
 
-        RegisterTestingTemplate('/tags/generictag11.html', $Template);
-        $Page =& $this->TemplateFinder->getResource('/tags/generictag11.html');
+        $this->organizer->writeSource('/tags/generictag11.html', $source);
+        $tmpl = $this->finder->getResource('/tags/generictag11.html');
 
-		$Component = & $Page->findChild('runtime');
-        $this->assertTrue($Component->IsDynamicallyRendered);
+        $view = $tmpl->findChild('runtime');
+
+        $this->assertTrue($view instanceof WactGenericContainerTagView);
     }
 
     function testParamTag() {
-        $Template = '<param id="runtime" runat="server">';
+        $source = '<param id="runtime" runat="server">';
 
-        RegisterTestingTemplate('/tags/generictag12.html', $Template);
-        $Page =& $this->TemplateFinder->getResource('/tags/generictag12.html');
+        $this->organizer->writeSource('/tags/generictag12.html', $source);
+        $tmpl = $this->finder->getResource('/tags/generictag12.html');
 
-		$Component = & $Page->findChild('runtime');
-        $this->assertFalse($Component->IsDynamicallyRendered);
+        $view = $tmpl->findChild('runtime');
+
+        $this->assertTrue($view instanceof WactTagView);
+        $this->assertFalse($view instanceof WactGenericContainerTagView);
     }
 
-	/**
-	* Further odd cases
-	*/
+    /**
+    * Further odd cases
+    */
     function testGenericContainerCaseMismatch() {
-        $Template = '<DiV id="runtime" runat="server">Test</dIv>';
+        $source = '<DiV id="runtime" runat="server">Test</dIv>';
 
-        RegisterTestingTemplate('/tags/generictag13.html', $Template);
-        $Page =& $this->TemplateFinder->getResource('/tags/generictag13.html');
+        $this->organizer->writeSource('/tags/generictag13.html', $source);
+        $tmpl = $this->finder->getResource('/tags/generictag13.html');
 
-		$Component = & $Page->findChild('runtime');
+        $view = $tmpl->findChild('runtime');
 
-		$this->assertTrue($Component->IsDynamicallyRendered);
+        $this->assertTrue($view instanceof WactGenericContainerTagView);
 
-        $output = $Page->capture();
+        $output = $tmpl->capture();
 
-		/**
-		* This is expected behaviour but notice the parser has changed
-		* the case of the closing tag
-		*/
+        /**
+        * This is expected behaviour but notice the parser has changed
+        * the case of the closing tag
+        */
         $this->assertEqual($output, '<DiV id="runtime">Test</DiV>');
     }
 
     function testWactIdNotRendered() {
-        $Template = '<DIV><DIV wact:id="runtime"></DIV></DIV>';
-        RegisterTestingTemplate('/tags/generictag14.html', $Template);
-        $Page =& $this->TemplateFinder->getResource('/tags/generictag14.html');
-        $output = $Page->capture();
+        $source = '<DIV><DIV wact:id="runtime"></DIV></DIV>';
+        $this->organizer->writeSource('/tags/generictag14.html', $source);
+        $tmpl = $this->finder->getResource('/tags/generictag14.html');
+        $output = $tmpl->capture();
         $this->assertEqual($output, '<DIV><DIV></DIV></DIV>');
     }
 
     function testWactIdImpliesServer() {
-        $Template = '<DIV><DIV wact:id="runtime"></DIV></DIV>';
-        RegisterTestingTemplate('/tags/generictag15.html', $Template);
-        $Page =& $this->TemplateFinder->getResource('/tags/generictag15.html');
-        $this->assertTrue($Page->findChild('runtime'));
+        $source = '<DIV><DIV wact:id="runtime"></DIV></DIV>';
+        $this->organizer->writeSource('/tags/generictag15.html', $source);
+        $tmpl = $this->finder->getResource('/tags/generictag15.html');
+        $this->assertTrue($tmpl->findChild('runtime'));
     }
 }
 ?>
\ No newline at end of file

Modified: trunk/wact/template/tags/html/generics.tag.php
===================================================================
--- trunk/wact/template/tags/html/generics.tag.php	2006-12-30 16:43:39 UTC (rev 357)
+++ trunk/wact/template/tags/html/generics.tag.php	2006-12-30 16:45:01 UTC (rev 358)
@@ -1,57 +1,63 @@
 <?php
-//--------------------------------------------------------------------------------
-// Copyright 2003 Procata, Inc.
-// Released under the LGPL license (http://www.gnu.org/copyleft/lesser.html)
-//--------------------------------------------------------------------------------
 /**
-* @package WACT_TAG
-* @version $Id: generics.tag.php,v 1.7 2005/10/31 15:05:47 pachanga Exp $
-* Purpose of the classes here are to provide a dictionary of
-* the "special cases" that exist in HTML only so that the template
-* parser will know what to do with them, when used as a component
+* Web Application Component Toolkit
+*
+* @link http://www.phpwact.org/
+*
+* @author Wact Development Team
+* @link http://www.phpwact.org/team
+*
+* @copyright Copyright 2006, Jeff Moore
+* @license http://opensource.org/licenses/mit-license.php MIT
+*
+* @package Template
+* @version 0.9
 */
 
-require_once WACT_ROOT . '/template/compiler/generictag.inc.php';
+/**
+* File level includes
+*/
+require_once 'wact/template/compiler/tag/generictag.inc.php';
 
 /*
 * @tag br
 * @location LOCATION_CLIENT
 * @end_tag ENDTAG_FORBIDDEN
 */
-class BRGenericTag extends GenericTag{}
+class BRGenericTagNode extends WactGenericTagNode{}
 
 /*
 * @tag hr
 * @location LOCATION_CLIENT
 * @end_tag ENDTAG_FORBIDDEN
 */
-class HRGenericTag extends GenericTag{}
+class HRGenericTagNode extends WactGenericTagNode{}
 
 /*
 * @tag img
 * @location LOCATION_CLIENT
 * @end_tag ENDTAG_FORBIDDEN
 */
-class IMGGenericTag extends GenericTag{}
+class IMGGenericTagNode extends WactGenericTagNode{}
 
 /*
 * @tag link
 * @location LOCATION_CLIENT
 * @end_tag ENDTAG_FORBIDDEN
 */
-class LINKGenericTag extends GenericTag{}
+class LINKGenericTagNode extends WactGenericTagNode{}
 
 /*
 * @tag p
 * @location LOCATION_CLIENT
 */
-class PGenericTag extends GenericContainerTag{}
+class PGenericTagNode extends WactGenericContainerTagNode{}
 
 /*
 * @tag param
 * @location LOCATION_CLIENT
 * @end_tag ENDTAG_FORBIDDEN
 */
-class PARAMGenericTag extends GenericTag{}
+class PARAMGenericTagNode extends WactGenericTagNode{}
 
 ?>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.