[WIP] Client / HttpClient decoupling for Guzzle integration

lib/Github/Api/AbstractApi.php

@@ -35,7 +35,7 @@ public function configure()
      */
     protected function get($path, array $parameters = array(), $requestHeaders = array())
     {
-        $response = $this->client->getHttpClient()->get($path, $parameters, $requestHeaders);
+        $response = $this->client->executeCommand('GET', $path, $parameters, $requestHeaders);
 
         return $response->getContent();
     }
@@ -45,7 +45,7 @@ protected function get($path, array $parameters = array(), $requestHeaders = arr
      */
     protected function post($path, array $parameters = array(), $requestHeaders = array())
     {
-        $response = $this->client->getHttpClient()->post($path, $parameters, $requestHeaders);
+        $response = $this->client->executeCommand('POST', $path, $parameters, $requestHeaders);
 
         return $response->getContent();
     }
@@ -55,7 +55,7 @@ protected function post($path, array $parameters = array(), $requestHeaders = ar
      */
     protected function patch($path, array $parameters = array(), $requestHeaders = array())
     {
-        $response = $this->client->getHttpClient()->patch($path, $parameters, $requestHeaders);
+        $response = $this->client->executeCommand('PATCH', $path, $parameters, $requestHeaders);
 
         return $response->getContent();
     }
@@ -65,7 +65,7 @@ protected function patch($path, array $parameters = array(), $requestHeaders = a
      */
     protected function put($path, array $parameters = array(), $requestHeaders = array())
     {
-        $response = $this->client->getHttpClient()->put($path, $parameters, $requestHeaders);
+        $response = $this->client->executeCommand('PUT', $path, $parameters, $requestHeaders);
 
         return $response->getContent();
     }
@@ -75,7 +75,7 @@ protected function put($path, array $parameters = array(), $requestHeaders = arr
      */
     protected function delete($path, array $parameters = array(), $requestHeaders = array())
     {
-        $response = $this->client->getHttpClient()->delete($path, $parameters, $requestHeaders);
+        $response = $this->client->executeCommand('DELETE', $path, $parameters, $requestHeaders);
 
         return $response->getContent();
     }

lib/Github/Client.php

@@ -2,14 +2,10 @@
 
 namespace Github;
 
-use Buzz\Client\Curl;
-use Buzz\Client\ClientInterface;
-
 use Github\Api\ApiInterface;
 use Github\Exception\InvalidArgumentException;
-use Github\HttpClient\HttpClient;
+use Github\HttpClient\Adapter\Buzz\HttpClient;
 use Github\HttpClient\HttpClientInterface;
-use Github\HttpClient\Listener\AuthListener;
 
 /**
  * Simple yet very cool PHP GitHub client
@@ -53,7 +49,6 @@ class Client
         'user_agent'  => 'php-github-api (http://github.com/KnpLabs/php-github-api)',
         'timeout'     => 10,
 
-        'api_limit'   => 5000,
         'api_version' => 'beta',
 
         'cache_dir'   => null
@@ -160,15 +155,35 @@ public function authenticate($tokenOrLogin, $password = null, $authMethod = null
             $password   = null;
         }
 
-        $this->httpClient->addListener(
-            new AuthListener(
-                $authMethod,
-                array(
-                    'tokenOrLogin' => $tokenOrLogin,
-                    'password'     => $password
-                )
-            )
-        );
+        switch ($authMethod) {
+            case Client::AUTH_HTTP_PASSWORD:
+                if (!$tokenOrLogin || !$password) {
+                    throw new InvalidArgumentException('You need to set username with password!');
+                }
+                break;
+            case Client::AUTH_HTTP_TOKEN:
+                if (!$tokenOrLogin) {
+                    throw new InvalidArgumentException('You need to set OAuth token!');
+                }
+                break;
+            case Client::AUTH_URL_CLIENT_ID:
+                if (!$tokenOrLogin || !$password) {
+                    throw new InvalidArgumentException('You need to set client_id and client_secret!');
+                }
+                break;
+            case Client::AUTH_URL_TOKEN:
+                if (!$tokenOrLogin) {
+                    throw new InvalidArgumentException('You need to set OAuth token!');
+                }
+                break;
+        }
+
+        $this->httpClient->authenticate($authMethod, $tokenOrLogin, $password);
+    }
+
+    public function executeCommand($method, $command, $parameters, $headers)
+    {
+        return $this->httpClient->request($command, $parameters, $method, $headers)->getContent();
     }
 
     /**

lib/Github/Exception/InvalidJsonResponse.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Github\Exception;
+
+class InvalidJsonResponse extends RuntimeException
+{
+    private $body;
+
+    public function __construct($body, $code = 0, $previous = null)
+    {
+        $this->body = $body;
+        parent::__construct('Invalid Json Response', $code, $previous);
+    }
+
+    public function getBody()
+    {
+        return $this->body;
+    }
+}

lib/Github/HttpClient/AbstractAdapter.php

@@ -0,0 +1,100 @@
+<?php
+
+namespace Github\HttpClient;
+
+use Github\HttpClient\RequestInterface;
+use Github\HttpClient\ResponseInterface;
+
+abstract class AbstractAdapter implements HttpClientInterface
+{
+    /**
+     * @var RequestInterface
+     */
+    protected $lastRequest;
+
+    /**
+     * @var ResponseInterface
+     */
+    protected $lastResponse;
+
+    /**
+     * @var array
+     */
+    protected $options = array(
+        'base_url'    => 'https://api.github.com/',
+        'user_agent'  => 'php-github-api (http://github.com/KnpLabs/php-github-api)',
+        'timeout'     => 10,
+        'api_version' => 'beta',
+        'cache_dir'   => null
+    );
+    /**
+     * @var array
+     */
+    protected $headers;
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setOption($name, $value)
+    {
+        $this->options[$name] = $value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setHeaders(array $headers)
+    {
+        $this->headers = array_merge($this->headers, $headers);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearHeaders()
+    {
+        $this->headers = array(
+            sprintf('Accept: application/vnd.github.%s+json', $this->options['api_version'])
+        );
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getLastRequest()
+    {
+        return $this->lastRequest;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getLastResponse()
+    {
+        return $this->lastResponse;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAPILimit()
+    {
+        if (!$this->getLastRequest()) {
+            $this->get('/rate_limit');
+        }
+
+        return (int) $this->getLastRequest()->getHeaderAsString('X-RateLimit-Limit');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAPIRemaining()
+    {
+        if (!$this->getLastRequest()) {
+            $this->get('/rate_limit');
+        }
+
+        return (int) $this->getLastRequest()->getHeaderAsString('X-RateLimit-Remaining');
+    }
+}

lib/Github/HttpClient/CachedHttpClient.php → lib/Github/HttpClient/Adapter/Buzz/CachedHttpClient.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Github\HttpClient;
+namespace Github\HttpClient\Adapter\Buzz;
 
 use Buzz\Client\ClientInterface;