Fixed duplicated content of API calls to repository contents

Author: stloyd

lib/Github/Api/Repo.php

@@ -133,6 +133,17 @@ public function commits()
         return new Commits($this->client);
     }
 
+    /**
+     * Manage the content of a repository
+     * @link http://developer.github.com/v3/repos/contents/
+     *
+     * @return Contents
+     */
+    public function contents()
+    {
+        return new Contents($this->client);
+    }
+
     /**
      * Manage the deploy keys of a repository
      * @link http://developer.github.com/v3/repos/keys/
@@ -270,21 +281,6 @@ public function teams($username, $repository)
         return $this->get('repos/'.urlencode($username).'/'.urlencode($repository).'/teams');
     }
 
-    /**
-     * Get contents of any file or directory in a repository
-     * @link http://developer.github.com/v3/repos/contents/
-     *
-     * @param  string  $username         the user who owns the repository
-     * @param  string  $repository       the name of the repository
-     * @param  string  $path             path to file or directory
-     *
-     * @return array                     information for file | information for each item in directory
-     */
-    public function contents($username, $repository, $path)
-    {
-        return $this->get('repos/'.urlencode($username).'/'.urlencode($repository).'/contents/'.$path);
-    }
-
     /**
      * Get the downloads for selected repository
      * @link http://developer.github.com/v3/repos/downloads/#list-downloads-for-a-repository

lib/Github/Api/Repository/Contents.php

@@ -11,11 +11,32 @@
  */
 class Contents extends AbstractApi
 {
+    /**
+     * Get content of README file in a repository
+     * @link http://developer.github.com/v3/repos/contents/
+     *
+     * @param  string  $username         the user who owns the repository
+     * @param  string  $repository       the name of the repository
+     * @param  string  $reference        reference to a branch or commit
+     *
+     * @return array                     information for README file
+     */
     public function readme($username, $repository, $reference = null)
     {
         return $this->show($username, $repository, 'readme', $reference);
     }
 
+    /**
+     * Get contents of any file or directory in a repository
+     * @link http://developer.github.com/v3/repos/contents/
+     *
+     * @param  string  $username         the user who owns the repository
+     * @param  string  $repository       the name of the repository
+     * @param  string  $path             path to file or directory
+     * @param  string  $reference        reference to a branch or commit
+     *
+     * @return array                     information for file | information for each item in directory
+     */
     public function show($username, $repository, $path = null, $reference = null)
     {
         $url = 'repos/'.urlencode($username).'/'.urlencode($repository).'/contents';
@@ -28,6 +49,17 @@ public function show($username, $repository, $path = null, $reference = null)
         ));
     }
 
+    /**
+     * Get content of archives in a repository
+     * @link http://developer.github.com/v3/repos/contents/
+     *
+     * @param  string  $username         the user who owns the repository
+     * @param  string  $repository       the name of the repository
+     * @param  string  $format           format of archive: tarball or zipball
+     * @param  string  $reference        reference to a branch or commit
+     *
+     * @return array                     information for archives
+     */
     public function archive($username, $repository, $format, $reference = null)
     {
         if (!in_array($format, array('tarball', 'zipball'))) {

test/Github/Tests/Api/RepoTest.php

@@ -207,22 +207,6 @@ public function shouldGetRepositoryTeams()
         $this->assertEquals($expectedArray, $api->teams('KnpLabs', 'php-github-api'));
     }
 
-    /**
-     * @test
-     */
-    public function shouldGetContentsForPathFromRepository()
-    {
-        $expectedArray = 'some content';
-
-        $api = $this->getApiMock();
-        $api->expects($this->once())
-            ->method('get')
-            ->with('repos/KnpLabs/php-github-api/contents/path/in/repo')
-            ->will($this->returnValue($expectedArray));
-
-        $this->assertEquals($expectedArray, $api->contents('KnpLabs', 'php-github-api', 'path/in/repo'));
-    }
-
     /**
      * @test
      */
@@ -331,6 +315,16 @@ public function shouldGetCommitsApiObject()
         $this->assertInstanceOf('Github\Api\Repository\Commits', $api->commits());
     }
 
+    /**
+     * @test
+     */
+    public function shouldGetContentsApiObject()
+    {
+        $api = $this->getApiMock();
+
+        $this->assertInstanceOf('Github\Api\Repository\Contents', $api->contents());
+    }
+
     /**
      * @test
      */