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
Next Next commit
Move '_scalar_property' to '_helpers'. 
Also, add explicit coverage for it.
  • Loading branch information
@tseaver
tseaver committed Nov 7, 2014
commit 37046e2025db1c7b633c8b1e7b36a08d13fbecc1
14 changes: 14 additions & 0 deletions gcloud/storage/_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,17 @@ def __exit__(self, type, value, traceback):
if type is None:
if self._deferred:
self._wrapped._patch_properties(self._deferred)


def _scalar_property(fieldname):
"""Create a property descriptor around the :class:`_PropertyMixin` helpers.
"""
def _getter(self):
"""Scalar property getter."""
return self.properties[fieldname]

def _setter(self, value):
"""Scalar property setter."""
self._patch_properties({fieldname: value})

return property(_getter, _setter)
15 changes: 1 addition & 14 deletions gcloud/storage/key.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,12 @@
from StringIO import StringIO

from gcloud.storage._helpers import _PropertyMixin
from gcloud.storage._helpers import _scalar_property
from gcloud.storage.acl import ObjectACL
from gcloud.storage.exceptions import StorageError
from gcloud.storage.iterator import Iterator


def _scalar_property(fieldname):
"""Create a property descriptor around the :class:`_PropertyMixin` helpers.
"""
def _getter(self):
"""Scalar property getter."""
return self.properties[fieldname]

def _setter(self, value):
"""Scalar property setter."""
self._patch_properties({fieldname: value})

return property(_getter, _setter)


class Key(_PropertyMixin):
"""A wrapper around Cloud Storage's concept of an ``Object``."""

Expand Down
28 changes: 28 additions & 0 deletions gcloud/storage/test__helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,34 @@ def test___exit___no_error_aggregates__patch_properties(self):
self.assertEqual(kw[0]['query_params'], {'projection': 'full'})


class Test__scalar_property(unittest2.TestCase):

def _callFUT(self, fieldName):
from gcloud.storage._helpers import _scalar_property
return _scalar_property(fieldName)

def test_getter(self):

class Test(object):
def __init__(self, **kw):
self.properties = kw.copy()
do_re_mi = self._callFUT('solfege')

test = Test(solfege='Latido')
self.assertEqual(test.do_re_mi, 'Latido')

def test_setter(self):

class Test(object):
def _patch_properties(self, mapping):
self._patched = mapping.copy()
do_re_mi = self._callFUT('solfege')

test = Test()
test.do_re_mi = 'Latido'
self.assertEqual(test._patched, {'solfege': 'Latido'})


class _Connection(object):

def __init__(self, *responses):
Expand Down