Compare commits
5 Commits
v1.9
...
b6537a50ae
Author | SHA1 | Date | |
---|---|---|---|
b6537a50ae
|
|||
e508f37089
|
|||
d66bb9c93e
|
|||
253c85985b
|
|||
11d49fd476
|
@@ -35,6 +35,8 @@ async def json_write(data: Any, path: Union[str, Path]) -> None:
|
|||||||
async with aiofiles.open(str(path), mode="w", encoding="utf-8") as f:
|
async with aiofiles.open(str(path), mode="w", encoding="utf-8") as f:
|
||||||
await f.write(
|
await f.write(
|
||||||
dumps(data, ensure_ascii=False, escape_forward_slashes=False, indent=4)
|
dumps(data, ensure_ascii=False, escape_forward_slashes=False, indent=4)
|
||||||
|
if hasattr(dumps, "escape_forward_slashes")
|
||||||
|
else dumps(data, ensure_ascii=False, indent=4)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@@ -9,7 +9,7 @@ from libbot.i18n.classes.bot_locale import BotLocale
|
|||||||
async def _(
|
async def _(
|
||||||
key: str,
|
key: str,
|
||||||
*args: str,
|
*args: str,
|
||||||
locale: str = sync.config_get("locale"),
|
locale: str = "en",
|
||||||
locales_root: Union[str, Path] = Path("locale"),
|
locales_root: Union[str, Path] = Path("locale"),
|
||||||
) -> Any:
|
) -> Any:
|
||||||
"""Get value of locale string
|
"""Get value of locale string
|
||||||
@@ -17,7 +17,7 @@ async def _(
|
|||||||
### Args:
|
### Args:
|
||||||
* key (`str`): The last key of the locale's keys path.
|
* key (`str`): The last key of the locale's keys path.
|
||||||
* *args (`list`): Path to key like: `dict[args][key]`.
|
* *args (`list`): Path to key like: `dict[args][key]`.
|
||||||
* locale (`str`): Locale to looked up in. Defaults to config's `"locale"` value.
|
* locale (`str`): Locale to looked up in. Defaults to `"en"`.
|
||||||
* locales_root (`Union[str, Path]`, *optional*): Folder where locales are located. Defaults to `Path("locale")`.
|
* locales_root (`Union[str, Path]`, *optional*): Folder where locales are located. Defaults to `Path("locale")`.
|
||||||
|
|
||||||
### Returns:
|
### Returns:
|
||||||
|
@@ -9,7 +9,7 @@ from libbot.sync import config_get, json_read
|
|||||||
def _(
|
def _(
|
||||||
key: str,
|
key: str,
|
||||||
*args: str,
|
*args: str,
|
||||||
locale: str = sync.config_get("locale"),
|
locale: str = "en",
|
||||||
locales_root: Union[str, Path] = Path("locale"),
|
locales_root: Union[str, Path] = Path("locale"),
|
||||||
) -> Any:
|
) -> Any:
|
||||||
"""Get value of locale string
|
"""Get value of locale string
|
||||||
@@ -17,7 +17,7 @@ def _(
|
|||||||
### Args:
|
### Args:
|
||||||
* key (`str`): The last key of the locale's keys path.
|
* key (`str`): The last key of the locale's keys path.
|
||||||
* *args (`list`): Path to key like: `dict[args][key]`.
|
* *args (`list`): Path to key like: `dict[args][key]`.
|
||||||
* locale (`str`): Locale to looked up in. Defaults to config's `"locale"` value.
|
* locale (`str`): Locale to looked up in. Defaults to `"en"`.
|
||||||
* locales_root (`Union[str, Path]`, *optional*): Folder where locales are located. Defaults to `Path("locale")`.
|
* locales_root (`Union[str, Path]`, *optional*): Folder where locales are located. Defaults to `Path("locale")`.
|
||||||
|
|
||||||
### Returns:
|
### Returns:
|
||||||
|
@@ -29,7 +29,11 @@ def json_write(data: Any, path: Union[str, Path]) -> None:
|
|||||||
* path (`Union[str, Path]`): Path-like object or path as a string of a destination
|
* path (`Union[str, Path]`): Path-like object or path as a string of a destination
|
||||||
"""
|
"""
|
||||||
with open(str(path), mode="w", encoding="utf-8") as f:
|
with open(str(path), mode="w", encoding="utf-8") as f:
|
||||||
f.write(dumps(data, ensure_ascii=False, escape_forward_slashes=False, indent=4))
|
f.write(
|
||||||
|
dumps(data, ensure_ascii=False, escape_forward_slashes=False, indent=4)
|
||||||
|
if hasattr(dumps, "escape_forward_slashes")
|
||||||
|
else dumps(data, ensure_ascii=False, indent=4)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def nested_set(target: dict, value: Any, *path: str, create_missing=True) -> dict:
|
def nested_set(target: dict, value: Any, *path: str, create_missing=True) -> dict:
|
||||||
|
@@ -52,3 +52,9 @@ target-version = ['py38', 'py39', 'py310', 'py311']
|
|||||||
|
|
||||||
[tool.isort]
|
[tool.isort]
|
||||||
profile = "black"
|
profile = "black"
|
||||||
|
|
||||||
|
[tool.pytest.ini_options]
|
||||||
|
minversion = "6.0"
|
||||||
|
python_files = ["test_*.py"]
|
||||||
|
pythonpath = "."
|
||||||
|
testpaths = ["tests"]
|
||||||
|
6
tests/config.json
Normal file
6
tests/config.json
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"locale": "en",
|
||||||
|
"bot": {
|
||||||
|
"bot_token": "sample_token"
|
||||||
|
}
|
||||||
|
}
|
1
tests/data/empty.json
Normal file
1
tests/data/empty.json
Normal file
@@ -0,0 +1 @@
|
|||||||
|
{}
|
3
tests/data/invalid.json
Normal file
3
tests/data/invalid.json
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"foo": 'bar'
|
||||||
|
}
|
15
tests/data/test.json
Normal file
15
tests/data/test.json
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"foo": "bar",
|
||||||
|
"abcdefg": [
|
||||||
|
"higklmnop",
|
||||||
|
{
|
||||||
|
"lol": {
|
||||||
|
"kek": [
|
||||||
|
1.0000035,
|
||||||
|
0.2542,
|
||||||
|
1337
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
49
tests/test_config_async.py
Normal file
49
tests/test_config_async.py
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
from pathlib import Path
|
||||||
|
from typing import Any, List
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from libbot import config_get, config_set
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"args, expected",
|
||||||
|
[
|
||||||
|
(["locale"], "en"),
|
||||||
|
(["bot_token", "bot"], "sample_token"),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
async def test_config_get_valid(args: List[str], expected: str):
|
||||||
|
assert (
|
||||||
|
await config_get(args[0], *args[1:], config_file=Path("tests/config.json"))
|
||||||
|
== expected
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"args, expected",
|
||||||
|
[
|
||||||
|
(["bot_stonks", "bot"], pytest.raises(KeyError)),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
async def test_config_get_invalid(args: List[str], expected: Any):
|
||||||
|
with expected:
|
||||||
|
assert (
|
||||||
|
await config_get(args[0], *args[1:], config_file=Path("tests/config.json"))
|
||||||
|
== expected
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"key, path, value",
|
||||||
|
[
|
||||||
|
("locale", [], "en"),
|
||||||
|
("bot_token", ["bot"], "sample_token"),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
async def test_config_set(key: str, path: List[str], value: Any):
|
||||||
|
await config_set(key, value, *path, config_file=Path("tests/config.json"))
|
||||||
|
assert await config_get(key, *path, config_file=Path("tests/config.json")) == value
|
46
tests/test_config_sync.py
Normal file
46
tests/test_config_sync.py
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
from pathlib import Path
|
||||||
|
from typing import Any, List
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from libbot import sync
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"args, expected",
|
||||||
|
[
|
||||||
|
(["locale"], "en"),
|
||||||
|
(["bot_token", "bot"], "sample_token"),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
def test_config_get_valid(args: List[str], expected: str):
|
||||||
|
assert (
|
||||||
|
sync.config_get(args[0], *args[1:], config_file=Path("tests/config.json"))
|
||||||
|
== expected
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"args, expected",
|
||||||
|
[
|
||||||
|
(["bot_stonks", "bot"], pytest.raises(KeyError)),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
def test_config_get_invalid(args: List[str], expected: Any):
|
||||||
|
with expected:
|
||||||
|
assert (
|
||||||
|
sync.config_get(args[0], *args[1:], config_file=Path("tests/config.json"))
|
||||||
|
== expected
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"key, path, value",
|
||||||
|
[
|
||||||
|
("locale", [], "en"),
|
||||||
|
("bot_token", ["bot"], "sample_token"),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
def test_config_set(key: str, path: List[str], value: Any):
|
||||||
|
sync.config_set(key, value, *path, config_file=Path("tests/config.json"))
|
||||||
|
assert sync.config_get(key, *path, config_file=Path("tests/config.json")) == value
|
60
tests/test_json_async.py
Normal file
60
tests/test_json_async.py
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
from json import JSONDecodeError, dumps
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import Any, Union
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from libbot import json_read, json_write
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"path, expected",
|
||||||
|
[
|
||||||
|
(
|
||||||
|
"tests/data/test.json",
|
||||||
|
{
|
||||||
|
"foo": "bar",
|
||||||
|
"abcdefg": ["higklmnop", {"lol": {"kek": [1.0000035, 0.2542, 1337]}}],
|
||||||
|
},
|
||||||
|
),
|
||||||
|
("tests/data/empty.json", {}),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
async def test_json_read_valid(path: Union[str, Path], expected: Any):
|
||||||
|
assert await json_read(path) == expected
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"path, expected",
|
||||||
|
[
|
||||||
|
("tests/data/invalid.json", pytest.raises(JSONDecodeError)),
|
||||||
|
("tests/data/nonexistent.json", pytest.raises(FileNotFoundError)),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
async def test_json_read_invalid(path: Union[str, Path], expected: Any):
|
||||||
|
with expected:
|
||||||
|
assert await json_read(path) == expected
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"data, path",
|
||||||
|
[
|
||||||
|
(
|
||||||
|
{
|
||||||
|
"foo": "bar",
|
||||||
|
"abcdefg": ["higklmnop", {"lol": {"kek": [1.0000035, 0.2542, 1337]}}],
|
||||||
|
},
|
||||||
|
"tests/data/test.json",
|
||||||
|
),
|
||||||
|
({}, "tests/data/empty.json"),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
async def test_json_write(data: Any, path: Union[str, Path]):
|
||||||
|
await json_write(data, path)
|
||||||
|
|
||||||
|
assert Path(path).is_file()
|
||||||
|
with open(path, "r", encoding="utf-8") as f:
|
||||||
|
assert f.read() == dumps(data, ensure_ascii=False, indent=4)
|
57
tests/test_json_sync.py
Normal file
57
tests/test_json_sync.py
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
from json import JSONDecodeError, dumps
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import Any, Union
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from libbot import sync
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"path, expected",
|
||||||
|
[
|
||||||
|
(
|
||||||
|
"tests/data/test.json",
|
||||||
|
{
|
||||||
|
"foo": "bar",
|
||||||
|
"abcdefg": ["higklmnop", {"lol": {"kek": [1.0000035, 0.2542, 1337]}}],
|
||||||
|
},
|
||||||
|
),
|
||||||
|
("tests/data/empty.json", {}),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
def test_json_read_valid(path: Union[str, Path], expected: Any):
|
||||||
|
assert sync.json_read(path) == expected
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"path, expected",
|
||||||
|
[
|
||||||
|
("tests/data/invalid.json", pytest.raises(JSONDecodeError)),
|
||||||
|
("tests/data/nonexistent.json", pytest.raises(FileNotFoundError)),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
def test_json_read_invalid(path: Union[str, Path], expected: Any):
|
||||||
|
with expected:
|
||||||
|
assert sync.json_read(path) == expected
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"data, path",
|
||||||
|
[
|
||||||
|
(
|
||||||
|
{
|
||||||
|
"foo": "bar",
|
||||||
|
"abcdefg": ["higklmnop", {"lol": {"kek": [1.0000035, 0.2542, 1337]}}],
|
||||||
|
},
|
||||||
|
"tests/data/test.json",
|
||||||
|
),
|
||||||
|
({}, "tests/data/empty.json"),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
def test_json_write(data: Any, path: Union[str, Path]):
|
||||||
|
sync.json_write(data, path)
|
||||||
|
|
||||||
|
assert Path(path).is_file()
|
||||||
|
with open(path, "r", encoding="utf-8") as f:
|
||||||
|
assert f.read() == dumps(data, ensure_ascii=False, indent=4)
|
Reference in New Issue
Block a user