@@ -23,6 +23,7 @@ class EpiTwitter extends EpiOAuth protected $searchUrl = 'http://search.twitter.com'; protected $userAgent = 'EpiTwitter (http://github.com/jmathai/twitter-async/tree/)'; protected $apiVersion = '1'; + protected $isAsynchronous = false; /* OAuth methods */ public function delete($endpoint, $params = null) @@ -61,6 +62,11 @@ class EpiTwitter extends EpiOAuth $this->apiVersion = $version; } + public function useAsynchronous($async = true) + { + $this->isAsynchronous = (bool)$async; + } + public function __construct($consumerKey = null, $consumerSecret = null, $oauthToken = null, $oauthTokenSecret = null) { parent::__construct($consumerKey, $consumerSecret, self::EPITWITTER_SIGNATURE_METHOD); @@ -119,7 +125,11 @@ class EpiTwitter extends EpiOAuth } $url = $this->getUrl($this->getApiUrl($endpoint)); - return new EpiTwitterJson(call_user_func(array($this, 'httpRequest'), $method, $url, $params, $isMultipart), $this->debug); + $resp= new EpiTwitterJson(call_user_func(array($this, 'httpRequest'), $method, $url, $params, $isMultipart), $this->debug); + if(!$this->isAsynchronous) + $resp->responseText; + + return $resp; } private function request_basic($method, $endpoint, $params = null, $username = null, $password = null) @@ -137,7 +147,11 @@ class EpiTwitter extends EpiOAuth if(!empty($username) && !empty($password)) curl_setopt($ch, CURLOPT_USERPWD, "{$username}:{$password}"); - return new EpiTwitterJson(EpiCurl::getInstance()->addCurl($ch), $this->debug); + $resp = new EpiTwitterJson(EpiCurl::getInstance()->addCurl($ch), $this->debug); + if(!$this->isAsynchronous) + $resp->responseText; + + return $resp; } } @@ -229,12 +243,7 @@ class EpiTwitterException extends EpiException { public static function raise($response, $debug) { - $message = array(); - $message['text'] = 'An exception occurred in EpiTwitter'; - $message['response'] = $response->data; - if($debug === true) - $message['headers'] = json_encode($response->headers); - $message = json_encode($message); + $message = $response->data; switch($response->code) { EpiTwitter.php @@ -23,34 +23,34 @@ class EpiTwitterTest extends PHPUnit_Framework_TestCase $this->twitterPassword = 'jmathai_test'; } -//function testGetAuthenticateurl() -//{ -// $aUrl = $this->twitterObjUnAuth->getAuthenticateUrl(); -// $this->assertTrue(strstr($aUrl, 'http://twitter.com/oauth/authenticate') !== false, 'Authenticate url did not contain member definition from EpiTwitter class'); - -// $aUrl = $this->twitterObjUnAuth->getAuthenticateUrl(null, array('force_login'=>'true')); -// $this->assertTrue(strstr($aUrl, 'http://twitter.com/oauth/authenticate') !== false, 'Authenticate url did not contain member definition from EpiTwitter class'); -// $this->assertTrue(strstr($aUrl, 'force_login=true') !== false, 'Authenticate url did not contain member definition from EpiTwitter class'); -//} - -//function testGetAuthorizeUrl() -//{ -// $aUrl = $this->twitterObjUnAuth->getAuthorizeUrl($this->token); -// $this->assertTrue(strstr($aUrl, 'http://twitter.com/oauth/authorize') !== false, 'Authorize url did not contain member definition from EpiTwitter class'); -//} - -//function testGetRequestToken() -//{ -// $resp = $this->twitterObjUnAuth->getRequestToken(); -// $this->assertTrue(strlen($resp->oauth_token) > 0, "oauth_token is longer than 0"); -// $this->assertTrue(strlen($resp->oauth_token_secret) > 0, "oauth_token_secret is longer than 0"); -// $this->assertTrue(strlen($resp->oauth_callback_confirmed) == 0, "oauth_callback is not = true"); - -// $resp = $this->twitterObjUnAuth->getRequestToken(array('oauth_callback' => urlencode('http://www.yahoo.com'))); -// $this->assertTrue(strlen($resp->oauth_token) > 0, "oauth_token is longer than 0"); -// $this->assertTrue(strlen($resp->oauth_token_secret) > 0, "oauth_token_secret is longer than 0"); -// $this->assertTrue($resp->oauth_callback_confirmed == 'true', "oauth_callback is not = true"); -//} + function testGetAuthenticateurl() + { + $aUrl = $this->twitterObjUnAuth->getAuthenticateUrl(); + $this->assertTrue(strstr($aUrl, 'http://twitter.com/oauth/authenticate') !== false, 'Authenticate url did not contain member definition from EpiTwitter class'); + + $aUrl = $this->twitterObjUnAuth->getAuthenticateUrl(null, array('force_login'=>'true')); + $this->assertTrue(strstr($aUrl, 'http://twitter.com/oauth/authenticate') !== false, 'Authenticate url did not contain member definition from EpiTwitter class'); + $this->assertTrue(strstr($aUrl, 'force_login=true') !== false, 'Authenticate url did not contain member definition from EpiTwitter class'); + } + + function testGetAuthorizeUrl() + { + $aUrl = $this->twitterObjUnAuth->getAuthorizeUrl($this->token); + $this->assertTrue(strstr($aUrl, 'http://twitter.com/oauth/authorize') !== false, 'Authorize url did not contain member definition from EpiTwitter class'); + } + + function testGetRequestToken() + { + $resp = $this->twitterObjUnAuth->getRequestToken(); + $this->assertTrue(strlen($resp->oauth_token) > 0, "oauth_token is longer than 0"); + $this->assertTrue(strlen($resp->oauth_token_secret) > 0, "oauth_token_secret is longer than 0"); + $this->assertTrue(strlen($resp->oauth_callback_confirmed) == 0, "oauth_callback is not = true"); + + $resp = $this->twitterObjUnAuth->getRequestToken(array('oauth_callback' => urlencode('http://www.yahoo.com'))); + $this->assertTrue(strlen($resp->oauth_token) > 0, "oauth_token is longer than 0"); + $this->assertTrue(strlen($resp->oauth_token_secret) > 0, "oauth_token_secret is longer than 0"); + $this->assertTrue($resp->oauth_callback_confirmed == 'true', "oauth_callback is not = true"); + } function testBooleanResponse() { @@ -277,41 +277,16 @@ class EpiTwitterTest extends PHPUnit_Framework_TestCase // api seems to be a bit behind and doesn't respond with the new image url - use code instead for now $this->assertEquals($resp->code, 200, 'Response code was not 200'); - $file = dirname(__FILE__) . '/avatar_test_image.png'; - $resp = $this->twitterObj->post('/account/update_profile_image.json', array('@image' => "@{$file}")); - // api seems to be a bit behind and doesn't respond with the new image url - use code instead for now - $this->assertEquals($resp->code, 200, 'Response code was not 200'); - // __call $file = dirname(__FILE__) . '/avatar_test_image.jpg'; $resp = $this->twitterObj->post_accountUpdate_profile_image(array('@image' => "@{$file}")); // api seems to be a bit behind and doesn't respond with the new image url - use code instead for now $this->assertEquals($resp->code, 200, 'Response code was not 200'); - - $file = dirname(__FILE__) . '/avatar_test_image.png'; - $resp = $this->twitterObj->post_accountUpdate_profile_image(array('@image' => "@{$file}")); - // api seems to be a bit behind and doesn't respond with the new image url - use code instead for now - $this->assertEquals($resp->code, 200, 'Response code was not 200'); } function testUpdateBackground() { $file = dirname(__FILE__) . '/avatar_test_image.jpg'; - $resp = $this->twitterObj->post('/account/update_profile_background_image.json', array('@image' => "@{$file}")); - // api seems to be a bit behind and doesn't respond with the new image url - use code instead for now - $this->assertEquals($resp->code, 200, 'Response code was not 200'); - - $file = dirname(__FILE__) . '/avatar_test_image.jpg'; - $resp = $this->twitterObj->post('/account/update_profile_background_image.json', array('@image' => "@{$file}", 'tile' => 'true')); - // api seems to be a bit behind and doesn't respond with the new image url - use code instead for now - $this->assertEquals($resp->code, 200, 'Response code was not 200'); - - $file = dirname(__FILE__) . '/avatar_test_image.png'; - $resp = $this->twitterObj->post('/account/update_profile_background_image.json', array('@image' => "@{$file}")); - // api seems to be a bit behind and doesn't respond with the new image url - use code instead for now - $this->assertEquals($resp->code, 200, 'Response code was not 200'); - - $file = dirname(__FILE__) . '/avatar_test_image.png'; $resp = $this->twitterObj->post('/account/update_profile_background_image.json', array('@image' => "@{$file}", 'tile' => 'true')); // api seems to be a bit behind and doesn't respond with the new image url - use code instead for now $this->assertEquals($resp->code, 200, 'Response code was not 200'); @@ -321,21 +296,6 @@ class EpiTwitterTest extends PHPUnit_Framework_TestCase $resp = $this->twitterObj->post_accountUpdate_profile_background_image(array('@image' => "@{$file}")); // api seems to be a bit behind and doesn't respond with the new image url - use code instead for now $this->assertEquals($resp->code, 200, 'Response code was not 200'); - - $file = dirname(__FILE__) . '/avatar_test_image.jpg'; - $resp = $this->twitterObj->post_accountUpdate_profile_background_image(array('@image' => "@{$file}", 'tile' => 'true')); - // api seems to be a bit behind and doesn't respond with the new image url - use code instead for now - $this->assertEquals($resp->code, 200, 'Response code was not 200'); - - $file = dirname(__FILE__) . '/avatar_test_image.png'; - $resp = $this->twitterObj->post_accountUpdate_profile_background_image(array('@image' => "@{$file}")); - // api seems to be a bit behind and doesn't respond with the new image url - use code instead for now - $this->assertEquals($resp->code, 200, 'Response code was not 200'); - - $file = dirname(__FILE__) . '/avatar_test_image.png'; - $resp = $this->twitterObj->post_accountUpdate_profile_background_image(array('@image' => "@{$file}", 'tile' => 'true')); - // api seems to be a bit behind and doesn't respond with the new image url - use code instead for now - $this->assertEquals($resp->code, 200, 'Response code was not 200'); } function testCreateFriendship() tests/EpiTwitterTest.php c653259a0c8448d92ba27d4d431b53ccf3dcf0a8 Jaisen Mathai jaisen@jmathai.com http://github.com/jmathai/twitter-async/commit/f9531a3130ff89bd61d9f4b394f318fb669febfd f9531a3130ff89bd61d9f4b394f318fb669febfd 2009-11-05T23:27:44-08:00 2009-11-05T23:27:44-08:00 Final commit for version 2 before merging into master. bae6b923ae0afcd9604bdfa089f03c61a13e3bf6 Jaisen Mathai jaisen@jmathai.com