Changed to non-B/C approach

Author: nibra

Tests/GithubObjectTest.php

@@ -6,8 +6,11 @@
 
 namespace Joomla\Github\Tests;
 
+use Joomla\Github\AbstractGithubObject;
 use Joomla\Github\Tests\Stub\GitHubTestCase;
 use Joomla\Github\Tests\Stub\ObjectMock;
+use Joomla\Github\Tests\Stub\TransportMock;
+use Joomla\Http\Http;
 
 /**
  * Test class for Joomla\Github\Object.
@@ -17,11 +20,17 @@
 class GithubObjectTest extends GitHubTestCase
 {
 	/**
-	 * @var    ObjectMock  Object under test.
+	 * @var    AbstractGithubObject  Object under test.
 	 * @since  1.0
 	 */
 	protected $object;
 
+	/**
+	 * @var    Http  The HTTP client
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $client;
+
 	/**
 	 * Sets up the fixture, for example, opens a network connection.
 	 * This method is called before a test is executed.
@@ -34,6 +43,7 @@ protected function setUp()
 	{
 		parent::setUp();
 
+		$this->client = new Http(array(), new TransportMock());
 		$this->object = new ObjectMock($this->options, $this->client);
 	}
 
@@ -74,12 +84,8 @@ public function testFetchUrl($apiUrl, $path, $page, $limit, $expected)
 
 		self::assertEquals(
 			$expected,
-			$this->object->fetchUrl($path, $page, $limit)
-		);
-
-		self::assertEquals(
-			array(),
-			$this->object->authHeader()
+			$this->object->fetchUrl($path, $page, $limit),
+			'URL is not as expected.'
 		);
 	}
 
@@ -97,9 +103,10 @@ public function testFetchUrlBasicAuth()
 		$this->options->set('api.username', 'MyTestUser');
 		$this->options->set('api.password', 'MyTestPass');
 
-		$this->assertThat(
+		self::assertEquals(
+			'https://MyTestUser:MyTestPass@api.github.com/gists',
 			$this->object->fetchUrl('/gists', 0, 0),
-			$this->equalTo('https://MyTestUser:MyTestPass@api.github.com/gists')
+			'URL is not as expected.'
 		);
 	}
 
@@ -114,14 +121,18 @@ public function testFetchUrlToken()
 
 		$this->options->set('gh.token', 'MyTestToken');
 
+		$options = clone $this->options;
+
 		self::assertEquals(
 			'https://api.github.com/gists',
-			$this->object->fetchUrl('/gists', 0, 0)
+			$this->object->fetchUrl('/gists', 0, 0),
+			'URL is not as expected.'
 		);
-
+		
 		self::assertEquals(
-			array('Authorization: MyTestToken'),
-			$this->object->authHeader()
+			array('Authorization' => 'token MyTestToken'),
+			$this->client->getOption('headers'),
+			'Token should bhe propagated as a header.'
 		);
 	}
 }

Tests/Stub/ObjectMock.php

@@ -32,21 +32,4 @@ public function fetchUrl($path, $page = 0, $limit = 0)
 	{
 		return parent::fetchUrl($path, $page, $limit);
 	}
-
-	/**
-	 * Returns the Authorization header, if required.
-	 *
-	 * If the options passed to the constructor contain a value for `gh.token`,
-	 * an array with a suitable Authorization header is returned, an empty array
-	 * otherwise.
-	 *
-	 * @return  array    Authorization header if set in options.
-	 *
-	 * @since   1.8.0
-	 */
-	public function authHeader()
-	{
-		return parent::authHeader();
-	}
-
 }

Tests/Stub/TransportMock.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Joomla\Github\Tests\Stub;
+
+class TransportMock implements \Joomla\Http\TransportInterface
+{
+	public function request($method, \Joomla\Uri\UriInterface $uri, $data = null, array $headers = array(), $timeout = null, $userAgent = null)
+	{
+		// TODO: Implement request() method.
+	}
+
+	public static function isSupported()
+	{
+		// TODO: Implement isSupported() method.
+	}
+}

src/AbstractGithubObject.php

@@ -9,7 +9,7 @@
 namespace Joomla\Github;
 
 use Joomla\Http\Exception\UnexpectedResponseException;
-use Joomla\Http\Http as BaseHttp;
+use Joomla\Http\Http;
 use Joomla\Http\Response;
 use Joomla\Registry\Registry;
 use Joomla\Uri\Uri;
@@ -82,15 +82,27 @@ abstract class AbstractGithubObject
 	 * Constructor.
 	 *
 	 * @param   Registry  $options  GitHub options object.
-	 * @param   BaseHttp  $client   The HTTP client object.
+	 * @param   Http      $client   The HTTP client object.
 	 *
 	 * @since   1.0
 	 */
-	public function __construct(Registry $options = null, BaseHttp $client = null)
+	public function __construct(Registry $options = null, Http $client = null)
 	{
 		$this->options = $options ?: new Registry;
 		$this->client  = $client ?: new Http($this->options);
 
+		// Make sure the user agent string is defined.
+		if (!isset($this->options['userAgent']))
+		{
+			$this->options['userAgent'] = 'JGitHub/2.0';
+		}
+
+		// Set the default timeout to 120 seconds.
+		if (!isset($this->options['timeout']))
+		{
+			$this->options['timeout'] = 120;
+		}
+
 		$this->package = \get_class($this);
 		$this->package = substr($this->package, strrpos($this->package, '\\') + 1);
 	}
@@ -114,7 +126,18 @@ protected function fetchUrl($path, $page = 0, $limit = 0)
 		// Get a new Uri object focusing the api url and given path.
 		$uri = new Uri($this->options->get('api.url') . $path);
 
-		if (!$this->options->get('gh.token', false))
+		if ($this->options->get('gh.token', false))
+		{
+			// Use oAuth authentication
+			$headers = $this->client->getOption('headers', array());
+
+			if (!isset($headers['Authorization']))
+			{
+				$headers['Authorization'] = 'token ' . $this->options->get('gh.token');
+				$this->client->setOption('headers', $headers);
+			}
+		}
+		else
 		{
 			// Use basic authentication
 			if ($this->options->get('api.username', false))
@@ -143,27 +166,6 @@ protected function fetchUrl($path, $page = 0, $limit = 0)
 		return (string) $uri;
 	}
 
-	/**
-	 * Returns the Authorization header, if required.
-	 *
-	 * If the options passed to the constructor contain a value for `gh.token`,
-	 * an array with a suitable Authorization header is returned, an empty array
-	 * otherwise.
-	 *
-	 * @return  array    Authorization header if set in options.
-	 *
-	 * @since   1.8.0
-	 */
-	protected function authHeader()
-	{
-		if ($this->options->get('gh.token', false))
-		{
-			return array('Authorization: ' . $this->options->get('gh.token'));
-		}
-
-		return array();
-	}
-
 	/**
 	 * Process the response and decode it.
 	 *
@@ -172,8 +174,8 @@ protected function authHeader()
 	 *
 	 * @return  mixed
 	 *
-	 * @throws  UnexpectedResponseException
 	 * @since   1.0
+	 * @throws  UnexpectedResponseException
 	 */
 	protected function processResponse(Response $response, $expectedCode = 200)
 	{