Merged in freshleafmedia/bitbucket-api/feature/src-api-2.0 (pull request #45)

Updates Src get/raw to use bitbucket API 2.0

Author: Joe Freshleaf

docs/examples/repositories/src.md

@@ -20,7 +20,7 @@ $src->get($account_name, $repo_slug, '1e10ffe', 'app/models/');
 ### Get raw content of an individual file:
 
 ```php
-$src->raw($account_name, $repo_slug, '1e10ffe', 'app/models/core.php');
+$src->get($account_name, $repo_slug, '1e10ffe', 'app/models/core.php');
 ```
 
 ### Create file in repository

lib/Bitbucket/API/Repositories/Src.php

@@ -24,7 +24,7 @@
 class Src extends API\Api
 {
     /**
-     * Get a list of repo source
+     * Get raw content of an individual file, or the contents of a directory
      *
      * @access public
      * @param  string           $account  The team or individual account owning the repository.
@@ -35,28 +35,11 @@ class Src extends API\Api
      */
     public function get($account, $repo, $revision, $path)
     {
-        return $this->requestGet(
+        return $this->getClient()->setApiVersion("2.0")->get(
             sprintf('repositories/%s/%s/src/%s/%s', $account, $repo, $revision, $path)
         );
     }
 
-    /**
-     * Get raw content of an individual file
-     *
-     * @access public
-     * @param  string           $account  The team or individual account owning the repository.
-     * @param  string           $repo     The repository identifier.
-     * @param  string           $revision A value representing the revision or branch to list.
-     * @param  string           $path     The path can be a filename or a directory path.
-     * @return MessageInterface
-     */
-    public function raw($account, $repo, $revision, $path)
-    {
-        return $this->requestGet(
-            sprintf('repositories/%s/%s/raw/%s/%s', $account, $repo, $revision, $path)
-        );
-    }
-
     /**
      * Create file in repository
      *      $params contains the files to create, the key is the file (with path) to create and the value is the

test/Bitbucket/Tests/API/Repositories/SrcTest.php

@@ -10,33 +10,35 @@ class SrcTest extends Tests\TestCase
     public function testListRepoSrc()
     {
         $endpoint       = 'repositories/gentle/eof/src/1e10ffe//lib';
-        $expectedResult = json_encode('dummy');
+        $expectedResult = $this->fakeResponse(array('dummy'));
 
-        $src = $this->getApiMock('Bitbucket\API\Repositories\Src');
-        $src->expects($this->once())
-            ->method('requestGet')
+        $client = $this->getHttpClientMock();
+        $client->expects($this->once())
+            ->method('get')
             ->with($endpoint)
             ->will( $this->returnValue($expectedResult) );
 
         /** @var $src \Bitbucket\API\Repositories\Src */
+        $src    = $this->getClassMock('Bitbucket\API\Repositories\Src', $client);
         $actual = $src->get('gentle', 'eof', '1e10ffe', '/lib');
 
         $this->assertEquals($expectedResult, $actual);
     }
 
     public function testSrcGetRawContent()
     {
-        $endpoint       = 'repositories/gentle/eof/raw/1e10ffe/lib/Gentle/Bitbucket/API/Repositories/Services.php';
-        $expectedResult = json_encode('dummy');
+        $endpoint       = 'repositories/gentle/eof/src/1e10ffe/lib/Gentle/Bitbucket/API/Repositories/Services.php';
+        $expectedResult = $this->fakeResponse(array('dummy'));
 
-        $src = $this->getApiMock('Bitbucket\API\Repositories\Src');
-        $src->expects($this->once())
-            ->method('requestGet')
+        $client = $this->getHttpClientMock();
+        $client->expects($this->once())
+            ->method('get')
             ->with($endpoint)
             ->will( $this->returnValue($expectedResult) );
 
         /** @var $src \Bitbucket\API\Repositories\Src */
-        $actual = $src->raw('gentle', 'eof', '1e10ffe', 'lib/Gentle/Bitbucket/API/Repositories/Services.php');
+        $src    = $this->getClassMock('Bitbucket\API\Repositories\Src', $client);
+        $actual = $src->get('gentle', 'eof', '1e10ffe', 'lib/Gentle/Bitbucket/API/Repositories/Services.php');
 
         $this->assertEquals($expectedResult, $actual);
     }
@@ -92,4 +94,4 @@ public function testSrcCreateBranch()
 
         $src->create('gentle', 'eof', $params);
     }
-}
+}