Merge branch 'master' of github.com:Superbalist/flysystem-google-storage

Superbalist · May 19, 2016 · 0c0530c · 0c0530c
2 parents 4972d7f + 52e2baf
commit 0c0530c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ composer.lock
 vendor
 bin
 coverage
-coverage.xml
+coverage.xml
+dev
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ composer require superbalist/flysystem-google-storage
 ## Usage
 
 ```php
-use Superbalist\Flysystem\GoogleStorage\GoogleStorageAdapter
+use Superbalist\Flysystem\GoogleStorage\GoogleStorageAdapter;
 use League\Flysystem\Filesystem;
 
 $credentials = new \Google_Auth_AssertionCredentials(
@@ -32,7 +32,7 @@ $client->setDeveloperKey('[[your developer key]]');
 
 $service = new \Google_Service_Storage($client);
 
-$adapter = new GoogleStorageAdapter($service, '[[your bucket name]]')
+$adapter = new GoogleStorageAdapter($service, '[[your bucket name]]');
 
 $filesystem = new Filesystem($adapter);
 ```

diff --git a/src/GoogleStorageAdapter.php b/src/GoogleStorageAdapter.php
@@ -135,10 +135,16 @@ protected function upload($path, $contents, Config $config)
      */
     protected function normaliseObject(\Google_Service_Storage_StorageObject $object)
     {
+        $name = $object->getName();
+        $isDir = substr($name, -1) === '/';
+        if ($isDir) {
+            $name = rtrim($name, '/');
+        }
+
         return [
-            'type' => 'file',
-            'dirname' => Util::dirname($object->getName()),
-            'path' => $object->getName(),
+            'type' => $isDir ? 'dir' : 'file',
+            'dirname' => Util::dirname($name),
+            'path' => $name,
             'timestamp' => strtotime($object->getUpdated()),
             'mimetype' => $object->getContentType(),
             'size' => $object->getSize(),