Add DataDict to Categories

Author: seignovert

opus/categories.py

@@ -1,42 +1,23 @@
 # -*- coding: utf-8 -*-
 
+from .data import DataDict
+
 class Category(object):
     def __init__(self, json):
         self.name = json['table_name']
         self.label = json['label']
 
     def __repr__(self):
-        return '`{}` -> {}'.format(self.name, self.label)
+        return '{} ({})'.format(self.label, self.name)
 
 
-class Categories(object):
+class Categories(DataDict):
     def __init__(self, json):
+        DataDict.__init__(self)
         self._json = json
-        self._data = {}
         for category in json:
-            self._data[category['table_name']] = Category(category)
+            self.append(category['table_name'],  Category(category))
 
     def __repr__(self):
         return 'OPUS API list of all categories ({}):\n'.format(len(self)) + \
-            '\n'.join(
-               ' - {} ({})'.format(value.label, key) for key, value in self.items()
-            )
-
-    def __len__(self):
-        return len(self._json)
-
-    def __getitem__(self, attr):
-        return self._data[attr.lower()]
-
-    def __iter__(self):
-        return iter(self._data)
-
-    def keys(self):
-        return self._data.keys()
-
-    def items(self):
-        return self._data.items()
-
-    def values(self):
-        return self._data.values()
-
+            '\n'.join(' - {}'.format(value) for value in self.values())

tests/test_categories.py

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 import json as JSON
 import pytest
-import six
 
-from opus.categories import *
+from opus.categories import Categories, Category
 
 @pytest.fixture
 def category():
@@ -16,35 +15,10 @@ def categories():
     return Categories(json)
 
 def test_category_repr(category):
-    assert repr(category) == '`obs_general` -> General Constraints'
+    assert repr(category) == 'General Constraints (obs_general)'
 
 
 def test_categories_repr(categories):
-    if six.PY3:
-        assert repr(categories) == \
-            'OPUS API list of all categories (3):\n' + \
-            ' - General Constraints (obs_general)\n' + \
-            ' - Ring Geometry Constraints (obs_ring_geometry)\n' + \
-            ' - Wavelength Constraints (obs_wavelength)'
-    else:
-        r = repr(categories)
-        assert 'OPUS API list of all categories (3):' in r
-        assert 'obs_general' in r
-        assert 'obs_ring_geometry' in r
-        assert 'obs_wavelength' in r
-    
-def test_categories_iter(categories):
-    assert 'obs_general' in categories
-    
-    for key, value in categories.items():
-        assert categories[key] == value
-        break
-
-def test_categories_keys_values(categories):
-    keys = categories.keys()
-    values = categories.values()
-    assert len(keys) == 3
-    assert len(values) == 3
-    assert 'obs_general' in keys
-
-
+    r = repr(categories)
+    assert 'OPUS API list of all categories (3)' in r
+    assert 'General Constraints (obs_general)' in r

tests/test_data.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import pytest
-
 import json as JSON
 
 from opus.data import DataDict, Data, DataElement

tests/test_fields.py

@@ -1,11 +1,8 @@
 # -*- coding: utf-8 -*-
-import json as JSON
 import pytest
-import six
-
-
-from opus.fields import *
+import json as JSON
 
+from opus.fields import Fields, Field, splitKey
 
 @pytest.fixture
 def field():

tests/test_metadata.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 import pytest
-
 import json as JSON
-
 from datetime import datetime as dt
 
 from opus.metadata import *