Twitter updates

Merge r25286 and r25287 from trunk



git-svn-id: http://framework.zend.com/svn/framework/standard/branches/release-1.12@25288 44c647ce-9c0f-0410-b52a-842ac1e357ba

documentation/manual/en/module_specs/Zend_Service_Twitter.xml

@@ -30,7 +30,14 @@
             <listitem>
                 <para>
                     <code>account</code> allows you to check that your account credentials are
-                    valid, as well as check your <acronym>API</acronym> rate limit.
+                    valid.
+                </para>
+            </listitem>
+
+            <listitem>
+                <para>
+                    <code>application</code> allows you to check your <acronym>API</acronym> rate
+                    limit.
                 </para>
             </listitem>
 
@@ -230,7 +237,13 @@ $response = $twitter->account->verifyCredentials();
 ]]></programlisting>
                 </example>
             </listitem>
+        </itemizedlist>
+    </sect2>
 
+    <sect2 id="zend.service.twitter.application">
+        <title>Application Methods</title>
+
+        <itemizedlist>
             <listitem>
                 <para>
                     <methodname>rateLimitStatus()</methodname> returns the remaining number of
@@ -238,12 +251,12 @@ $response = $twitter->account->verifyCredentials();
                     before the <acronym>API</acronym> limit is reached for the current hour.
                 </para>
 
-                <example id="zend.service.twitter.account.ratelimitstatus">
+                <example id="zend.service.twitter.application.ratelimitstatus">
                     <title>Rating limit status</title>
 
                     <programlisting language="php"><![CDATA[
 $twitter  = new Zend_Service_Twitter($options);
-$response = $twitter->account->rateLimitStatus();
+$response = $twitter->application->rateLimitStatus();
 $userTimelineLimit = $response->resources->statuses->{'/statuses/user_timeline'}->remaining;
 ]]></programlisting>
                 </example>

library/Zend/Service/Twitter.php

@@ -112,6 +112,7 @@ class Zend_Service_Twitter
      */
     protected $methodTypes = array(
         'account',
+        'application',
         'blocks',
         'directmessages',
         'favorites',
@@ -334,31 +335,31 @@ class Zend_Service_Twitter
     }
 
     /**
-     * Returns the number of api requests you have left per hour.
+     * Verify Account Credentials
      *
-     * @todo   Have a separate payload object to represent rate limits
      * @throws Zend_Http_Client_Exception if HTTP request fails or times out
      * @throws Exception\DomainException if unable to decode JSON payload
      * @return Zend_Service_Twitter_Response
      */
-    public function accountRateLimitStatus()
+    public function accountVerifyCredentials()
     {
         $this->init();
-        $response = $this->get('account/rate_limit_status');
+        $response = $this->get('account/verify_credentials');
         return new Zend_Service_Twitter_Response($response);
     }
 
     /**
-     * Verify Account Credentials
+     * Returns the number of api requests you have left per hour.
      *
+     * @todo   Have a separate payload object to represent rate limits
      * @throws Zend_Http_Client_Exception if HTTP request fails or times out
      * @throws Exception\DomainException if unable to decode JSON payload
      * @return Zend_Service_Twitter_Response
      */
-    public function accountVerifyCredentials()
+    public function applicationRateLimitStatus()
     {
         $this->init();
-        $response = $this->get('account/verify_credentials');
+        $response = $this->get('application/rate_limit_status');
         return new Zend_Service_Twitter_Response($response);
     }
 

tests/Zend/Service/Twitter/TwitterTest.php

@@ -303,9 +303,9 @@ class Zend_Service_Twitter_TwitterTest extends PHPUnit_Framework_TestCase
     {
         $twitter = new Zend_Service_Twitter;
         $twitter->setHttpClient($this->stubTwitter(
-            'account/rate_limit_status.json', Zend_Http_Client::GET, 'account.rate_limit_status.json'
+            'application/rate_limit_status.json', Zend_Http_Client::GET, 'application.rate_limit_status.json'
         ));
-        $response = $twitter->account->rateLimitStatus();
+        $response = $twitter->application->rateLimitStatus();
         $this->assertTrue($response instanceof Zend_Service_Twitter_Response);
     }
 
@@ -313,9 +313,9 @@ class Zend_Service_Twitter_TwitterTest extends PHPUnit_Framework_TestCase
     {
         $twitter = new Zend_Service_Twitter;
         $twitter->setHttpClient($this->stubTwitter(
-            'account/rate_limit_status.json', Zend_Http_Client::GET, 'account.rate_limit_status.json'
+            'application/rate_limit_status.json', Zend_Http_Client::GET, 'application.rate_limit_status.json'
         ));
-        $response = $twitter->account->rateLimitStatus();
+        $response = $twitter->application->rateLimitStatus();
         $status = $response->toValue();
         $this->assertEquals(180, $status->resources->statuses->{'/statuses/user_timeline'}->remaining);
     }