Skip to content

fix(decoder): normalize delimiter names in decode options #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gstarr-cigna wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(decoder): normalize delimiter names in decode options #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions tests/test_decoder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,23 @@ def test_decode_array_delimiters():
assert decode('numbers: [1|2|3]') == {'numbers': [1, 2, 3]}


def test_decode_delimiter_name_normalization():
"""Test that delimiter names ('comma', 'tab', 'pipe') are normalized like the encoder does."""
toon = """products[2]{id,name,price}:
101,Laptop Pro,1299
102,Magic Mouse,79"""
expected = {
'products': [
{'id': 101, 'name': 'Laptop Pro', 'price': 1299},
{'id': 102, 'name': 'Magic Mouse', 'price': 79},
]
}

# Named delimiter (as passed by the CLI) must behave like the character form
assert decode(toon, {'default_delimiter': 'comma'}) == expected
assert decode(toon, {'default_delimiter': ','}) == expected


def test_decode_tabular_array():
"""Test decoding of tabular arrays."""
toon = """users[2]{id,name,role}:
Expand Down
11 changes: 10 additions & 1 deletion toon/decoder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
COMMA, TAB, PIPE, COLON, QUOTE, NEWLINE, SPACE,
DEFAULT_DELIMITER, DEFAULT_STRICT,
EXPAND_PATHS_OFF, EXPAND_PATHS_SAFE,
DELIMITER_TAB, DELIMITER_PIPE, DELIMITER_COMMA,
LEFT_BRACKET, RIGHT_BRACKET, LEFT_BRACE, RIGHT_BRACE
)
from .utils import unescape_string, parse_literal
Expand Down Expand Up @@ -60,8 +61,16 @@ def __init__(
Args:
strict: Validate structure strictly
expand_paths: Path expansion mode ('off' | 'safe')
default_delimiter: Default delimiter for arrays
default_delimiter: Default delimiter for arrays (',' | 'tab' | 'pipe')
"""
# Normalize delimiter names to their character form
if default_delimiter == DELIMITER_TAB:
default_delimiter = TAB
elif default_delimiter == DELIMITER_PIPE:
default_delimiter = PIPE
elif default_delimiter == DELIMITER_COMMA:
default_delimiter = COMMA

self.strict = strict
self.expand_paths = expand_paths
self.default_delimiter = default_delimiter
Expand Down