Using Event Handlers instead of a fixed closure for the response hand…

…lers.
daniel-aranda · Mar 15, 2015 · c73bf50 · c73bf50
1 parent 9ebff07
commit c73bf50
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 33 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/core/RESTful/Response.php b/core/RESTful/Response.php
@@ -1,5 +1,6 @@
 <?php
 namespace RESTful;
+use PHPRocks\EventHandler;
 use RESTful\Exception\Response\CanNotSwapResponseType;
 use RESTful\Exception\Response\InvalidResponseType;
 
@@ -10,12 +11,12 @@
  */
 final class Response {
 
+    use EventHandler;
+
     const JSON = 'application/json';
     const TEXT = 'text/plain';
     const HTML = 'text/html';
 
-
-
     public static $types = [
         self::JSON,
         self::HTML,
@@ -28,9 +29,9 @@ final class Response {
 
     private $response = null;
 
-    public $outputHandler = null;
+    const OUTPUT_EVENT = 'output_event';
 
-    public $addHeaderHandler = null;
+    const HEADER_ADDED_EVENT = 'added_event';
 
     private function validateHeaders(){
         if( $this->header_set ) {
@@ -49,9 +50,7 @@ private function validateOutputHeaders(){
     }
 
     public function addHeader($header){
-        if( is_callable($this->addHeaderHandler) ){
-            $this->addHeaderHandler->__invoke($this, $header);
-        }
+        $this->trigger(self::HEADER_ADDED_EVENT, [$this, $header]);
     }
 
     public function setResponse($response){
@@ -69,9 +68,7 @@ public function render(){
             $this->response = json_encode($this->response);
         }
 
-        if( is_callable($this->outputHandler) ){
-            $this->outputHandler->__invoke($this);
-        }
+        $this->trigger(self::OUTPUT_EVENT, [$this]);
 
     }
 

diff --git a/public/api.php b/public/api.php
@@ -11,15 +11,15 @@
 
 $response = new \RESTful\Response();
 
-$response->addHeaderHandler = function(\RESTful\Response $response, $header){
+$response->addEventHandler(\RESTful\Response::HEADER_ADDED_EVENT, function(\RESTful\Response $response, $header){
     header($header);
-};
+});
 
-$response->outputHandler = function(\RESTful\Response $response){
+$response->addEventHandler(\RESTful\Response::OUTPUT_EVENT, function(\RESTful\Response $response){
     echo $response->getResponse();
-};
+});
 
-$request = \RESTful\Request::factory('');
+$request = \RESTful\Request::factory('test_service/add');
 
 $server = new \RESTful\Server(
     $response

diff --git a/tests/RESTful/ResponseTest.php b/tests/RESTful/ResponseTest.php
@@ -23,9 +23,9 @@ protected function setUp() {
     public function testRenderResponse() {
 
         $output = null;
-        $this->response->outputHandler = function(Response $response) use (&$output){
+        $this->response->addEventHandler(Response::OUTPUT_EVENT, function(Response $response) use (&$output){
             $output = $response->getResponse();
-        };
+        });
 
         $this->response->setResponse('Hello World');
 
@@ -38,9 +38,9 @@ public function testRenderResponse() {
     public function testMultiRenderResponse() {
 
         $output = '';
-        $this->response->outputHandler = function(Response $response) use (&$output){
+        $this->response->addEventHandler(Response::OUTPUT_EVENT, function(Response $response) use (&$output){
             $output .= $response->getResponse();
-        };
+        });
 
         $this->response->setResponseType(Response::TEXT);
 
@@ -59,9 +59,9 @@ public function testMultiRenderResponse() {
     public function testReceiveHeaders() {
 
         $received_header = null;
-        $this->response->addHeaderHandler = function(Response $response, $header) use (&$received_header){
+        $this->response->addEventHandler(Response::HEADER_ADDED_EVENT, function(Response $response, $header) use (&$received_header){
             $received_header = $header;
-        };
+        });
 
         $this->response->render();
 
@@ -74,9 +74,9 @@ public function testReceiveHeaders() {
     public function testHtmlHeaders() {
 
         $received_header = null;
-        $this->response->addHeaderHandler = function(Response $response, $header) use (&$received_header){
+        $this->response->addEventHandler(Response::HEADER_ADDED_EVENT, function(Response $response, $header) use (&$received_header){
             $received_header = $header;
-        };
+        });
 
         $this->response->setResponseType(Response::HTML);
         $this->response->render();
@@ -89,9 +89,9 @@ public function testHtmlHeaders() {
     public function testTextHeaders() {
 
         $received_header = null;
-        $this->response->addHeaderHandler = function(Response $response, $header) use (&$received_header){
+        $this->response->addEventHandler(Response::HEADER_ADDED_EVENT, function(Response $response, $header) use (&$received_header){
             $received_header = $header;
-        };
+        });
 
         $this->response->setResponseType(Response::TEXT);
         $this->response->render();
@@ -105,9 +105,9 @@ public function testSwapHeadersWithContentNotYetRendered() {
 
 
         $received_header = null;
-        $this->response->addHeaderHandler = function(Response $response, $header) use (&$received_header){
+        $this->response->addEventHandler(Response::HEADER_ADDED_EVENT, function(Response $response, $header) use (&$received_header){
             $received_header = $header;
-        };
+        });
 
         $this->response->setResponseType(Response::HTML);
 
@@ -125,9 +125,9 @@ public function testSwapHeadersWithContentRendered() {
         $this->setExpectedException('RESTful\Exception\Response\CanNotSwapResponseType');
 
         $received_header = null;
-        $this->response->addHeaderHandler = function(Response $response, $header) use (&$received_header){
+        $this->response->addEventHandler(Response::HEADER_ADDED_EVENT, function(Response $response, $header) use (&$received_header){
             $received_header = $header;
-        };
+        });
 
         $this->response->setResponseType(Response::HTML);
         $this->response->render();