Merge branch 'release/1.4.0'

basvandorst · Jun 16, 2020 · 72fb83a · 72fb83a
2 parents 70a1d4a + 925f034
commit 72fb83a
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Use composer to install this StravaPHP package.
 ```
 {
     "require": {
-        "basvandorst/stravaphp": "1.3.1"
+        "basvandorst/stravaphp": "1.4.0"
     }
 }
 ```
@@ -195,6 +195,8 @@ $client->getClub($id);
 $client->getClubMembers($id, $page = null, $per_page = null);
 $client->getClubActivities($id, $page = null, $per_page = null);
 $client->getRoute($id);
+$client->getRouteAsGPX($id);
+$client->getRouteAsTCX($id);
 $client->getSegment($id);
 $client->getSegmentLeaderboard($id, $gender = null, $age_group = null, $weight_class = null, $following = null, $club_id = null, $date_range = null, $page = null, $per_page = null);
 $client->getSegmentExplorer($bounds, $activity_type = 'riding', $min_cat = null, $max_cat = null);

diff --git a/src/Strava/API/Client.php b/src/Strava/API/Client.php
@@ -630,6 +630,40 @@ public function getRoute($id)
         }
     }
 
+    /**
+     * Get route as GPX.
+     *
+     * @link    https://developers.strava.com/docs/reference/#api-Routes-getRouteAsGPX
+     * @param   int $id
+     * @return  string
+     * @throws  Exception
+     */
+    public function getRouteAsGPX($id)
+    {
+        try {
+            return $this->service->getRouteAsGPX($id);
+        } catch (ServerException $e) {
+            throw new ClientException('[SERVICE] ' . $e->getMessage());
+        }
+    }
+
+    /**
+     * Get route as TCX.
+     *
+     * @link    https://developers.strava.com/docs/reference/#api-Routes-getRouteAsTCX
+     * @param   int $id
+     * @return  string
+     * @throws  Exception
+     */
+    public function getRouteAsTCX($id)
+    {
+        try {
+            return $this->service->getRouteAsTCX($id);
+        } catch (ServerException $e) {
+            throw new ClientException('[SERVICE] ' . $e->getMessage());
+        }
+    }
+
     /**
      * Retrieve a segment
      *

diff --git a/src/Strava/API/Service/REST.php b/src/Strava/API/Service/REST.php
@@ -5,7 +5,6 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Response;
 
-
 /**
  * Strava REST Service
  *
@@ -56,6 +55,7 @@ private function getToken()
     private function getResult($response)
     {
         $status = $response->getStatusCode();
+
         if ($status == 200 || $status == 201) {
             return json_decode($response->getBody(), JSON_PRETTY_PRINT);
         } else {
@@ -416,6 +416,20 @@ public function getRoute($id)
         return $this->getResponse('GET', $path, $parameters);
     }
 
+    public function getRouteAsGPX($id)
+    {
+        $path = 'routes/' . $id . '/export_gpx';
+        $parameters['query'] = ['access_token' => $this->getToken()];
+        return $this->getResponse('GET', $path, $parameters);
+    }
+
+    public function getRouteAsTCX($id)
+    {
+        $path = 'routes/' . $id . '/export_tcx';
+        $parameters['query'] = ['access_token' => $this->getToken()];
+        return $this->getResponse('GET', $path, $parameters);
+    }
+
     public function getSegment($id)
     {
         $path = 'segments/' . $id;

diff --git a/src/Strava/API/Service/ServiceInterface.php b/src/Strava/API/Service/ServiceInterface.php
@@ -5,7 +5,7 @@
 use GuzzleHttp\Exception\ClientException;
 
 /**
- * Service interace.
+ * Service interface.
  * Just to make sure we can trust the method signatures of all the
  * service classes.
  *
@@ -230,6 +230,16 @@ public function leaveClub($id);
      */
     public function getRoute($id);
 
+    /**
+     * @param $id
+     */
+    public function getRouteAsGPX($id);
+
+    /**
+     * @param $id
+     */
+    public function getRouteAsTCX($id);
+
     /**
      * @param int $id
      */

diff --git a/src/Strava/API/Service/Stub.php b/src/Strava/API/Service/Stub.php
@@ -207,6 +207,18 @@ public function getRoute($id)
         $json = '{"response": 1}';
         return $this->format($json);
     }
+
+    public function getRouteAsGPX($id)
+    {
+        $gpx = '<?xml version="1.0" encoding="UTF-8"?><gpx creator="StravaGPX"/>';
+        return $gpx;
+    }
+
+    public function getRouteAsTCX($id)
+    {
+        $tcx = '<?xml version="1.0" encoding="UTF-8"?><TrainingCenterDatabase/>';
+        return $tcx;
+    }
 
     public function getSegment($id)
     {

diff --git a/tests/Strava/API/Service/RESTTest.php b/tests/Strava/API/Service/RESTTest.php
@@ -499,6 +499,30 @@ public function testGetRoute()
             $this->assertArrayHasKey('response', $output);
         }
 
+        public function testGetRouteAsGPX()
+        {
+            $restMock = $this->getRestMock();
+            $restMock->expects($this->once())->method('get')
+                ->with($this->equalTo('routes/1234/export_gpx'))
+                ->will($this->returnValue('<?xml version="1.0" encoding="UTF-8"?><gpx creator="StravaGPX"/>'));
+
+            $service = new \Strava\API\Service\REST('TOKEN', $restMock);
+            $output = $service->getRouteAsGPX(1234);
+            $this->assertInternalType('string', $output);
+        }
+
+        public function testGetRouteAsTCX()
+        {
+            $restMock = $this->getRestMock();
+            $restMock->expects($this->once())->method('get')
+                ->with($this->equalTo('routes/1234/export_tcx'))
+                ->will($this->returnValue('<?xml version="1.0" encoding="UTF-8"?><TrainingCenterDatabase/>'));
+
+            $service = new \Strava\API\Service\REST('TOKEN', $restMock);
+            $output = $service->getRouteAsTCX(1234);
+            $this->assertInternalType('string', $output);
+        }
+
         public function testGetSegment()
         {
             $restMock = $this->getRestMock();

diff --git a/tests/Strava/API/Service/StubTest.php b/tests/Strava/API/Service/StubTest.php
@@ -233,6 +233,19 @@ public function testGetRoute()
         $this->assertTrue(is_array($output));
     }
 
+    public function testGetRouteAsGPX()
+    {
+        $service = new Strava\API\Service\Stub();
+        $output = $service->getRouteAsGPX(1234);
+        $this->assertTrue(is_string($output));
+    }
+
+    public function testGetRouteAsTCX()
+    {
+        $service = new Strava\API\Service\Stub();
+        $output = $service->getRouteAsTCX(1234);
+        $this->assertTrue(is_string($output));
+    }
 
     public function testGetSegment()
     {