Http client adapters

README.md

@@ -50,8 +50,9 @@ Model Usage
 You can also use the library in an object oriented manner.
 
 ```php
-$client = new \Gitlab\Client('http://git.yourdomain.com/api/v3/'); // change here
-$client->authenticate('your_gitlab_token_here', \Gitlab\Client::AUTH_URL_TOKEN); // change here
+$guzzle = new \Gitlab\HttpClient\Adapter\Guzzle4();
+$client = new \Gitlab\Client('http://git.yourdomain.com/api/v3/', $guzzle); // change here
+$client->authenticate('your_gitlab_token_here', \Gitlab\HttpClient\HttpClientInterface::AUTH_URL_TOKEN); // change here
 ```
 
 Creating a new project

composer.json

@@ -21,10 +21,12 @@
 		}
 	],
 	"require": {
-		"php":                ">=5.3.2",
-		"ext-curl":           "*",
-		"kriswallsmith/buzz": ">=0.7"
+		"php":                ">=5.3.2"
 	},
+    "suggest": {
+        "kriswallsmith/buzz": "To use Buzz as the HTTP adapter (~0.7)",
+        "guzzlehttp/guzzle": "To use Guzzle as the HTTP adapter (~3.7, ~4.1)"
+    },
 	"autoload": {
 		"psr-0": { "Gitlab\\": "lib/" }
 	}

lib/Gitlab/Api/AbstractApi.php

@@ -40,7 +40,7 @@ public function configure()
      */
     protected function get($path, array $parameters = array(), $requestHeaders = array())
     {
-        $response = $this->client->getHttpClient()->get($path, $parameters, $requestHeaders);
+        $response = $this->client->get($path, $parameters, $requestHeaders);
 
         return $response->getContent();
     }
@@ -50,7 +50,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->post($path, $parameters, $requestHeaders);
 
         return $response->getContent();
     }
@@ -60,7 +60,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->patch($path, $parameters, $requestHeaders);
 
         return $response->getContent();
     }
@@ -70,7 +70,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->put($path, $parameters, $requestHeaders);
 
         return $response->getContent();
     }
@@ -80,7 +80,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->delete($path, $parameters, $requestHeaders);
 
         return $response->getContent();
     }

lib/Gitlab/Client.php

@@ -2,32 +2,16 @@
 
 namespace Gitlab;
 
-use Buzz\Client\Curl;
-use Buzz\Client\ClientInterface;
-
 use Gitlab\Api\ApiInterface;
 use Gitlab\Exception\InvalidArgumentException;
+use Gitlab\HttpClient\Adapter\AdapterInterface;
 use Gitlab\HttpClient\HttpClient;
-use Gitlab\HttpClient\HttpClientInterface;
-use Gitlab\HttpClient\Listener\AuthListener;
 
 /**
  * Simple API wrapper for Gitlab
  */
 class Client
 {
-    /**
-     * Constant for authentication method. Indicates the default, but deprecated
-     * login with username and token in URL.
-     */
-    const AUTH_URL_TOKEN = 'url_token';
-
-    /**
-     * Constant for authentication method. Indicates the new login method with
-     * with username and token via HTTP Authentication.
-     */
-    const AUTH_HTTP_TOKEN = 'http_token';
-
     /**
      * @var array
      */
@@ -36,10 +20,8 @@ class Client
         'timeout'     => 60
     );
 
-    private $base_url = null;
-
     /**
-     * The Buzz instance used to communicate with Gitlab
+     * The HTTP client instance used to communicate with Gitlab
      *
      * @var HttpClient
      */
@@ -48,17 +30,12 @@ class Client
     /**
      * Instantiate a new Gitlab client
      *
-     * @param string               $baseUrl
-     * @param null|ClientInterface $httpClient Buzz client
+     * @param string           $baseUrl
+     * @param AdapterInterface $adapter
      */
-    public function __construct($baseUrl, ClientInterface $httpClient = null)
+    public function __construct($baseUrl, AdapterInterface $adapter)
     {
-        $httpClient = $httpClient ?: new Curl();
-        $httpClient->setTimeout($this->options['timeout']);
-        $httpClient->setVerifyPeer(false);
-
-        $this->base_url     = $baseUrl;
-        $this->httpClient   = new HttpClient($this->base_url, $this->options, $httpClient);
+        $this->httpClient = new HttpClient($baseUrl, $adapter);
     }
 
     /**
@@ -131,38 +108,32 @@ public function api($name)
      */
     public function authenticate($token, $authMethod = null, $sudo = null)
     {
-        $this->httpClient->addListener(
-            new AuthListener(
-                $authMethod,
-                $token,
-                $sudo
-            )
-        );
+        $this->httpClient->authenticate($token, $authMethod, $sudo);
     }
 
-    /**
-     * @return HttpClient
-     */
-    public function getHttpClient()
+    public function get($path, array $parameters = array(), array $headers = array())
     {
-        return $this->httpClient;
+        return $this->httpClient->get($path, $parameters, $headers);
     }
 
-    /**
-     * @param HttpClientInterface $httpClient
-     */
-    public function setHttpClient(HttpClientInterface $httpClient)
+    public function post($path, array $parameters = array(), array $headers = array())
     {
-        $this->httpClient = $httpClient;
+        return $this->httpClient->post($path, $parameters, $headers);
     }
 
-    public function setBaseUrl($url)
+    public function patch($path, array $parameters = array(), array $headers = array())
     {
-        $this->base_url = $url;
+        return $this->httpClient->patch($path, $parameters, $headers);
     }
-    public function getBaseUrl()
+
+    public function delete($path, array $parameters = array(), array $headers = array())
+    {
+        return $this->httpClient->delete($path, $parameters, $headers);
+    }
+
+    public function put($path, array $parameters = array(), array $headers = array())
     {
-        return $this->base_url;
+        return $this->httpClient->put($path, $parameters, $headers);
     }
 
     /**

lib/Gitlab/HttpClient/Adapter/AdapterInterface.php

@@ -0,0 +1,9 @@
+<?php
+namespace Gitlab\HttpClient\Adapter;
+
+interface AdapterInterface
+{
+    public function request($path, array $parameters = array(), $httpMethod = 'GET', array $headers = array());
+
+    public function authenticate($token, $authMethod, $sudo = null);
+}

lib/Gitlab/HttpClient/Adapter/BuzzAdapter.php

@@ -0,0 +1,119 @@
+<?php
+namespace Gitlab\HttpClient\Adapter;
+
+use Buzz\Client\AbstractClient;
+use Buzz\Client\Curl;
+use Buzz\Listener\ListenerInterface;
+use Gitlab\Exception\ErrorException;
+use Gitlab\Exception\RuntimeException;
+use Gitlab\HttpClient\Listener\AuthListener;
+use Gitlab\HttpClient\Listener\ErrorListener;
+use Gitlab\HttpClient\Message\Request;
+use Gitlab\HttpClient\Message\BuzzResponse;
+
+class BuzzAdapter implements AdapterInterface
+{
+    /**
+     * @var AbstractClient
+     */
+    protected $client;
+
+    /**
+     * @var ListenerInterface[]
+     */
+    protected $listeners = array();
+
+    /**
+     * @param AbstractClient $client
+     */
+    public function __construct(AbstractClient $client = null)
+    {
+        $this->client = $client ?: new Curl();
+
+        $this->addListener(new ErrorListener());
+    }
+
+    /**
+     * @param int $timeout
+     *
+     * @return $this
+     */
+    public function setTimeout($timeout)
+    {
+        $this->client->setTimeout($timeout);
+
+        return $this;
+    }
+
+    /**
+     * @param bool $verify
+     *
+     * @return $this
+     */
+    public function verifyPeer($verify)
+    {
+        $this->client->setVerifyPeer($verify);
+
+        return $this;
+    }
+
+    /**
+     * @param string $path
+     * @param array  $parameters
+     * @param string $httpMethod
+     * @param array  $headers
+     *
+     * @throws ErrorException
+     * @throws RuntimeException
+     *
+     * @return BuzzResponse
+     */
+    public function request($path, array $parameters = array(), $httpMethod = 'GET', array $headers = array())
+    {
+        $request = new Request($httpMethod);
+        $request->setHeaders($headers);
+        $request->fromUrl($path);
+        $request->setContent(http_build_query($parameters));
+
+        $hasListeners = 0 < count($this->listeners);
+        if ($hasListeners) {
+            foreach ($this->listeners as $listener) {
+                $listener->preSend($request);
+            }
+        }
+
+        $response = new BuzzResponse();
+
+        try {
+            $this->client->send($request, $response);
+        } catch (\LogicException $e) {
+            throw new ErrorException($e->getMessage(), $e->getCode(), $e);
+        } catch (\RuntimeException $e) {
+            throw new RuntimeException($e->getMessage(), $e->getCode(), $e);
+        }
+
+        if ($hasListeners) {
+            foreach ($this->listeners as $listener) {
+                $listener->postSend($request, $response);
+            }
+        }
+
+        return $response;
+    }
+
+    public function authenticate($token, $authMethod, $sudo = null)
+    {
+        $this->addListener(
+            new AuthListener(
+                $authMethod,
+                $token,
+                $sudo
+            )
+        );
+    }
+
+    public function addListener(ListenerInterface $listener)
+    {
+        $this->listeners[get_class($listener)] = $listener;
+    }
+}

lib/Gitlab/HttpClient/Adapter/Guzzle3Adapter.php

@@ -0,0 +1,56 @@
+<?php
+namespace Gitlab\HttpClient\Adapter;
+
+use Gitlab\Exception\ErrorException;
+use Gitlab\Exception\RuntimeException;
+use Gitlab\HttpClient\Message\Guzzle3Response;
+use Gitlab\HttpClient\Subscriber\AuthSubscriber;
+use Guzzle\Http\Client;
+use Guzzle\Http\ClientInterface;
+
+class Guzzle3Adapter implements AdapterInterface
+{
+    /**
+     * @var ClientInterface
+     */
+    protected $client;
+
+    /**
+     * @param ClientInterface $client
+     */
+    public function __construct(ClientInterface $client = null)
+    {
+        $this->client = $client ?: new Client();
+    }
+
+    /**
+     * @param string $path
+     * @param array  $parameters
+     * @param string $httpMethod
+     * @param array  $headers
+     *
+     * @throws ErrorException
+     * @throws RuntimeException
+     *
+     * @return Guzzle3Response
+     */
+    public function request($path, array $parameters = array(), $httpMethod = 'GET', array $headers = array())
+    {
+        $request = $this->client->createRequest($httpMethod, $path, $headers, http_build_query($parameters));
+
+        try {
+            $response = $this->client->send($request);
+        } catch (\LogicException $e) {
+            throw new ErrorException($e->getMessage(), $e->getCode(), $e);
+        } catch (\RuntimeException $e) {
+            throw new RuntimeException($e->getMessage(), $e->getCode(), $e);
+        }
+
+        return new Guzzle3Response($response);
+    }
+
+    public function authenticate($token, $authMethod, $sudo = null)
+    {
+        $this->client->addSubscriber(new AuthSubscriber($authMethod, $token, $sudo));
+    }
+}