Hopiu/django-authority
1
0
Fork 0
mirror of https://github.com/jazzband/django-authority.git synced 2026-05-16 03:23:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refs #8: name changes and used kwargs in one of the tests

Browse source
This commit is contained in:
Jason Ward 2012-09-26 17:17:27 -04:00
parent 1f73bdde92
commit 342f3d5311
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
authority/permissions.py
View file

@ -73,7 +73,7 @@ class BasePermission(object):
)] = True
return user_permissions, group_permissions
def _authority_prime_perm_caches(self):
def _prime_perm_caches(self):
"""
Prime both the user and group caches and put them on the ``self.user``.
In addition add a cache filled flag on ``self.user``.
@ -84,7 +84,7 @@ class BasePermission(object):
self.user._authority_perm_cache_filled = True
@property
def perm_cache(self):
def _perm_cache(self):
"""
cached_permissions will generate the cache in a lazy fashion.
"""
@ -102,11 +102,11 @@ class BasePermission(object):
return self.user._authority_perm_cache
# Prime the cache.
self._authority_prime_perm_caches()
self._prime_perm_caches()
return self.user._authority_perm_cache
@property
def group_perm_cache(self):
def _group_perm_cache(self):
"""
cached_permissions will generate the cache in a lazy fashion.
"""
@ -122,7 +122,7 @@ class BasePermission(object):
return self.user._authority_group_perm_cache
# Prime the cache.
self._authority_prime_perm_caches()
self._prime_perm_caches()
return self.user._authority_group_perm_cache
def invalidate_permissions_cache(self):
@ -164,11 +164,11 @@ class BasePermission(object):
))
# Check to see if the permission is in the cache.
has_perm = _user_has_perms(self.perm_cache)
has_perm = _user_has_perms(self._perm_cache)
# Optionally check group permissions
if check_groups:
has_perm = has_perm or _user_has_perms(self.group_perm_cache)
has_perm = has_perm or _user_has_perms(self._group_perm_cache)
return has_perm
else:
return Permission.objects.user_permissions(

15
authority/tests.py
View file

@ -218,7 +218,12 @@ class PerformanceTest(SmartCachingTestCase):
# Regardless of the number groups permissions, it should only take one
# query to check both users and groups.
with self.assertNumQueries(1):
self.user_check.has_user_perms('foo', self.user, True, True)
self.user_check.has_user_perms(
'foo',
self.user,
approved=True,
check_groups=True,
)
def test_invalidate_permissions_cache(self):
# Show that calling invalidate_permissions_cache will cause extra
@ -319,8 +324,8 @@ class GroupPermissionCacheTestCase(SmartCachingTestCase):
)
self.assertFalse(can_foo_with_group)
self.assertEqual(self.group_check.perm_cache, {})
self.assertEqual(self.group_check.group_perm_cache, {})
self.assertEqual(self.group_check._perm_cache, {})
self.assertEqual(self.group_check._group_perm_cache, {})
# Create a permission with just that group.
Permission.objects.create(
@ -341,5 +346,5 @@ class GroupPermissionCacheTestCase(SmartCachingTestCase):
)
self.assertTrue(can_foo_with_group)
self.assertEqual(self.group_check.perm_cache, {})
self.assertEqual(self.group_check.group_perm_cache, {})
self.assertEqual(self.group_check._perm_cache, {})
self.assertEqual(self.group_check._group_perm_cache, {})