- Updating to new version OAuth extension

src/IPub/Twitter/Api/Request.php

@@ -18,13 +18,25 @@
 use IPub\OAuth;
 
 /**
+ * Modify API call request parameters and add connection signature to the request
+ *
  * @package		iPublikuj:Twitter!
  * @subpackage	Api
  *
  * @author Adam Kadlec <adam.kadlec@fastybird.com>
  */
 class Request extends OAuth\Api\Request
 {
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isPaginated()
+	{
+		$params = $this->getParameters();
+
+		return $this->isGet() && isset($params['count']);
+	}
+
 	/**
 	 * {@inheritdoc}
 	 */

src/IPub/Twitter/ApiCall.php

@@ -0,0 +1,257 @@
+<?php
+/**
+ * Client.php
+ *
+ * @copyright	More in license.md
+ * @license		http://www.ipublikuj.eu
+ * @author		Adam Kadlec http://www.ipublikuj.eu
+ * @package		iPublikuj:Twitter!
+ * @subpackage	common
+ * @since		5.0
+ *
+ * @date		06.03.15
+ */
+
+namespace IPub\Twitter;
+
+use Nette;
+use Nette\Utils;
+
+use IPub;
+use IPub\Twitter;
+use IPub\Twitter\Api;
+
+use IPub\OAuth;
+
+/**
+ * Abstract API calls definition
+ *
+ * @package		iPublikuj:Twitter!
+ * @subpackage	common
+ *
+ * @author Adam Kadlec <adam.kadlec@fastybird.com>
+ */
+abstract class ApiCall extends Nette\Object
+{
+	/**
+	 * @var OAuth\Consumer
+	 */
+	protected $consumer;
+
+	/**
+	 * @var OAuth\HttpClient
+	 */
+	protected $httpClient;
+
+	/**
+	 * @param OAuth\Consumer $consumer
+	 * @param OAuth\HttpClient $httpClient
+	 */
+	public function __construct(
+		OAuth\Consumer $consumer,
+		OAuth\HttpClient $httpClient
+	){
+		$this->consumer = $consumer;
+		$this->httpClient = $httpClient;
+	}
+
+	/**
+	 * @return OAuth\Consumer
+	 */
+	public function getConsumer()
+	{
+		return $this->consumer;
+	}
+
+	/**
+	 * Determines the access token that should be used for API calls.
+	 * The first time this is called, $this->accessToken is set equal
+	 * to either a valid user access token, or it's set to the application
+	 * access token if a valid user access token wasn't available.  Subsequent
+	 * calls return whatever the first call returned.
+	 *
+	 * @return OAuth\Token The access token
+	 */
+	abstract public function getAccessToken();
+
+	/**
+	 * @param string $path
+	 * @param array $params
+	 * @param array $headers
+	 *
+	 * @return Utils\ArrayHash|string|Paginator|Utils\ArrayHash[]
+	 *
+	 * @throws OAuth\Exceptions\ApiException
+	 */
+	public function get($path, array $params = [], array $headers = [])
+	{
+		return $this->api($path, Api\Request::GET, $params, [], $headers);
+	}
+
+	/**
+	 * @param string $path
+	 * @param array $params
+	 * @param array $headers
+	 *
+	 * @return Utils\ArrayHash|string|Paginator|Utils\ArrayHash[]
+	 *
+	 * @throws OAuth\Exceptions\ApiException
+	 */
+	public function head($path, array $params = [], array $headers = [])
+	{
+		return $this->api($path, Api\Request::HEAD, $params, [], $headers);
+	}
+
+	/**
+	 * @param string $path
+	 * @param array $params
+	 * @param array $post
+	 * @param array $headers
+	 *
+	 * @return Utils\ArrayHash|string|Paginator|Utils\ArrayHash[]
+	 *
+	 * @throws OAuth\Exceptions\ApiException
+	 */
+	public function post($path, array $params = [], array $post = [], array $headers = [])
+	{
+		return $this->api($path, Api\Request::POST, $params, $post, $headers);
+	}
+
+	/**
+	 * @param string $path
+	 * @param array $params
+	 * @param array $post
+	 * @param array $headers
+	 *
+	 * @return Utils\ArrayHash|string|Paginator|Utils\ArrayHash[]
+	 *
+	 * @throws OAuth\Exceptions\ApiException
+	 */
+	public function patch($path, array $params = [], array $post = [], array $headers = [])
+	{
+		return $this->api($path, Api\Request::PATCH, $params, $post, $headers);
+	}
+
+	/**
+	 * @param string $path
+	 * @param array $params
+	 * @param array $post
+	 * @param array $headers
+	 *
+	 * @return Utils\ArrayHash|string|Paginator|Utils\ArrayHash[]
+	 *
+	 * @throws OAuth\Exceptions\ApiException
+	 */
+	public function put($path, array $params = [], array $post = [], array $headers = [])
+	{
+		return $this->api($path, Api\Request::PUT, $params, $post, $headers);
+	}
+
+	/**
+	 * @param string $path
+	 * @param array $params
+	 * @param array $headers
+	 *
+	 * @return Utils\ArrayHash|string|Paginator|Utils\ArrayHash[]
+	 *
+	 * @throws OAuth\Exceptions\ApiException
+	 */
+	public function delete($path, array $params = [], array $headers = [])
+	{
+		return $this->api($path, Api\Request::DELETE, $params, [], $headers);
+	}
+
+	/**
+	 * Simply pass anything starting with a slash and it will call the Api, for example
+	 * <code>
+	 * $details = $twitter->api('users/show.json');
+	 * </code>
+	 *
+	 * @param string $path
+	 * @param string $method The argument is optional
+	 * @param array $params Query parameters
+	 * @param array $post Post request parameters or body to send
+	 * @param array $headers Http request headers
+	 *
+	 * @return Utils\ArrayHash|string|Paginator|Utils\ArrayHash[]
+	 *
+	 * @throws OAuth\Exceptions\ApiException
+	 */
+	public function api($path, $method = Api\Request::GET, array $params = [], array $post = [], array $headers = [])
+	{
+		if (is_array($method)) {
+			$headers = $post;
+			$post = $params;
+			$params = $method;
+			$method = Api\Request::GET;
+		}
+
+		$response = $this->httpClient->makeRequest(
+			new Api\Request($this->consumer, $this->config->createUrl('api', $path, $params), $method, $post, $headers, $this->getAccessToken()),
+			'HMAC-SHA1'
+		);
+
+		if (!$response->isJson() || (!$data = Utils\ArrayHash::from($response->toArray()))) {
+			$ex = $response->toException();
+			throw $ex;
+		}
+
+		if ($response->isPaginated()) {
+			return new Paginator($this, $response);
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Upload photo to the Twitter
+	 *
+	 * @param string $file
+	 * @param string|null $status
+	 *
+	 * @return Utils\ArrayHash
+	 *
+	 * @throws Exceptions\InvalidArgumentException
+	 * @throws OAuth\Exceptions\ApiException|static
+	 */
+	public function uploadMedia($file, $status = NULL)
+	{
+		if (!file_exists($file)) {
+			throw new Exceptions\InvalidArgumentException("File '$file' does not exists. Please provide valid path to file.");
+		}
+
+		if ($status !== NULL && !is_string($status)) {
+			throw new Exceptions\InvalidArgumentException("Status text '$status' have to be a string. Please provide valid status text.");
+		}
+
+		if ($status !== NULL) {
+			$post = [
+				'media[]' => new \CURLFile($file),
+				'status' => $status
+			];
+
+			$result = $this->post('statuses/update_with_media.json', [], $post);
+
+			return $result instanceof Utils\ArrayHash ? $result : new Utils\ArrayHash;
+
+		} else {
+			// Add file to post params
+			$post = [
+				'media' => new \CURLFile($file),
+			];
+
+			$response = $this->httpClient->makeRequest(
+				new Api\Request($this->consumer, $this->config->createUrl('upload', 'media/upload.json'), Api\Request::POST, $post, [], $this->getAccessToken()),
+				'HMAC-SHA1'
+			);
+
+			if ($response->isOk() && $response->isJson() && ($data = Utils\ArrayHash::from($response->toArray()))) {
+				return $data;
+
+			} else {
+				$ex = $response->toException();
+				throw $ex;
+			}
+		}
+	}
+}