Merge pull request #753 from bshaffer/issue-574

fixes #574 - checks for cachedir trailing slash

Author: bshaffer

src/Google/Cache/File.php

@@ -151,7 +151,9 @@ private function getCacheDir($file, $forWrite)
     // use the first 2 characters of the hash as a directory prefix
     // this should prevent slowdowns due to huge directory listings
     // and thus give some basic amount of scalability
-    $storageDir = $this->path . '/' . substr(md5($file), 0, 2);
+    $dirHash = substr(md5($file), 0, 2);
+    // trim the directory separator from the path to prevent double separators
+    $storageDir = rtrim($this->path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $dirHash;
     if ($forWrite && ! is_dir($storageDir)) {
       if (! mkdir($storageDir, 0700, true)) {
         $this->log(

tests/Google/CacheTest.php

@@ -30,6 +30,16 @@ public function testFile()
     $this->getSetDelete($cache);
   }
 
+  public function testFileWithTrailingSlash()
+  {
+    $dir = sys_get_temp_dir() . '/google-api-php-client/tests/';
+    $cache = new Google_Cache_File($dir);
+    $cache->set('foo', 'bar');
+    $this->assertEquals($cache->get('foo'), 'bar');
+
+    $this->getSetDelete($cache);
+  }
+
   public function testNull()
   {
     $cache = new Google_Cache_Null();