Skip to content

Refactor bucket scalar properties #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tseaver merged 3 commits into from
Nov 7, 2014
Merged

Refactor bucket scalar properties #353

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37046e2
Move '_scalar_property' to '_helpers'.
tseaver Nov 7, 2014
7c7745f
Map 'Bucket.location' to a simple, scalar property.
tseaver Nov 7, 2014
5e14e12
Re-map 'Bucket.versioning' as a boolean property, 'versioning_enabled'.
tseaver Nov 7, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Map 'Bucket.location' to a simple, scalar property.
  • Loading branch information
@tseaver
tseaver committed Nov 7, 2014
commit 7c7745f689d1ab74ea31e5e1fdd1812c8e223123
28 changes: 8 additions & 20 deletions gcloud/storage/bucket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import os

from gcloud.storage._helpers import _PropertyMixin
from gcloud.storage._helpers import _scalar_property
from gcloud.storage import exceptions
from gcloud.storage.acl import BucketACL
from gcloud.storage.acl import DefaultObjectACL
Expand All @@ -28,7 +29,7 @@ class Bucket(_PropertyMixin):
'etag': 'etag',
'id': 'id',
'lifecycle': 'get_lifecycle()',
'location': 'get_location()',
'location': 'location',
'logging': 'get_logging()',
'metageneration': 'metageneration',
'name': 'name',
Expand Down Expand Up @@ -436,27 +437,14 @@ def update_lifecycle(self, rules):
"""
self._patch_properties({'lifecycle': {'rule': rules}})

def get_location(self):
"""Retrieve location configured for this bucket.
location = _scalar_property('location')
"""Retrieve location configured for this bucket.

See: https://cloud.google.com/storage/docs/json_api/v1/buckets and
https://cloud.google.com/storage/docs/concepts-techniques#specifyinglocations

:rtype: string
:returns: The configured location.
"""
return self.properties.get('location')

def set_location(self, location):
"""Update location configured for this bucket.
See: https://cloud.google.com/storage/docs/json_api/v1/buckets and
https://cloud.google.com/storage/docs/concepts-techniques#specifyinglocations

See: https://cloud.google.com/storage/docs/json_api/v1/buckets and
https://cloud.google.com/storage/docs/concepts-techniques#specifyinglocations

:type location: string
:param location: The new configured location.
"""
self._patch_properties({'location': location})
:rtype: string
"""

def get_logging(self):
"""Return info about access logging for this bucket.
Expand Down
20 changes: 5 additions & 15 deletions gcloud/storage/test_bucket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,31 +562,21 @@ def test_update_lifecycle(self):
self.assertEqual(entries[0]['action']['type'], 'Delete')
self.assertEqual(entries[0]['condition']['age'], 42)

def test_get_location_eager(self):
def test_location_getter(self):
NAME = 'name'
connection = _Connection()
before = {'location': 'AS'}
bucket = self._makeOne(connection, NAME, before)
self.assertEqual(bucket.get_location(), 'AS')
self.assertEqual(bucket.location, 'AS')
kw = connection._requested
self.assertEqual(len(kw), 0)

def test_get_location_lazy(self):
def test_location_setter(self):
NAME = 'name'
connection = _Connection({'location': 'AS'})
bucket = self._makeOne(connection, NAME)
self.assertEqual(bucket.get_location(), 'AS')
kw = connection._requested
self.assertEqual(len(kw), 1)
self.assertEqual(kw[0]['method'], 'GET')
self.assertEqual(kw[0]['path'], '/b/%s' % NAME)

def test_update_location(self):
NAME = 'name'
connection = _Connection({'location': 'AS'})
bucket = self._makeOne(connection, NAME)
bucket.set_location('AS')
self.assertEqual(bucket.get_location(), 'AS')
bucket.location = 'AS'
self.assertEqual(bucket.location, 'AS')
kw = connection._requested
self.assertEqual(len(kw), 1)
self.assertEqual(kw[0]['method'], 'PATCH')
Expand Down