Refactor ':' parameter to strategy class

Author: Niels Theen

src/Paramaters/Label/Colon.php

@@ -0,0 +1,26 @@
+<?php
+namespace Legionth\React\Http\Rest\Paramaters\Label;
+
+class Colon implements Strategy
+{
+    const IDENTIFIER = ':';
+
+    public function extractParametersFromPath(array $pathAsArray, array $requestPathArray) : array
+    {
+        $result = array();
+        foreach ($pathAsArray as $id => $valueName) {
+            $position = strpos($valueName, self::IDENTIFIER);
+            if (0 === $position) {
+                $valueName = substr($valueName, 1);
+                $result[$valueName] = $requestPathArray[$id];
+            }
+        }
+
+        return $result;
+    }
+
+    public function getFirstIdentifier() : string
+    {
+        return self::IDENTIFIER;
+    }
+}

src/Paramaters/Label/Strategy.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Legionth\React\Http\Rest\Paramaters\Label;
+
+interface Strategy
+{
+    public function extractParametersFromPath(array $pathAsArray, array $requestPathArray) : array;
+
+    public function getFirstIdentifier() : string;
+}

src/Server.php

@@ -2,26 +2,45 @@
 
 namespace Legionth\React\Http\Rest;
 
+use Legionth\React\Http\Rest\Paramaters\Label\Colon;
+use Legionth\React\Http\Rest\Paramaters\Label\Strategy;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use React\Socket\ServerInterface;
 use RingCentral\Psr7\Response;
 
 class Server
 {
+
+    const DOUBLE_POINT = ':';
+    const CURLY_BRACKETS = '{}';
+    const SQUARE_BRACKETS = '[]';
+
     /**
      * @var array
      */
     private $functions;
 
+    /**
+     * @var Strategy
+     */
+    private $strategy;
+
     /**
      * @param ServerInterface $socket
      * @param callable|null $callback
+     * @param string $strategy
      */
-    public function listen(ServerInterface $socket, callable $callback = null)
+    public function listen(ServerInterface $socket, callable $callback = null, Strategy $strategy = null)
     {
         $middleWareFunctions = array();
 
+        if ($strategy === null) {
+            $strategy = new Colon();
+        }
+
+        $this->strategy = $strategy;
+
         foreach ($this->functions as $httpMethod => $pathFunctionArray) {
             foreach ($pathFunctionArray as $path => $function) {
                 $middleWareFunctions[] = $this->createRestfulFunction($httpMethod, $path, $function);
@@ -99,19 +118,11 @@ private function createRestfulFunction($httpMethod, $path, $function)
                     return $function($request, $next);
                 }
 
-                if (false === strpos($path, ':')) {
+                if (false === strpos($path, $this->strategy->getFirstIdentifier())) {
                     return $next($request);
                 }
 
-                $argument = array();
-
-                foreach ($pathArray as $id => $valueName) {
-                    $position = strpos($valueName, ':');
-                    if (0 === $position) {
-                        $valueName = substr($valueName, 1);
-                        $argument[$valueName] = $requestPathArray[$id];
-                    }
-                }
+                $argument = $this->strategy->extractParametersFromPath($pathArray, $requestPathArray);
 
                 return $function($request, $next, $argument);
             }

tests/ColonStrategyTest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Tests\Legionth\React\Http\Rest;
+
+
+use Legionth\React\Http\Rest\Paramaters\Label\Colon;
+
+class ColonStrategyTest extends TestCase
+{
+    public function testColonWillBeExtracted()
+    {
+        $colonStrategy = new Colon();
+        $pathArray = array('say', ':word');
+        $requestArray = array('say', 'hello');
+
+        $result = $colonStrategy->extractParametersFromPath($pathArray, $requestArray);
+
+        $this->assertEquals(array('word' => 'hello'), $result);
+    }
+
+    public function testNothingWillBeExtracted()
+    {
+        $colonStrategy = new Colon();
+        $pathArray = array('say', 'word');
+        $requestArray = array('say', 'hello');
+
+        $result = $colonStrategy->extractParametersFromPath($pathArray, $requestArray);
+
+        $this->assertEquals(array(), $result);
+    }
+}