Allow tuple/list indexing + Fix test

Author: Code0x58

README.rst

@@ -41,6 +41,8 @@ Basics
     # the key is split on '.'s and works on dictionaries
     del store['a_dictionary.dict-list']
     store['a_dictionary.new_value'] = "old value"
+    assert store['a_dictionary', 'new_value'] == "old value"
+    assert store['a_list', 1] == 2
 
     # deep copies are made when assigning values
     my_list = ['fun']

jsonstore/__init__.py

@@ -71,7 +71,7 @@ def __getattr__(self, key):
         if key in self._data:
             return deepcopy(self._data[key])
         else:
-            raise KeyError(key)
+            raise AttributeError(key)
 
     @classmethod
     def _valid_object(cls, obj, parents=None):
@@ -127,7 +127,10 @@ def __get_obj(self, full_path):
         """
         Returns the object which is under the given path
         """
-        steps = full_path.split(".")
+        if isinstance(full_path, (tuple, list)):
+            steps = full_path
+        else:
+            steps = full_path.split(".")
         path = []
         obj = self._data
         if not full_path:
@@ -156,7 +159,11 @@ def __getitem__(self, key):
         return deepcopy(obj)
 
     def __delitem__(self, name):
-        path, _, key = name.rpartition(".")
+        if isinstance(name, (tuple, list)):
+            path = name[:-1]
+            key = name[-1]
+        else:
+            path, _, key = name.rpartition(".")
         obj = self.__get_obj(path)
         del obj[key]
 

jsonstore/tests.py

@@ -88,9 +88,22 @@ def test_new_store(self):
         os.remove(store_file)
 
     def test_assign_valid_types(self):
-        for method in (self._setattr, self._setitem):
-            for name, value in self.TEST_DATA:
-                method(name, value)
+        for name, value in self.TEST_DATA:
+            self.store[name] = value
+            self.store[name] == value
+            getattr(self.store, name) == value
+
+            del self.store[name]
+            self.assertRaises(KeyError, self._getitem(name))
+            self.assertRaises(AttributeError, self._getattr(name))
+
+            setattr(self.store, name, value)
+            self.store[name] == value
+            getattr(self.store, name) == value
+
+            delattr(self.store, name)
+            self.assertRaises(KeyError, self._getitem(name))
+            self.assertRaises(AttributeError, self._getattr(name))
 
     def test_assign_invalid_types(self):
         for method in (self._setattr, self._setitem):
@@ -142,16 +155,27 @@ def test_nested_dict_helper(self):
         self.assertRaises(KeyError, self._setitem("dictionary.noexist", None))
         self.assertRaises(KeyError, self._getitem("dictionary.noexist"))
 
-        self.store.dictionary = {"a": 1}
-        self.store["dictionary.exist"] = None
-        self.assertIsNone(self.store.dictionary["exist"])
-        self.assertIsNone(self.store["dictionary.exist"])
-
-        self.store["dictionary.a"] = 2
-        del self.store["dictionary.exist"]
-        self.assertRaises(KeyError, self._getitem("dictionary.exist"))
-        self.assertNotIn("exist", self.store.dictionary)
-        self.assertEqual(self.store.dictionary, {"a": 2})
+        for access_key in ("dictionary.exist", ("dictionary", "exist"), ["dictionary", "exist"]):
+            self.store.dictionary = {"a": 1}
+            self.store["dictionary.exist"] = None
+            self.assertIsNone(self.store.dictionary["exist"])
+            self.assertIsNone(self.store[access_key])
+
+            self.store["dictionary.a"] = 2
+            del self.store[access_key]
+            self.assertRaises(KeyError, self._getitem(access_key))
+            self.assertNotIn("exist", self.store.dictionary)
+            self.assertEqual(self.store.dictionary, {"a": 2})
+
+    def test_nested_getitem(self):
+        self.store["list"] = [
+            {
+                "key": [None, "value"]
+            }
+        ]
+        assert self.store["list", 0, "key", 1] == "value"
+        assert self.store[["list", 0, "key", 1]] == "value"
+        self.assertRaises(TypeError, self._getitem("list.0.key.1"))
 
     def test_del(self):
         self.store.key = None
@@ -245,7 +269,7 @@ def test_transaction_commit(self):
             self.store.value = 2
             del self.store.remove_me
         self.assertEqual(self.store.value, 2)
-        self.assertRaises(KeyError, self._getattr("remove_me"))
+        self.assertRaises(AttributeError, self._getattr("remove_me"))
 
     def test_transaction_write(self):
         with self.store: