diff options
| author | Eugene Triguba <eugenetriguba@gmail.com> | 2020-02-02 07:02:27 -0600 |
|---|---|---|
| committer | Eugene Triguba <eugenetriguba@gmail.com> | 2020-02-02 07:02:27 -0600 |
| commit | 99ef9872805366675f495a66594f3cd2aea68ac7 (patch) | |
| tree | 1a1b10b0379a2bb5d1c7264655f9cd7db62736db | |
| parent | Merge branch 'json' of github.com:eugenetriguba/config_file into json (diff) | |
| download | config-file-99ef9872805366675f495a66594f3cd2aea68ac7.zip | |
Finish get method for json parser
| -rw-r--r-- | config_file/parsers/json_parser.py | 10 | ||||
| -rw-r--r-- | config_file/parsers/parse_value.py | 8 | ||||
| -rw-r--r-- | tests/test_json_parser.py | 104 | ||||
| -rw-r--r-- | tests/test_parse_value.py | 5 |
4 files changed, 98 insertions, 29 deletions
diff --git a/config_file/parsers/json_parser.py b/config_file/parsers/json_parser.py index c017b37..c7c20fb 100644 --- a/config_file/parsers/json_parser.py +++ b/config_file/parsers/json_parser.py @@ -3,6 +3,8 @@ import json from nested_lookup import get_occurrence_of_key from config_file.parsers.base_parser import BaseParser, ParsingError +from config_file.parsers.parse_value import parse_value +from config_file.utils import split_on_dot class JsonParser(BaseParser): @@ -17,7 +19,13 @@ class JsonParser(BaseParser): raise ParsingError(error) def get(self, section_key, parse_type=True): - pass + split_keys = split_on_dot(section_key) + + result = self.parsed_content + for key in split_keys: + result = result[key] + + return parse_value(result) if parse_type else result def set(self, section_key, value): pass diff --git a/config_file/parsers/parse_value.py b/config_file/parsers/parse_value.py index 542e222..8ad4ead 100644 --- a/config_file/parsers/parse_value.py +++ b/config_file/parsers/parse_value.py @@ -32,6 +32,14 @@ def parse_value(value): if can_be_parsed_as_bool(value): return value if type(value) is bool else bool(strtobool(value)) + if type(value) is dict: + parsed = {} + + for item in value: + parsed[item] = parse_value(value[item]) + + return parsed + return value diff --git a/tests/test_json_parser.py b/tests/test_json_parser.py index b829b7d..8ce8187 100644 --- a/tests/test_json_parser.py +++ b/tests/test_json_parser.py @@ -4,30 +4,6 @@ import pytest from config_file.parsers.json_parser import JsonParser -test_json = { - "glossary": { - "title": "example glossary", - "GlossDiv": { - "title": "S", - "GlossList": { - "GlossEntry": { - "ID": "SGML", - "SortAs": "SGML", - "GlossTerm": "Standard Generalized Markup Language", - "Acronym": "SGML", - "Abbrev": "ISO 8879:1986", - "GlossDef": { - "para": "A meta-markup language, used to create markup " - + "languages such as DocBook.", - "GlossSeeAlso": ["GML", "XML"], - }, - "GlossSee": "markup", - } - }, - }, - } -} - @pytest.mark.parametrize( "test_input,expected_result", @@ -37,11 +13,11 @@ test_json = { ("example glossary", False), ("GlossDiv", True), ("title", True), - ("S", False), + ("5", False), ("GlossList", True), ("GlossEntry", True), ("ID", True), - ("SGML", False), + ("false", False), ("GlossTerm", True), ("Standard Generalized Markup Language", False), ("Acronym", True), @@ -49,21 +25,93 @@ test_json = { ("GlossDef", True), ("para", True), ( - "A meta-markup language, used to create markup languages such as DocBook.", + "A meta-markup language, used to create markup languages " + "such as DocBook.", False, ), ("GlossSeeAlso", True), ("GML", False), ("XML", False), ("GlossSee", True), - ("markup", False), + ("5.5", False), ], ) def test_that_json_parser_can_find_keys(test_input, expected_result): + test_json = { + "glossary": { + "title": "example glossary", + "GlossDiv": { + "title": "5", + "GlossList": { + "GlossEntry": { + "ID": "false", + "SortAs": "SGML", + "GlossTerm": "Standard Generalized Markup Language", + "Acronym": "SGML", + "Abbrev": "ISO 8879:1986", + "GlossDef": { + "para": "A meta-markup language, used to create markup " + + "languages such as DocBook.", + "GlossSeeAlso": ["GML", "XML"], + }, + "GlossSee": "5.5", + } + }, + }, + } + } + parser = JsonParser(json.dumps(test_json)) assert parser.has(test_input) == expected_result +@pytest.mark.parametrize( + "test_json, section_key, parse_type, expected_result", + [ + ( + {"glossary": {"title": "example glossary"}}, + "glossary.title", + False, + "example glossary", + ), + ( + {"glossary": {"title": "example glossary"}}, + "glossary.title", + True, + "example glossary", + ), + ( + {"glossary": {"title": "example glossary", "dict": {"blah": "5"}}}, + "glossary.dict", + False, + {"blah": "5"}, + ), + ( + {"glossary": {"title": "example glossary", "dict": {"blah": "5"}}}, + "glossary.dict", + True, + {"blah": 5}, + ), + ( + { + "glossary": { + "title": "example glossary", + "dict": {"blah": "5", "second": {"third": "5"}}, + } + }, + "glossary.dict", + True, + {"blah": 5, "second": {"third": 5}}, + ), + ], +) +def test_that_json_parser_can_get_keys( + test_json, section_key, parse_type, expected_result +): + parser = JsonParser(json.dumps(test_json)) + assert parser.get(section_key, parse_type=parse_type) == expected_result + + def test_that_json_parser_can_stringify(): json_str = '{"test": 5, "blah": true}' parser = JsonParser(json_str) diff --git a/tests/test_parse_value.py b/tests/test_parse_value.py index 2123337..58d3f3c 100644 --- a/tests/test_parse_value.py +++ b/tests/test_parse_value.py @@ -17,6 +17,11 @@ from config_file.parsers.parse_value import can_be_parsed_as_bool, parse_value (343, 343), (3.2, 3.2), (True, True), + ({"blah": "5"}, {"blah": 5}), + ( + {"blah": {"blah2": {"blah3": "false"}, "abc": "5.25", "boo": "tRuE"}}, + {"blah": {"blah2": {"blah3": False}, "abc": 5.25, "boo": True}}, + ), ], ) def test_parse_value(test_input, expected): |