Change urls params interpolation syntax

evaisse · Jul 21, 2015 · ccfc9bf · ccfc9bf
1 parent 36465c5
commit ccfc9bf
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -30,18 +30,20 @@ Get the simple API
         // handle errors
     }
 
-Easy routing
+Easy routing with replacement syntax (similar to php frameworks like symfony2/laravel)
 
-    $data = $http->POST('http://httpbin.org/status/:code', array(
+    $data = $http->GET('http://httpbin.org/status/{code}', array(
         "code" => 200
     ));
+    // will call http://httpbin.org/status/200
 
-    $data = $http->POST('http://httpbin.org/status/:code', array(
+    $data = $http->GET('http://httpbin.org/status/{code}', array(
         "code" => 200,
         "foo" => "bar" 
     ));
     // will call http://httpbin.org/status/200?foo=bar
-
+
+
 
 
 Complete API

diff --git a/Service/Helper.php b/Service/Helper.php
@@ -165,12 +165,15 @@ public function prepare($method, $url, $parameters = array(), $cookies = array()
      */
     public function transformUrl($urlPattern, array $parameters = array())
     {
-        if (empty($parameters) || !preg_match('/:[a-z]/', $urlPattern)) {
+        if (empty($parameters)
+            || !preg_match('/\{[a-z+][a-z0-9_]+\}/i', $urlPattern)
+        ) {
             return array($urlPattern, $parameters); // no need to transform plain uri
         }
 
         foreach ($parameters as $key => $value) {
             $urlPattern = str_replace(":$key", $value, $urlPattern);
+            $urlPattern = str_replace('{' . $key . '}', $value, $urlPattern);
             unset($parameters[$key]);
         }
 

diff --git a/Tests/Unit/ExceptionsTest.php b/Tests/Unit/ExceptionsTest.php
@@ -90,7 +90,7 @@ public function testResultWithClientErrorException($code)
     {
         list($helper, $httpKernel, $container) = $this->createContext();
 
-        $stmt = $helper->prepare('GET', 'http://httpbin.org/status/:code', array(
+        $stmt = $helper->prepare('GET', 'http://httpbin.org/status/{code}', array(
             'code' => $code,
         ));
 
@@ -111,7 +111,7 @@ public function testResultWithServerErrorException($code)
     {
         list($helper, $httpKernel, $container) = $this->createContext();
 
-        $stmt = $helper->prepare('GET', 'http://httpbin.org/status/:code', array(
+        $stmt = $helper->prepare('GET', 'http://httpbin.org/status/{code}', array(
             'code' => $code,
         ));
 
@@ -133,7 +133,7 @@ public function testExpectedInstancesOfExceptions($code, $cls)
     {
         list($helper, $httpKernel, $container) = $this->createContext();
 
-        $stmt = $helper->prepare('GET', 'http://httpbin.org/status/:code', array(
+        $stmt = $helper->prepare('GET', 'http://httpbin.org/status/{code}', array(
             'code' => $code,
         ));
 

diff --git a/Tests/Unit/PromisesTest.php b/Tests/Unit/PromisesTest.php
@@ -33,7 +33,7 @@ public function testPromises($code, $expectedResults)
     {
         list($helper, $httpKernel, $container) = $this->createContext();
 
-        $stmt = $helper->prepare("GET", 'https://httpbin.org/status/:code', array(
+        $stmt = $helper->prepare("GET", 'https://httpbin.org/status/{code}', array(
             'code' => $code
         ));
 
@@ -67,7 +67,7 @@ public function testProxiedPromises($code, $expectedResults)
     {
         list($helper, $httpKernel, $container) = $this->createContext();
 
-        $stmt = $helper->prepare("GET", 'https://httpbin.org/status/:code', array(
+        $stmt = $helper->prepare("GET", 'https://httpbin.org/status/{code}', array(
             'code' => $code
         ));
 
@@ -136,7 +136,7 @@ public function testPromisesValues($code, $events)
     {
         list($helper, $httpKernel, $container) = $this->createContext();
 
-        $stmt = $helper->prepare("GET", 'https://httpbin.org/status/:code', [
+        $stmt = $helper->prepare("GET", 'https://httpbin.org/status/{code}', [
             'code' => $code,
         ]);
 
@@ -174,7 +174,7 @@ public function testPromisesAfterwards($code, $events)
     {
         list($helper, $httpKernel, $container) = $this->createContext();
 
-        $stmt = $helper->prepare("GET", 'https://httpbin.org/status/:code', [
+        $stmt = $helper->prepare("GET", 'https://httpbin.org/status/{code}', [
             'code' => $code,
         ]);
 
@@ -214,7 +214,7 @@ public function testAllPromisesFulfillsMultipleTimesAfterwards($code, $events)
     {
         list($helper, $httpKernel, $container) = $this->createContext();
 
-        $stmt = $helper->prepare("GET", 'https://httpbin.org/status/:code', [
+        $stmt = $helper->prepare("GET", 'https://httpbin.org/status/{code}', [
             'code' => $code,
         ]);
 

diff --git a/Tests/Unit/SimpleRoutingTest.php b/Tests/Unit/SimpleRoutingTest.php
@@ -36,7 +36,7 @@ public function testCallsWithRouteArguments($code)
             "another" => __FILE__
         ];
 
-        $statement = $helper->prepare("GET", 'http://httpbin.org/status/:code', $args);
+        $statement = $helper->prepare("GET", 'http://httpbin.org/status/{code}', $args);
         $request = $statement->getRequest();
 
         $statement->execute($httpKernel);
@@ -45,4 +45,5 @@ public function testCallsWithRouteArguments($code)
 
     }
 
+
 }