feat: supports to import from another hierarchies

Author: joonas-yoon

src/json_as_db/Database.py

@@ -40,13 +40,19 @@ class Database(dict):
     __memory__ = dict()
 
     def __init__(self, *arg, **kwargs) -> None:
+        self.__dict__ = self._create_empty()
+        self.__dict__.update({
+            self.__data__: dict(*arg, **kwargs),
+        })
+
+    def _create_empty(self) -> dict:
         now = datetime.now().isoformat()
-        self.__dict__ = {
+        return {
             'version': self.__version__,
             'creator': package_name,
             'created_at': now,
             'updated_at': now,
-            self.__data__: dict(*arg, **kwargs),
+            self.__data__: dict(),
         }
 
     def __getitem__(self, key: str) -> Any:
@@ -289,21 +295,29 @@ def load(
         with open(path, **file_args) as f:
             raw = json.loads(f.read(), **json_args)
 
-        keys_in_raw = set(raw.keys())
-        field_keys = set(self.__metadata__ + [self.__data__])
-        if len(field_keys - keys_in_raw) > 0:
-            raise AttributeError('Invalid database format')
-
-        loaded_dict = {
-            'version': raw['version'],
-            'creator': raw['creator'],
-            'created_at': raw['created_at'],
-            'updated_at': raw['updated_at'],
-            self.__data__: raw[self.__data__],
-        }
-        self.__dict__ = override_dict(loaded_dict, self.__dict__)
+        self._create(raw)
         return self
 
+    def _create(self, raw: Union[dict, list]) -> None:
+        self.__dict__ = self._create_empty()
+
+        if type(raw) == dict:
+            keys_in_raw = set(raw.keys())
+            field_keys = set(self.__metadata__ + [self.__data__])
+            is_fields_valid = len(field_keys - keys_in_raw) == 0
+            if is_fields_valid:
+                self.__dict__.update({
+                    'version': raw['version'],
+                    'creator': raw['creator'],
+                    'created_at': raw['created_at'],
+                    'updated_at': raw['updated_at'],
+                    self.__data__: raw[self.__data__],
+                })
+            else:
+                self.add(raw)
+        elif type(raw) == list:
+            self.add(raw)
+
     def save(
         self,
         path: str,

tests/database/test_serialization.py

@@ -7,8 +7,9 @@
 CUR_DIR = os.path.dirname(os.path.realpath(__file__))
 
 
-def test_db_load() -> Database:
-    filepath = os.path.join(CUR_DIR, '..', 'samples', 'basic.json')
+def test_db_load():
+    filepath = os.path.join(CUR_DIR, '..', 'samples', 'db.json')
+    filepath = os.path.abspath(filepath)
     logger.debug('setup: (file) '+ filepath)
 
     db = Database().load(filepath)
@@ -26,6 +27,48 @@ def test_db_load() -> Database:
     assert item_expected == item
 
 
+def test_db_load_from_list_json():
+    filepath = os.path.join(CUR_DIR, '..', 'samples', 'list.json')
+    filepath = os.path.abspath(filepath)
+    logger.debug('setup: (file) '+ filepath)
+
+    db = Database().load(filepath)
+    logger.debug(db)
+    assert len(db) == 2
+
+    keys = list(db.keys())
+    assert len(keys) == 2
+
+    item1 = db.get(keys[0])
+    item2 = db.get(keys[1])
+
+    logger.debug(f"db['{keys[0]}'] = {item1}")
+    logger.debug(f"db['{keys[1]}'] = {item2}")
+
+    if 'empty' in item1:
+        assert item1["randomInteger"] == 123
+        assert item2["randomInteger"] == 321
+    else:
+        assert item1["randomInteger"] == 321
+        assert item2["randomInteger"] == 123
+
+
+def test_db_load_from_json():
+    filepath = os.path.join(CUR_DIR, '..', 'samples', 'sample1.json')
+    filepath = os.path.abspath(filepath)
+    logger.debug('setup: (file) '+ filepath)
+
+    db = Database().load(filepath)
+    assert len(db) == 1
+
+    items = db.all()
+    item = items[0]
+    assert type(item) is dict
+
+    assert 'someExtraKey' in item
+    assert item['someExtraKey'] == 989347
+    assert len(item['items']) == 2
+
 
 def test_db_save():
     temp_dir = os.path.relpath(os.path.join(CUR_DIR, 'test_save'))
@@ -47,6 +90,7 @@ def test_db_save():
     logger.debug(f'[after adding items] {db}')
 
     filepath = os.path.join(temp_dir, 'db.json')
+    filepath = os.path.abspath(filepath)
     logger.debug(f'[saving path] {filepath}')
     kwargs = {
         'file_args': {'encoding': 'utf-8'},

tests/samples/list.json

@@ -0,0 +1,18 @@
+[
+  {
+    "randomInteger": 123,
+    "randomString": "keyboard-cat",
+    "booleanTrue": true,
+    "booleanFalse": false,
+    "empty": null,
+    "list": [
+      "first element"
+    ]
+  }, {
+    "randomInteger": 321,
+    "randomString": "cheshire-cat",
+    "list": [
+      "alice", "in", "wonderland"
+    ]
+  }
+]

tests/samples/sample1.json

@@ -0,0 +1,22 @@
+{
+  "key": "randomKey",
+  "someExtraKey": 989347,
+  "items": [
+    {
+      "randomInteger": 123,
+      "randomString": "keyboard-cat",
+      "booleanTrue": true,
+      "booleanFalse": false,
+      "empty": null,
+      "list": [
+        "first element"
+      ]
+    }, {
+      "randomInteger": 321,
+      "randomString": "cheshire-cat",
+      "list": [
+        "alice", "in", "wonderland"
+      ]
+    }
+  ]
+}