Merge pull request #226 from lrlopez/fix-get-archive

Fixed archive download by reference

Author: pilot

lib/Github/Api/Repository/Contents.php

@@ -225,9 +225,8 @@ public function archive($username, $repository, $format, $reference = null)
             $format = 'tarball';
         }
 
-        return $this->get('repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/'.rawurlencode($format), array(
-            'ref' => $reference
-        ));
+        return $this->get('repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/'.rawurlencode($format).
+            ((null !== $reference) ? ('/'.rawurlencode($reference)) : ''));
     }
 
     /**

test/Github/Tests/Api/Repository/ContentsTest.php

@@ -233,7 +233,7 @@ public function shouldFetchTarballArchiveWhenFormatNotRecognized()
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('get')
-            ->with('repos/KnpLabs/php-github-api/tarball', array('ref' => null))
+            ->with('repos/KnpLabs/php-github-api/tarball')
             ->will($this->returnValue($expectedValue));
 
         $this->assertEquals($expectedValue, $api->archive('KnpLabs', 'php-github-api', 'someFormat'));
@@ -249,7 +249,7 @@ public function shouldFetchTarballArchive()
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('get')
-            ->with('repos/KnpLabs/php-github-api/tarball', array('ref' => null))
+            ->with('repos/KnpLabs/php-github-api/tarball')
             ->will($this->returnValue($expectedValue));
 
         $this->assertEquals($expectedValue, $api->archive('KnpLabs', 'php-github-api', 'tarball'));
@@ -265,12 +265,28 @@ public function shouldFetchZipballArchive()
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('get')
-            ->with('repos/KnpLabs/php-github-api/zipball', array('ref' => null))
+            ->with('repos/KnpLabs/php-github-api/zipball')
             ->will($this->returnValue($expectedValue));
 
         $this->assertEquals($expectedValue, $api->archive('KnpLabs', 'php-github-api', 'zipball'));
     }
 
+    /**
+     * @test
+     */
+    public function shouldFetchZipballArchiveByReference()
+    {
+        $expectedValue = 'zip';
+
+        $api = $this->getApiMock();
+        $api->expects($this->once())
+            ->method('get')
+            ->with('repos/KnpLabs/php-github-api/zipball/master')
+            ->will($this->returnValue($expectedValue));
+
+        $this->assertEquals($expectedValue, $api->archive('KnpLabs', 'php-github-api', 'zipball', 'master'));
+    }
+
     /**
      * @test
      */