Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Rate limits #13

Open
Cmrickels wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Rate limits #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d85606
#version 001
Oct 10, 2016
e8903e2
#version 001
Oct 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions Services/FullContact.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,65 +60,65 @@ public function __construct($api_key)
$this->_apiKey = $api_key;
}

/**
* This sets the webhook url for all requests made for this service
* instance. To unset, just use setWebhookUrl(null).
*
* @author David Boskovic <me@david.gs> @dboskovic
* @param string $url
* @param string $id
* @return object
*/
public function setWebhookUrl($url, $id = null) {
$this->_webhookUrl = $url;
$this->_webhookId = $id;
return $this;
}

/**
* This is a pretty close copy of my work on the Contactually PHP library
* available here: http://github.com/caseysoftware/contactually-php
*
* @author Keith Casey <contrib@caseysoftware.com>
* @author David Boskovic <me@david.gs> @dboskovic
* @param array $params
* @return object
* @throws Services_FullContact_Exception_NotImplemented
*/

protected function _execute($params = array())
{
if(!in_array($params['method'], $this->_supportedMethods)){
throw new Services_FullContact_Exception_NotImplemented(__CLASS__ .
" does not support the [" . $params['method'] . "] method");
" does not support the [" . $params['method'] . "] method");
}
Copy link

@johkelly johkelly Jan 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This removal block should be reverted. We still want to expose the ability to set the webhook parameters.


$params['apiKey'] = $this->_apiKey;

if($this->_webhookUrl) {
$params['webhookUrl'] = $this->_webhookUrl;
}

if($this->_webhookId) {
$params['webhookId'] = $this->_webhookId;
}


$fullUrl = $this->_baseUri . $this->_version . $this->_resourceUri .
'?' . http_build_query($params);
'?' . http_build_query($params);

//open connection
$connection = curl_init($fullUrl);
curl_setopt($connection, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($connection, CURLOPT_USERAGENT, self::USER_AGENT);
curl_setopt($connection, CURLOPT_HEADER, 1);

//execute request
$this->response_json = curl_exec($connection);
$this->response_code = curl_getinfo($connection, CURLINFO_HTTP_CODE);
$this->response_obj = json_decode($this->response_json);

preg_match_all('/X-Rate-Limit-.{0,}/',$this->response_json, $out, PREG_PATTERN_ORDER);
preg_match("/\d{1,}/",$out[0][0],$limit);
preg_match("/\d{1,}/",$out[0][1],$remaining);
preg_match("/\d{1,}/",$out[0][2],$reset);
Copy link

@johkelly johkelly Jan 16, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is currently dependent on the output order, is it not? This method of getting the headers is tolerable, but I'd prefer to see something more robust/explicit with regard to the header names and order.


$pos = strpos($this->response_json, '{');
$response = substr($this->response_json, $pos);

$this->response_obj = json_decode($response);
$this->response_obj->limit = $limit[0];
$this->response_obj->remaining_calls = $remaining[0];
$this->response_obj->remaining_seconds = $reset[0];

if ('403' == $this->response_code) {
throw new Services_FullContact_Exception_NoCredit($this->response_obj->message);
}

return $this->response_obj;
}


}