Merge pull request #11 from remyrd/fix/None-entries

Handle nonexistent entries

Author: remyrd

jimpass/parser.py

@@ -34,12 +34,13 @@ def fetch_param_from_dict(self, item: dict, param_name: str) -> str:
             if p not in sub:
                 return "?"
             sub = sub[p]
-        return str(sub)
+        return str(sub) if sub else "?"
 
     def dumps(self, item_dict: dict) -> str:
 
         flat_mapping = dict(
-            [(k, self.fetch_param_from_dict(item_dict, k)) for k, v in self.mapping.items()])
+            [(k, self.fetch_param_from_dict(item_dict, k))
+             for k, v in self.mapping.items()])
         return self.template_str.format(**flat_mapping)
 
     def _mapping_string_to_dict(self, dict_mapping: list, value: str, sub: dict) -> dict:
@@ -64,8 +65,9 @@ def loads(self, item_str: str) -> dict:
             if key not in self.mapping:
                 raise Exception("Unkown variable in template string")
         res = {}
-        for param_name in params.keys():
-            self._mapping_string_to_dict(self.mapping[param_name].split('.'), params[param_name], res)
+        for param_name, val in params.items():
+            if val not in '?':
+                self._mapping_string_to_dict(self.mapping[param_name].split('.'), params[param_name], res)
         return res
 
     def str_matches_mapping(self, item_str: str) -> bool:

tests/test_parser.py

@@ -19,6 +19,11 @@
 }
 dummy_str = "account <b>Bob</b> with user sponge.bob"
 
+dummy_incomplete_item = {
+    "name": "Bob"
+}
+dummy_incomplete_str = "account <b>Bob</b> with user ?"  # intentionally missing
+
 
 def test_dump():
     assert(parser.dumps(dummy_item) == dummy_str)
@@ -29,3 +34,5 @@ def test_load():
     assert('name' in loaded_item and 'login' in loaded_item)
     assert(loaded_item['name'] == dummy_item['name'])
     assert(loaded_item['login']['username'] == dummy_item['login']['username'])
+    loaded_incomplete_item = parser.loads(dummy_incomplete_str)
+    assert(loaded_incomplete_item['name'] == dummy_incomplete_item['name'])