Skip to content

Commit

Permalink
dataapi: "all" method added
Browse files Browse the repository at this point in the history
this returns all saved settings as a dictionary
  • Loading branch information
jqb committed Oct 5, 2013
1 parent 4f5f676 commit a7fbfc9
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 0 deletions.
1 change: 1 addition & 0 deletions django_settings/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
get = data.get
set = data.set
exists = data.exists
all = data.all
type_names = data.type_names


Expand Down
5 changes: 5 additions & 0 deletions django_settings/dataapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ def exists(self, name):
return bool(db.Setting.objects.value_object_exists(name))
exists = cache_method(exists)

def all(self):
names = db.Setting.objects.values_list('name', flat=True)
items = [(name, self.get(name)) for name in names]
return dict(items)

def clear_cache(self):
self.cache.clear()

Expand Down
20 changes: 20 additions & 0 deletions tests/test_data_cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,23 @@ def checking_existence_of_setting():
for _ in xrange(10):
self.assert_queries_count(0, getting_setting)
self.assert_queries_count(0, checking_existence_of_setting)

def test_getting_all_should_not_run_any_queries(self):
data = [
("Integer", "test-int", 1),
("String", "test-str", "Value"),
("Email", "test-email", "admin@admin.com"),
]
data_dict = dict([
(name, value) for _, name, value in data
])

def set_all_data():
for type_name, name, value in data:
django_settings.set(type_name, name, value)

def get_all_data():
self.assert_items_equal(django_settings.all(), data_dict)

self.assert_queries_count(len(data) * 4, set_all_data)
self.assert_queries_count(1, get_all_data) # one query for all names

0 comments on commit a7fbfc9

Please sign in to comment.