Merge pull request #191 from tseaver/137-upload_file-guess_key_based_on_filename

silvolu · silvolu · commit 60887ab2ae75 · 2014-09-30T10:46:08.000-07:00
Fix #137: default key based on filename.
diff --git a/gcloud/storage/bucket.py b/gcloud/storage/bucket.py
@@ -232,6 +232,8 @@ def upload_file(self, filename, key=None):
                 to the root of the bucket
                 with the same name as on your local file system.
     """
+    if key is None:
+        key = os.path.basename(filename)
     key = self.new_key(key)
     return key.set_contents_from_filename(filename)
 
diff --git a/gcloud/storage/test_bucket.py b/gcloud/storage/test_bucket.py
@@ -248,8 +248,22 @@ def test_delete_keys_miss(self):
         self.assertEqual(kw[1]['method'], 'DELETE')
         self.assertEqual(kw[1]['path'], '/b/%s/o/%s' % (NAME, NONESUCH))
 
-    # See: https://github.com/GoogleCloudPlatform/gcloud-python/issues/137
-    #def test_upload_file_default_key(self):
+    def test_upload_file_default_key(self):
+        from gcloud.test_credentials import _Monkey
+        from gcloud.storage import bucket as MUT
+        BASENAME = 'file.ext'
+        FILENAME = '/path/to/%s' % BASENAME
+        _uploaded = []
+        class _Key(object):
+            def __init__(self, bucket, name):
+                self._bucket = bucket
+                self._name = name
+            def set_contents_from_filename(self, filename):
+                _uploaded.append((self._bucket, self._name, filename))
+        bucket = self._makeOne()
+        with _Monkey(MUT, Key=_Key):
+            bucket.upload_file(FILENAME)
+        self.assertEqual(_uploaded, [(bucket, BASENAME, FILENAME)])
 
     def test_upload_file_explicit_key(self):
         from gcloud.test_credentials import _Monkey
