Allow passing explicit connection to 'Blob.make_public'.

See #825.
googleapis · May 2, 2015 · 02ce8e1 · 02ce8e1
1 parent ef28081
commit 02ce8e1
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/gcloud/storage/blob.py b/gcloud/storage/blob.py
@@ -512,10 +512,18 @@ def upload_from_string(self, data, content_type='text/plain',
                               size=len(data), content_type=content_type,
                               connection=connection)
 
-    def make_public(self):
-        """Make this blob public giving all users read access."""
+    def make_public(self, connection=None):
+        """Make this blob public giving all users read access.
+
+        :type connection: :class:`gcloud.storage.connection.Connection` or
+                          ``NoneType``
+        :param connection: Optional. The connection to use when sending
+                           requests. If not provided, falls back to default.
+        """
+        if connection is None:
+            connection = self.connection
         self.acl.all().grant_read()
-        self.acl.save()
+        self.acl.save(connection=connection)
 
     cache_control = _scalar_property('cacheControl')
     """HTTP 'Cache-Control' header for this object.

diff --git a/gcloud/storage/test_blob.py b/gcloud/storage/test_blob.py
@@ -747,6 +747,24 @@ def test_make_public(self):
         self.assertEqual(kw[0]['data'], {'acl': permissive})
         self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
 
+    def test_make_public_w_explicit_connection(self):
+        from gcloud.storage.acl import _ACLEntity
+        BLOB_NAME = 'blob-name'
+        permissive = [{'entity': 'allUsers', 'role': _ACLEntity.READER_ROLE}]
+        after = {'acl': permissive}
+        connection = _Connection(after)
+        bucket = _Bucket(None)
+        blob = self._makeOne(BLOB_NAME, bucket=bucket)
+        blob.acl.loaded = True
+        blob.make_public(connection=connection)
+        self.assertEqual(list(blob.acl), permissive)
+        kw = connection._requested
+        self.assertEqual(len(kw), 1)
+        self.assertEqual(kw[0]['method'], 'PATCH')
+        self.assertEqual(kw[0]['path'], '/b/name/o/%s' % BLOB_NAME)
+        self.assertEqual(kw[0]['data'], {'acl': permissive})
+        self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
+
     def test_cache_control_getter(self):
         BLOB_NAME = 'blob-name'
         connection = _Connection()