From c7991266dfea7f7ea742283d1f9ef5eb6e28d2c1 Mon Sep 17 00:00:00 2001 From: Koen Van Daele Date: Fri, 27 Feb 2015 18:37:13 +0100 Subject: [PATCH 1/3] Add matches to dict dumps. --- skosprovider/utils.py | 3 ++- tests/test_utils.py | 31 ++++++++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/skosprovider/utils.py b/skosprovider/utils.py index a667d99..2de22f5 100644 --- a/skosprovider/utils.py +++ b/skosprovider/utils.py @@ -37,7 +37,8 @@ def dict_dumper(provider): 'narrower': c.narrower, 'broader': c.broader, 'related': c.related, - 'member_of': c.member_of + 'member_of': c.member_of, + 'matches': c.matches }) elif isinstance(c, Collection): ret.append({ diff --git a/tests/test_utils.py b/tests/test_utils.py index 483cbf1..6298e04 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -39,7 +39,16 @@ def setUp(self): 'narrower': [], 'broader': [], 'related': [], - 'member_of': ['3'] + 'member_of': ['3'], + 'matches': { + 'close': [ + 'http://id.python.org/different/types/of/trees/nr/1/the/larch' + ], + 'exact': [], + 'related': [], + 'narrow': [], + 'broad': [] + } } self.chestnut_dump = { 'id': '2', @@ -65,7 +74,16 @@ def setUp(self): 'narrower': [], 'broader': [], 'related': [], - 'member_of': ['3'] + 'member_of': ['3'], + 'matches': { + 'close': [], + 'exact': [], + 'related': [ + 'http://id.python.org/different/types/of/trees/nr/17/the/other/chestnut' + ], + 'narrow': [], + 'broad': [] + } } self.species_dump = { 'id': 3, @@ -98,7 +116,14 @@ def setUp(self): 'narrower': [2, 3], 'broader': [], 'related': [], - 'member_of': [] + 'member_of': [], + 'matches': { + 'close': [], + 'exact': [], + 'related': [], + 'narrow': [], + 'broad': [] + } } def tearDown(self): From 7c9fb9bb3660fd1a6e72cef006c6e975ef0ea827 Mon Sep 17 00:00:00 2001 From: Koen Van Daele Date: Fri, 27 Feb 2015 18:41:52 +0100 Subject: [PATCH 2/3] Add subordinate_arrays to dictdumper. --- skosprovider/utils.py | 1 + tests/test_utils.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/skosprovider/utils.py b/skosprovider/utils.py index 2de22f5..55abfac 100644 --- a/skosprovider/utils.py +++ b/skosprovider/utils.py @@ -38,6 +38,7 @@ def dict_dumper(provider): 'broader': c.broader, 'related': c.related, 'member_of': c.member_of, + 'subordinate_arrays': c.subordinate_arrays, 'matches': c.matches }) elif isinstance(c, Collection): diff --git a/tests/test_utils.py b/tests/test_utils.py index 6298e04..030c128 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -40,6 +40,7 @@ def setUp(self): 'broader': [], 'related': [], 'member_of': ['3'], + 'subordinate_arrays': [], 'matches': { 'close': [ 'http://id.python.org/different/types/of/trees/nr/1/the/larch' @@ -75,6 +76,7 @@ def setUp(self): 'broader': [], 'related': [], 'member_of': ['3'], + 'subordinate_arrays': [], 'matches': { 'close': [], 'exact': [], @@ -123,7 +125,8 @@ def setUp(self): 'related': [], 'narrow': [], 'broad': [] - } + }, + 'subordinate_arrays': [] } def tearDown(self): From afb1707909ca8085b412a3953706995551ab3a6b Mon Sep 17 00:00:00 2001 From: Koen Van Daele Date: Fri, 27 Feb 2015 18:45:13 +0100 Subject: [PATCH 3/3] Updated HISTORY.rst --- HISTORY.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/HISTORY.rst b/HISTORY.rst index b8d4e20..9c9691a 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -9,6 +9,8 @@ :meth:`skosprovider.registry.Registry.get_all` that will be passed to all registered providers. This determines in what language the labels of the returned concepts will displayed. +- Fixed some errors with the :func:`skosprovider.utils.dict_dumper`. It didn't + dump the `matches` or the `subordinate_arrays` of concepts. - Wrote some new documentation on what a provider is and how to use it. 0.5.0 (2014-12-18)