Changeset 409

Timestamp:

03/21/07 17:47:59 (1 year ago)

Author:

mikey

Message:

added possibility to retrieve raw post data (closes ticket #23)

Files:

• trunk/src/main/php/net/stubbles/ipo/request/stubAbstractRequest.php (modified) (1 diff)
• trunk/src/main/php/net/stubbles/ipo/request/stubRequest.php (modified) (1 diff)
• trunk/src/main/php/net/stubbles/ipo/request/stubRequestPrefixDecorator.php (modified) (1 diff)
• trunk/src/main/php/net/stubbles/ipo/request/stubWebRequest.php (modified) (1 diff)
• trunk/src/test/php/net/stubbles/ipo/request/stubAbstractRequestTestCase.php (modified) (3 diffs)
• trunk/src/test/php/net/stubbles/ipo/request/stubRequestPrefixDecoratorTestCase.php (modified) (1 diff)

trunk/src/main/php/net/stubbles/ipo/request/stubAbstractRequest.php

@@ -209 +209 @@
-    
-    /**
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-     *
-     * @param   stubValidator  $validator  validator to use

trunk/src/main/php/net/stubbles/ipo/request/stubRequest.php

@@ -108 +108 @@
-    
-    /**
+     * checks whether raw data is valid or not
+     *
+     * @param   stubValidator  $validator  validator to use
+     * @return  bool
+     */
+    public function validateRawData(stubValidator $validator);
+    
+    /**
+     * returns the validated raw data
+     * 
+     * If the validator says the raw data is not valid the return value is null.
+     *
+     * @param   stubValidator  $validator  validator to use
+     * @return  string
+     */
+    public function getValidatedRawData(stubValidator $validator);
+    
+    /**
+     * returns the raw data filtered
+     *
+     * @param   stubFilter  $filter
+     * @return  mixed
+     * @throws  stubFilterException
+     */
+    public function getFilteredRawData(stubFilter $filter);
+    
+    /**
-     * checks whether a request value is valid or nor
-     *

trunk/src/main/php/net/stubbles/ipo/request/stubRequestPrefixDecorator.php

@@ -185 +185 @@
-    
-    /**
+     * checks whether raw data is valid or not
+     *
+     * @param   stubValidator  $validator  validator to use
+     * @return  bool
+     */
+    public function validateRawData(stubValidator $validator)
+    {
+        return $this->request->validateRawData($validator);
+    }
+    
+    /**
+     * returns the validated raw data
+     * 
+     * If the validator says the value is not valid the return value is null.
+     *
+     * @param   stubValidator  $validator  validator to use
+     * @return  string
+     */
+    public function getValidatedRawData(stubValidator $validator)
+    {
+        return $this->request->getValidatedRawData($validator);
+    }
+    
+    /**
+     * returns the raw data filtered
+     *
+     * @param   stubFilter  $filter
+     * @return  mixed
+     * @throws  stubFilterException
+     */
+    public function getFilteredRawData(stubFilter $filter)
+    {
+        return $this->request->getFilteredRawData($filter);
+    }
+    
+    /**
-     * checks whether a request value is valid or nor
-     *

trunk/src/main/php/net/stubbles/ipo/request/stubWebRequest.php

@@ -66 +66 @@
-        return strtolower($_SERVER['REQUEST_METHOD']);
-    }
+    
+    /**
+     * returns the raw data
+     *
+     * @return  string
+     */
+    protected function getRawData()
+    {
+        return file_get_contents('php://input');
+    }
-}
-?>

trunk/src/test/php/net/stubbles/ipo/request/stubAbstractRequestTestCase.php

@@ -22 +22 @@
-class stubTestRequest extends stubAbstractRequest
-{
+    protected $rawData = 'This is the raw request data.';
+    
-    protected function doConstuct()
-    {
@@ -32 +34 @@
-    {
-        return 'test';
+    }
+    
+    public function setRawData($rawData)
+    {
+        $this->rawData = $rawData;
+    }
+    
+    protected function getRawData()
+    {
+        return $this->rawData;
-    }
-    
@@ -326 +338 @@
-        $this->assertEqual($this->request->getValueKeys(stubRequest::SOURCE_COOKIE), array('baz'));
-    }
+    
+    /**
+     * assure that raw data is handles correct
+     */
+    public function testValidateRawData()
+    {
+        $mockValidator = new MockStubValidator();
+        $mockValidator->setReturnValueAt(0, 'validate', true);
+        $mockValidator->setReturnValueAt(1, 'validate', false);
+        $this->assertTrue($this->request->validateRawData($mockValidator));
+        $this->assertFalse($this->request->validateRawData($mockValidator));
+    }
+    
+    /**
+     * assure that raw data is handles correct
+     */
+    public function testGetValidatedRawData()
+    {
+        $mockValidator = new MockStubValidator();
+        $mockValidator->setReturnValueAt(0, 'validate', true);
+        $mockValidator->setReturnValueAt(1, 'validate', false);
+        $this->assertEqual($this->request->getValidatedRawData($mockValidator), 'This is the raw request data.');
+        $this->assertNull($this->request->getValidatedRawData($mockValidator));
+    }
+    
+    /**
+     * assure that raw data is handles correct
+     */
+    public function testGetFilteredRawData()
+    {
+        $mockFilter = new MockStubFilter();
+        $mockFilter->setReturnValueAt(0, 'hasDefaultValue', true);
+        $mockFilter->setReturnValueAt(1, 'hasDefaultValue', false);
+        $mockFilter->setReturnValue('getDefaultValue', 'foo');
+        $mockFilter->setReturnValue('execute', 'bam');
+        $this->request->setRawData(null);
+        $this->assertEqual($this->request->getFilteredRawData($mockFilter), 'foo');
+        $this->assertNull($this->request->getFilteredRawData($mockFilter));
+        
+        $this->request->setRawData('bar');
+        $this->assertEqual($this->request->getFilteredRawData($mockFilter), 'bam');
+        
+        $this->expectException('stubFilterException');
+        $this->request->getFilteredRawData(new stubTestExceptionFilter());
+    }
-}
-?>

trunk/src/test/php/net/stubbles/ipo/request/stubRequestPrefixDecoratorTestCase.php

@@ -201 +201 @@
-    
-    /**
+     * assure that raw data is handles correct
+     */
+    public function testValidateRawData()
+    {
+        $mockValidator = new MockStubValidator();
+        $this->mockRequest->expectOnce('validateRawData', array($mockValidator));
+        $this->mockRequest->setReturnValue('validateRawData', false);
+        $this->assertFalse($this->request->validateRawData($mockValidator));
+    }
+    
+    /**
+     * assure that raw data is handles correct
+     */
+    public function testGetValidatedRawData()
+    {
+        $mockValidator = new MockStubValidator();
+        $this->mockRequest->expectOnce('getValidatedRawData', array($mockValidator));
+        $this->mockRequest->setReturnValue('getValidatedRawData', 'foo');
+        $this->assertEqual($this->request->getValidatedRawData($mockValidator), 'foo');
+    }
+    
+    /**
+     * assure that raw data is handles correct
+     */
+    public function testGetFilteredRawData()
+    {
+        $mockFilter = new MockStubFilter();
+        $this->mockRequest->expectOnce('getFilteredRawData', array($mockFilter));
+        $this->mockRequest->setReturnValue('getFilteredRawData', 'foo');
+        $this->assertEqual($this->request->getFilteredRawData($mockFilter), 'foo');
+    }
+    
+    /**
-     * assure that value keys are delivered correct
-     */