Changeset 1423

Show
Ignore:
Timestamp:
03/14/08 16:09:18 (6 months ago)
Author:
mikey
Message:

renaming, part 2

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/net/stubbles/websites/xml/generator/stubPageXMLGenerator.php

    r1422 r1423  
    1414                      'net::stubbles::util::stubRegistry', 
    1515                      'net::stubbles::websites::stubPage', 
    16                       'net::stubbles::websites::xml::generator::stubGlobalXMLElement' 
     16                      'net::stubbles::websites::xml::generator::stubXMLGenerator' 
    1717); 
    1818/** 
    …… 
    2222 * @subpackage  websites_xml_generator 
    2323 */ 
    24 class stubPageXMLElement extends stubBaseObject implements stubGlobalXMLElement 
     24class stubPageXMLGenerator extends stubBaseObject implements stubXMLGenerator 
    2525{ 
    2626    /** 
    …… 
    8080     * @param  stubXMLSerializer    $xmlSerializer    serializer to be used 
    8181     */ 
    82     public function append(stubXMLStreamWriter $xmlStreamWriter, stubXMLSerializer $xmlSerializer) 
     82    public function generate(stubXMLStreamWriter $xmlStreamWriter, stubXMLSerializer $xmlSerializer) 
    8383    { 
    8484        $prefixRequest = new stubRequestPrefixDecorator($this->request, ''); 

  • trunk/src/main/php/net/stubbles/websites/xml/generator/stubRequestXMLGenerator.php

    r1422 r1423  
    88 */ 
    99stubClassLoader::load('net::stubbles::ipo::request::stubRequest', 
    10                       'net::stubbles::websites::xml::generator::stubGlobalXMLElement' 
     10                      'net::stubbles::websites::xml::generator::stubXMLGenerator' 
    1111); 
    1212/** 
    …… 
    3737 * @subpackage  websites_xml_generator 
    3838 */ 
    39 class stubRequestXMLElement extends stubBaseObject implements stubGlobalXMLElement 
     39class stubRequestXMLGenerator extends stubBaseObject implements stubXMLGenerator 
    4040{ 
    4141    /** 
    …… 
    6363     * @param  stubXMLSerializer    $xmlSerializer    serializer to be used 
    6464     */ 
    65     public function append(stubXMLStreamWriter $xmlStreamWriter, stubXMLSerializer $xmlSerializer) 
     65    public function generate(stubXMLStreamWriter $xmlStreamWriter, stubXMLSerializer $xmlSerializer) 
    6666    { 
    6767        $xmlStreamWriter->writeStartElement('request'); 

  • trunk/src/main/php/net/stubbles/websites/xml/generator/stubSessionXMLGenerator.php

    r1422 r1423  
    1010                      'net::stubbles::ipo::session::stubSession', 
    1111                      'net::stubbles::util::stubRegistry', 
    12                       'net::stubbles::websites::xml::generator::stubGlobalXMLElement' 
     12                      'net::stubbles::websites::xml::generator::stubXMLGenerator' 
    1313); 
    1414/** 
    …… 
    4242 * @subpackage  websites_xml_generator 
    4343 */ 
    44 class stubSessionXMLElement extends stubBaseObject implements stubGlobalXMLElement 
     44class stubSessionXMLGenerator extends stubBaseObject implements stubXMLGenerator 
    4545{ 
    4646    /** 
    …… 
    7676     * @param  stubXMLSerializer    $xmlSerializer    serializer to be used 
    7777     */ 
    78     public function append(stubXMLStreamWriter $xmlStreamWriter, stubXMLSerializer $xmlSerializer) 
     78    public function generate(stubXMLStreamWriter $xmlStreamWriter, stubXMLSerializer $xmlSerializer) 
    7979    { 
    8080        $xmlStreamWriter->writeStartElement('session'); 

  • trunk/src/main/php/net/stubbles/websites/xml/generator/stubXMLGenerator.php

    r1422 r1423  
    11<?php 
    22/** 
    3  * Interface for global xml elements available on all pages of the xml result document. 
     3 * Interface for generators of the xml result document. 
    44 * 
    55 * @author      Frank Kleine <mikey@stubbles.net> 
    …… 
    1111); 
    1212/** 
    13  * Interface for global xml elements available on all pages of the xml result document. 
     13 * Interface for generators of the xml result document. 
    1414 * 
    1515 * @package     stubbles 
    1616 * @subpackage  websites_xml_generator 
    1717 */ 
    18 interface stubGlobalXMLElement extends stubObject 
     18interface stubXMLGenerator extends stubObject 
    1919{ 
    2020    /** 
    …… 
    2424     * @param  stubXMLSerializer    $xmlSerializer    serializer to be used 
    2525     */ 
    26     public function append(stubXMLStreamWriter $xmlStreamWriter, stubXMLSerializer $xmlSerializer); 
     26    public function generate(stubXMLStreamWriter $xmlStreamWriter, stubXMLSerializer $xmlSerializer); 
    2727} 
    2828?> 

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

    r1422 r1423  
    2626{ 
    2727    /** 
    28      * list of global elements to be serialized into result xml 
     28     * list of xml generators to be used to create the dom tree 
    2929     * 
    3030     * @var  array<string> 
    3131     */ 
    32     protected $globalElements = array(); 
     32    protected $xmlGenerators = array(); 
    3333 
    3434    /** 
    …… 
    4545        parent::__construct($request, $session, $response, $pageFactory); 
    4646        $this->pageDirPrefix = 'conf/'; 
    47         $this->configureGlobalElements(); 
     47        $this->configureXMLGenerators(); 
    4848    } 
    4949 
    5050    /** 
    51      * configured the global elements 
     51     * configure the xml generators 
    5252     */ 
    53     protected function configureGlobalElements() 
     53    protected function configureXMLGenerators() 
    5454    { 
    55         $this->globalElements = array('net::stubbles::websites::xml::generator::stubSessionXMLElement', 
    56                                       'net::stubbles::websites::xml::generator::stubPageXMLElement', 
    57                                       'net::stubbles::websites::xml::generator::stubRequestXMLElement' 
    58                                 ); 
     55        $this->xmlGenerators = array('net::stubbles::websites::xml::generator::stubSessionXMLGenerator', 
     56                                     'net::stubbles::websites::xml::generator::stubPageXMLGenerator', 
     57                                     'net::stubbles::websites::xml::generator::stubRequestXMLGenerator' 
     58                               ); 
    5959    } 
    6060 
    …… 
    8080        $xmlStreamWriter->writeAttribute('page', $pageName); 
    8181        $xmlSerializer = $this->createXMLSerializer(); 
    82         foreach ($this->globalElements as $globalElementClassName) { 
    83             $globalElement = $injector->getInstance($globalElementClassName); 
    84             $globalElement->append($xmlStreamWriter, $xmlSerializer); 
     82        foreach ($this->xmlGenerators as $xmlGeneratorClassName) { 
     83            $xmlGenerator = $injector->getInstance($xmlGeneratorClassName); 
     84            $xmlGenerator->generate($xmlStreamWriter, $xmlSerializer); 
    8585        } 
    8686 

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

    r1422 r1423  
    5454         
    5555        // xml generators 
    56         $suite->addTestFile($dir . '/xml/generator/stubPageXMLElementTestCase.php'); 
    57         $suite->addTestFile($dir . '/xml/generator/stubRequestXMLElementTestCase.php'); 
    58         $suite->addTestFile($dir . '/xml/generator/stubSessionXMLElementTestCase.php'); 
     56        $suite->addTestFile($dir . '/xml/generator/stubPageXMLGeneratorTestCase.php'); 
     57        $suite->addTestFile($dir . '/xml/generator/stubRequestXMLGeneratorTestCase.php'); 
     58        $suite->addTestFile($dir . '/xml/generator/stubSessionXMLGeneratorTestCase.php'); 
    5959        return $suite; 
    6060    } 

  • trunk/src/test/php/net/stubbles/websites/xml/generator/stubPageXMLGeneratorTestCase.php

    r1422 r1423  
    11<?php 
    22/** 
    3  * Tests for net::stubbles::websites::xml::global::stubPageXMLElement. 
     3 * Tests for net::stubbles::websites::xml::generator::stubPageXMLGenerator. 
    44 * 
    55 * @author      Frank Kleine <mikey@stubbles.net> 
    …… 
    77 * @subpackage  websites_xml_generator_test 
    88 */ 
    9 stubClassLoader::load('net::stubbles::websites::xml::generator::stubPageXMLElement'); 
     9stubClassLoader::load('net::stubbles::websites::xml::generator::stubPageXMLGenerator'); 
    1010/** 
    11  * Tests for net::stubbles::websites::xml::global::stubPageXMLElement. 
     11 * Tests for net::stubbles::websites::xml::generator::stubPageXMLGenerator. 
    1212 * 
    1313 * @package     stubbles 
    1414 * @subpackage  websites_xml_generator_test 
    1515 */ 
    16 class stubPageXMLElementTestCase extends PHPUnit_Framework_TestCase 
     16class stubPageXMLGeneratorTestCase extends PHPUnit_Framework_TestCase 
    1717{ 
    1818    /** 
    1919     * instance to test 
    2020     * 
    21      * @var  stubPageXMLElement 
     21     * @var  stubPageXMLGenerator 
    2222     */ 
    23     protected $pageXMLElement; 
     23    protected $pageXMLGenerator; 
    2424    /** 
    2525     * mocked request instance 
    …… 
    7575        $this->page                = new stubPage(); 
    7676        $this->mockInjector        = $this->getMock('stubInjector'); 
    77         $this->pageXMLElement      = new stubPageXMLElement($this->mockRequest, $this->mockSession, $this->mockResponse, $this->page, $this->mockInjector); 
     77        $this->pageXMLGenerator    = new stubPageXMLGenerator($this->mockRequest, $this->mockSession, $this->mockResponse, $this->page, $this->mockInjector); 
    7878        $this->mockXMLStreamWriter = $this->getMock('stubXMLStreamWriter'); 
    7979        $this->mockXMLSerializer   = $this->getMock('stubXMLSerializer'); 
    …… 
    102102        $this->mockXMLStreamWriter->expects($this->once())->method('writeStartElement'); 
    103103        $this->mockXMLStreamWriter->expects($this->once())->method('writeEndElement'); 
    104         $this->pageXMLElement->append($this->mockXMLStreamWriter, $this->mockXMLSerializer); 
     104        $this->pageXMLGenerator->generate($this->mockXMLStreamWriter, $this->mockXMLSerializer); 
    105105    } 
    106106 
    …… 
    141141        $this->mockXMLStreamWriter->expects($this->once())->method('writeStartElement'); 
    142142        $this->mockXMLStreamWriter->expects($this->once())->method('writeEndElement'); 
    143         $this->pageXMLElement->append($this->mockXMLStreamWriter, $this->mockXMLSerializer); 
     143        $this->pageXMLGenerator->generate($this->mockXMLStreamWriter, $this->mockXMLSerializer); 
    144144    } 
    145145 
    …… 
    167167        $this->mockXMLStreamWriter->expects($this->never())->method('writeStartElement'); 
    168168        $this->mockXMLStreamWriter->expects($this->never())->method('writeEndElement'); 
    169         $this->pageXMLElement->append($this->mockXMLStreamWriter, $this->mockXMLSerializer); 
     169        $this->pageXMLGenerator->generate($this->mockXMLStreamWriter, $this->mockXMLSerializer); 
    170170    } 
    171171 
    …… 
    191191        $this->mockXMLStreamWriter->expects($this->once())->method('writeStartElement'); 
    192192        $this->mockXMLStreamWriter->expects($this->once())->method('writeEndElement'); 
    193         $this->pageXMLElement->append($this->mockXMLStreamWriter, $this->mockXMLSerializer); 
     193        $this->pageXMLGenerator->generate($this->mockXMLStreamWriter, $this->mockXMLSerializer); 
    194194         
    195195    } 

  • trunk/src/test/php/net/stubbles/websites/xml/generator/stubRequestXMLGeneratorTestCase.php

    r1422 r1423  
    11<?php 
    22/** 
    3  * Tests for net::stubbles::websites::xml::global::stubRequestXMLElement. 
     3 * Tests for net::stubbles::websites::xml::generator::stubRequestXMLGenerator. 
    44 * 
    55 * @author      Frank Kleine <mikey@stubbles.net> 
    …… 
    77 * @subpackage  websites_xml_generator_test 
    88 */ 
    9 stubClassLoader::load('net::stubbles::websites::xml::generator::stubRequestXMLElement'); 
     9stubClassLoader::load('net::stubbles::websites::xml::generator::stubRequestXMLGenerator'); 
    1010/** 
    11  * Tests for net::stubbles::websites::xml::global::stubRequestXMLElement. 
     11 * Tests for net::stubbles::websites::xml::generator::stubRequestXMLGenerator. 
    1212 * 
    1313 * @package     stubbles 
    1414 * @subpackage  websites_xml_generator_test 
    1515 */ 
    16 class stubRequestXMLElementTestCase extends PHPUnit_Framework_TestCase 
     16class stubRequestXMLGeneratorTestCase extends PHPUnit_Framework_TestCase 
    1717{ 
    1818    /** 
    1919     * instance to test 
    2020     * 
    21      * @var  stubRequestXMLElement 
     21     * @var  stubRequestXMLGenerator 
    2222     */ 
    23     protected $requestXMLElement; 
     23    protected $requestXMLGenerator; 
    2424    /** 
    2525     * mocked request instance 
    …… 
    4747    { 
    4848        $this->mockRequest         = $this->getMock('stubRequest'); 
    49         $this->requestXMLElement   = new stubRequestXMLElement($this->mockRequest); 
     49        $this->requestXMLGenerator = new stubRequestXMLGenerator($this->mockRequest); 
    5050        $this->mockXMLStreamWriter = $this->getMock('stubXMLStreamWriter'); 
    5151        $this->mockXMLSerializer   = $this->getMock('stubXMLSerializer'); 
    …… 
    6363        $this->mockRequest->expects($this->once())->method('getValueErrors')->will($this->returnValue(array())); 
    6464        $this->mockXMLSerializer->expects($this->never())->method('serialize'); 
    65         $this->requestXMLElement->append($this->mockXMLStreamWriter, $this->mockXMLSerializer); 
     65        $this->requestXMLGenerator->generate($this->mockXMLStreamWriter, $this->mockXMLSerializer); 
    6666    } 
    6767 
    …… 
    8080        $this->mockRequest->expects($this->once())->method('getValueErrors')->will($this->returnValue(array('foo' => array($error)))); 
    8181        $this->mockXMLSerializer->expects($this->once())->method('serialize')->with($this->equalTo(array($error)), $this->equalTo($this->mockXMLStreamWriter)); 
    82         $this->requestXMLElement->append($this->mockXMLStreamWriter, $this->mockXMLSerializer); 
     82        $this->requestXMLGenerator->generate($this->mockXMLStreamWriter, $this->mockXMLSerializer); 
    8383    } 
    8484} 

  • trunk/src/test/php/net/stubbles/websites/xml/generator/stubSessionXMLGeneratorTestCase.php

    r1422 r1423  
    11<?php 
    22/** 
    3  * Tests for net::stubbles::websites::xml::global::stubSessionXMLElement. 
     3 * Tests for net::stubbles::websites::xml::generator::stubSessionXMLGenerator. 
    44 * 
    55 * @author      Frank Kleine <mikey@stubbles.net> 
    …… 
    77 * @subpackage  websites_xml_generator_test 
    88 */ 
    9 stubClassLoader::load('net::stubbles::websites::xml::generator::stubSessionXMLElement', 
     9stubClassLoader::load('net::stubbles::websites::xml::generator::stubSessionXMLGenerator', 
    1010                      'net::stubbles::xml::stubXMLStreamWriterFactory' 
    1111); 
    1212/** 
    13  * Tests for net::stubbles::websites::xml::global::stubSessionXMLElement. 
     13 * Tests for net::stubbles::websites::xml::generator::stubSessionXMLGenerator. 
    1414 * 
    1515 * @package     stubbles 
    1616 * @subpackage  websites_xml_generator_test 
    1717 */ 
    18 class stubSessionXMLElementTestCase extends PHPUnit_Framework_TestCase 
     18class stubSessionXMLGeneratorTestCase extends PHPUnit_Framework_TestCase 
    1919{ 
    2020    /** 
    2121     * instance to test 
    2222     * 
    23      * @var  stubSessionXMLElement 
     23     * @var  stubSessionXMLGenerator 
    2424     */ 
    25     protected $requestXMLElement; 
     25    protected $requestXMLGenerator; 
    2626    /** 
    2727     * mocked request instance 
    …… 
    5656        $this->mockRequest         = $this->getMock('stubRequest'); 
    5757        $this->mockSession         = $this->getMock('stubSession'); 
    58         $this->requestXMLElement   = new stubSessionXMLElement($this->mockRequest, $this->mockSession); 
     58        $this->requestXMLGenerator = new stubSessionXMLGenerator($this->mockRequest, $this->mockSession); 
    5959        $this->xmlStreamWriter     = stubXMLStreamWriterFactory::createAsAvailable(); 
    6060        $this->mockXMLSerializer   = $this->getMock('stubXMLSerializer'); 
    …… 
    7575        $this->mockSession->expects($this->once())->method('getCurrentToken')->will($this->returnValue('bar')); 
    7676        $this->mockSession->expects($this->once())->method('getNextToken')->will($this->returnValue('baz')); 
    77         $this->requestXMLElement->append($this->xmlStreamWriter, $this->mockXMLSerializer); 
     77        $this->requestXMLGenerator->generate($this->xmlStreamWriter, $this->mockXMLSerializer); 
    7878        $doc = $this->xmlStreamWriter->asXML(); 
    7979        $this->assertEquals('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . 
    …… 
    108108        $this->mockSession->expects($this->once())->method('getCurrentToken')->will($this->returnValue('bar')); 
    109109        $this->mockSession->expects($this->once())->method('getNextToken')->will($this->returnValue('baz')); 
    110         $this->requestXMLElement->append($this->xmlStreamWriter, $this->mockXMLSerializer); 
     110        $this->requestXMLGenerator->generate($this->xmlStreamWriter, $this->mockXMLSerializer); 
    111111        $doc = $this->xmlStreamWriter->asXML(); 
    112112        $this->assertEquals('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . 

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

    r1419 r1423  
    77 * @subpackage  websites_xml_test 
    88 */ 
    9 stubClassLoader::load('net::stubbles::websites::xml::stubXMLProcessor'); 
     9stubClassLoader::load('net::stubbles::websites::xml::stubXMLProcessor', 
     10                      'net::stubbles::websites::xml::generator::stubXMLGenerator' 
     11); 
    1012/** 
    1113 * Tests for net::stubbles::websites::xml::stubXMLProcessor. 
    …… 
    137139        $this->mockXMLStreamWriter->expects($this->once())->method('writeAttribute')->with($this->equalTo('page'), $this->equalTo('index')); 
    138140        $this->mockXMLStreamWriter->expects($this->once())->method('writeEndElement'); 
    139         $mockGlobalXMLElement = $this->getMock('stubGlobalXMLElement'); 
    140         $this->mockInjector->expects($this->exactly(3))->method('getInstance')->will($this->returnValue($mockGlobalXMLElement)); 
    141         $mockGlobalXMLElement->expects($this->exactly(3))->method('append')->with($this->equalTo($this->mockXMLStreamWriter), $this->equalTo($this->mockXMLSerializer)); 
     141        $mockXMLGenerator = $this->getMock('stubXMLGenerator'); 
     142        $this->mockInjector->expects($this->exactly(3))->method('getInstance')->will($this->returnValue($mockXMLGenerator)); 
     143        $mockXMLGenerator->expects($this->exactly(3))->method('generate')->with($this->equalTo($this->mockXMLStreamWriter), $this->equalTo($this->mockXMLSerializer)); 
    142144        $resultXSL         = new DOMDocument(); 
    143145        $mockSkinGenerator = $this->getMock('stubSkinGenerator'); 
    …… 
    174176        $this->mockXMLStreamWriter->expects($this->once())->method('writeAttribute')->with($this->equalTo('page'), $this->equalTo('index')); 
    175177        $this->mockXMLStreamWriter->expects($this->once())->method('writeEndElement'); 
    176         $mockGlobalXMLElement = $this->getMock('stubGlobalXMLElement'); 
    177         $this->mockInjector->expects($this->exactly(3))->method('getInstance')->will($this->returnValue($mockGlobalXMLElement)); 
    178         $mockGlobalXMLElement->expects($this->exactly(3))->method('append')->with($this->equalTo($this->mockXMLStreamWriter), $this->equalTo($this->mockXMLSerializer)); 
     178        $mockXMLGenerator = $this->getMock('stubXMLGenerator'); 
     179        $this->mockInjector->expects($this->exactly(3))->method('getInstance')->will($this->returnValue($mockXMLGenerator)); 
     180        $mockXMLGenerator->expects($this->exactly(3))->method('generate')->with($this->equalTo($this->mockXMLStreamWriter), $this->equalTo($this->mockXMLSerializer)); 
    179181        $resultXSL         = new DOMDocument(); 
    180182        $mockSkinGenerator = $this->getMock('stubSkinGenerator'); 
    …… 
    212214        $this->mockXMLStreamWriter->expects($this->once())->method('writeAttribute')->with($this->equalTo('page'), $this->equalTo('baz')); 
    213215        $this->mockXMLStreamWriter->expects($this->once())->method('writeEndElement'); 
    214         $mockGlobalXMLElement = $this->getMock('stubGlobalXMLElement'); 
    215         $this->mockInjector->expects($this->exactly(3))->method('getInstance')->will($this->returnValue($mockGlobalXMLElement)); 
    216         $mockGlobalXMLElement->expects($this->exactly(3))->method('append')->with($this->equalTo($this->mockXMLStreamWriter), $this->equalTo($this->mockXMLSerializer)); 
     216        $mockXMLGenerator = $this->getMock('stubXMLGenerator'); 
     217        $this->mockInjector->expects($this->exactly(3))->method('getInstance')->will($this->returnValue($mockXMLGenerator)); 
     218        $mockXMLGenerator->expects($this->exactly(3))->method('generate')->with($this->equalTo($this->mockXMLStreamWriter), $this->equalTo($this->mockXMLSerializer)); 
    217219        $resultXSL         = new DOMDocument(); 
    218220        $mockSkinGenerator = $this->getMock('stubSkinGenerator');