Merge pull request #40 from ianbarber/master

Add GZIP support

Author: silvolu

src/Google/Client.php

@@ -37,6 +37,7 @@ class Google_Client
 {
   const LIBVER = "1.0.1-alpha";
   const USER_AGENT_SUFFIX = "google-api-php-client/";
+  const GZIP_UA = " (gzip)";
   /**
    * @var Google_Auth_Abstract $auth
    */
@@ -107,16 +108,6 @@ public function getLibraryVersion()
   {
     return self::LIBVER;
   }
-  
-  /**
-   * Shim function until templates are updated. 
-   * @todo(ianbarber): remove this.
-   * @deprecated 
-   */
-  public function addService($a, $b, $c)
-  {
-    return;
-  }
 
   /**
    * Attempt to exchange a code for an valid authentication token.
@@ -483,10 +474,16 @@ public function setDefer($defer)
   public function execute($request)
   {
     if ($request instanceof Google_Http_Request) {
+      $userAgentGzipSuffix = "";
+      if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) {
+        $request->setRequestHeaders(array("Accept-Encoding" => "gzip"));
+        $userAgentGzipSuffix = self::GZIP_UA;
+      }
       $request->setUserAgent(
           $this->getApplicationName()
           . " " . self::USER_AGENT_SUFFIX
           . $this->getLibraryVersion()
+          . $userAgentGzipSuffix
       );
       $request->maybeMoveParametersToBody();
       return Google_Http_REST::execute($this, $request);

src/Google/Config.php

@@ -48,6 +48,10 @@ public function __construct($ini_file_location = null)
       'classes' => array(
         // If you want to pass in OAuth 2.0 settings, they will need to be
         // structured like this.
+        'Google_Http_Request' => array(
+          // Disable the use of gzip on calls if set to true.
+          'disable_gzip' => false
+        ),
         'Google_Auth_OAuth2' => array(
           // Keys for OAuth 2.0 access, see the API console at
           // https://developers.google.com/console

src/Google/Http/REST.php

@@ -29,8 +29,7 @@
 class Google_Http_REST
 {
   /**
-   * Executes a apiServiceRequest using a RESTful call by transforming it into
-   * an apiHttpRequest, and executed via apiIO::authenticatedRequest().
+   * Executes a Google_Http_Request
    *
    * @param Google_Client $client
    * @param Google_Http_Request $req

src/Google/IO/Stream.php

@@ -25,7 +25,7 @@
 
 class Google_IO_Stream extends Google_IO_Abstract
 {
-
+  const ZLIB = "compress.zlib://";
   private static $ENTITY_HTTP_METHODS = array("POST" => null, "PUT" => null);
 
   private static $DEFAULT_HTTP_CONTEXT = array(
@@ -74,7 +74,7 @@ public function makeRequest(Google_Http_Request $request)
     if ($requestHeaders && is_array($requestHeaders)) {
       $headers = "";
       foreach ($requestHeaders as $k => $v) {
-        $headers .= "$k: $v\n";
+        $headers .= "$k: $v\r\n";
       }
       $requestHttpContext["header"] = $headers;
     }
@@ -101,9 +101,15 @@ public function makeRequest(Google_Http_Request $request)
     );
 
     $context = stream_context_create($options);
+    
+    $url = $request->getUrl();
+    
+    if (!$this->client->getClassConfig("Google_Http_Request", "disable_gzip")) {
+      $url = self::ZLIB . $url;
+    }
 
     $response_data = file_get_contents(
-        $request->getUrl(),
+        $url,
         false,
         $context
     );

src/Google/Model.php

@@ -84,9 +84,9 @@ protected function mapTypes($array)
         property_exists($this, $key)) {
           $this->$key = $val;
           unset($array[$key]);
-      // Check if property exists as camelCase, leave it in array as snake_case
-      // in case of backwards compatibility issues
       } elseif (property_exists($this, $camelKey = Google_Utils::camelCase($key))) {
+          // This checks if property exists as camelCase, leaving it in array as snake_case
+          // in case of backwards compatibility issues.
           $this->$camelKey = $val;
       }
     }