Skip to content

libubox: Add anonymous strings, ints, et al in arrays #12

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

libubox: Add anonymous strings, ints, et al in arrays #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fdea1f2
libubox: Send warnings to stderr
pprindeville Sep 16, 2023
76f2dc8
libubox: Minor cleanup
pprindeville Sep 15, 2023
9223a34
libubox: Add anonymous strings, ints, et al in arrays
pprindeville Sep 15, 2023
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
64 changes: 61 additions & 3 deletions sh/jshn.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,30 +150,85 @@ json_add_string() {
_json_add_generic string "$1" "$2" "$cur"
}

json_push_string() {
local cur
_json_get_var cur JSON_CUR
[ "${cur%%[0-9]*}" = "J_A" ] || {
[ -n "$_json_no_warning" ] || \
echo "WARNING: Not in an array" >&2
return 1
}
_json_add_generic string "" "$1" "$cur"
}

json_add_int() {
local cur
_json_get_var cur JSON_CUR
_json_add_generic int "$1" "$2" "$cur"
}

json_push_int() {
local cur
_json_get_var cur JSON_CUR
[ "${cur%%[0-9]*}" = "J_A" ] || {
[ -n "$_json_no_warning" ] || \
echo "WARNING: Not in an array" >&2
return 1
}
_json_add_generic int "" "$1" "$cur"
}

json_add_boolean() {
local cur
_json_get_var cur JSON_CUR
_json_add_generic boolean "$1" "$2" "$cur"
}

json_push_boolean() {
local cur
_json_get_var cur JSON_CUR
[ "${cur%%[0-9]*}" = "J_A" ] || {
[ -n "$_json_no_warning" ] || \
echo "WARNING: Not in an array" >&2
return 1
}
_json_add_generic boolean "" "$1" "$cur"
}

json_add_double() {
local cur
_json_get_var cur JSON_CUR
_json_add_generic double "$1" "$2" "$cur"
}

json_push_double() {
local cur
_json_get_var cur JSON_CUR
[ "${cur%%[0-9]*}" = "J_A" ] || {
[ -n "$_json_no_warning" ] || \
echo "WARNING: Not in an array" >&2
return 1
}
_json_add_generic double "" "$1" "$cur"
}

json_add_null() {
local cur
_json_get_var cur JSON_CUR
_json_add_generic null "$1" "" "$cur"
}

json_push_null() {
local cur
_json_get_var cur JSON_CUR
[ "${cur%%[0-9]*}" = "J_A" ] || {
[ -n "$_json_no_warning" ] || \
echo "WARNING: Not in an array" >&2
return 1
}
_json_add_generic null "" "" "$cur"
}

json_add_fields() {
while [ "$#" -gt 0 ]; do
local field="$1"
Expand Down Expand Up @@ -222,6 +277,7 @@ json_dump() {
}

json_get_type() {
# target=$2
local __dest="$1"
local __cur

Expand Down Expand Up @@ -291,11 +347,11 @@ json_select() {
local type
local cur

[ -z "$1" ] && {
[ -z "$target" ] && {
_json_set_var JSON_CUR "J_V"
return 0
}
[[ "$1" == ".." ]] && {
[[ "$target" == ".." ]] && {
_json_get_var cur JSON_CUR
_json_get_var cur "U_$cur"
_json_set_var JSON_CUR "$cur"
Expand All @@ -309,13 +365,15 @@ json_select() {
;;
*)
[ -n "$_json_no_warning" ] || \
echo "WARNING: Variable '$target' does not exist or is not an array/object"
echo "WARNING: Variable '$target' does not exist or is not an array/object" >&2
return 1
;;
esac
}

json_is_a() {
# target=$1
# type=$2
local type

json_get_type type "$1"
Expand Down
25 changes: 25 additions & 0 deletions tests/shunit2/tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,31 @@ test_jshn_add_multi() {
set -u
}

test_jshn_push_stuff() {
JSON_PREFIX="${JSON_PREFIX:-}"
. ../../sh/jshn.sh

set +u

# Test an array with anonymous strings, ints, booleans, doubles, and null in it
json_init
json_add_array "arr"

# first element uses the legacy method with no name
json_add_string "" "first"

# the rest use the new functions
json_push_string "second"
json_push_int 42
json_push_boolean true
json_push_double 3.141592
json_push_null

assertEquals '{ "arr": [ "first", "second", 42, false, 3.1415920000000002, null ] }' "$(json_dump)"

set -u
}

test_jshn_append_via_json_script() {
JSON_PREFIX="${JSON_PREFIX:-}"
. ../../sh/jshn.sh
Expand Down