refactor: No longer accept flag shorthands to bash_object.parse_filter

The function is only used internally, and it looks (and is) cleaner
without a shorthand

Author: hyperupcall

pkg/lib/parse.sh

@@ -10,10 +10,10 @@ bash_object.parse_filter() {
 	local flag_parser_type=
 
 	for arg; do case "$arg" in
-	-s|--simple)
+	--simple)
 		flag_parser_type='simple'
 		shift ;;
-	-a|--advanced)
+	--advanced)
 		flag_parser_type='advanced'
 		shift ;;
 	esac done

tests/parse-filter-advanced.bats

@@ -3,157 +3,157 @@
 load './util/init.sh'
 
 @test "Advanced errors with no start dot 1" {
-	run bash_object.parse_filter -s ''
+	run bash_object.parse_filter --simple ''
 
 	assert_failure
 	assert_line -p "Filter must begin with a dot"
 }
 
 @test "Advanced errors with no start dot 2" {
-	run bash_object.parse_filter -a '["sub"]'
+	run bash_object.parse_filter --advanced '["sub"]'
 
 	assert_failure
 	assert_line -p "Filter must begin with a dot"
 }
 
 @test "Advanced errors with missing dot" {
-	run bash_object.parse_filter -a '.["one"]["two"]'
+	run bash_object.parse_filter --advanced '.["one"]["two"]'
 
 	assert_failure
 	assert_line -p "Each part in a filter must be deliminated by a dot"
 }
 
 @test "Advanced errors with trailing dot" {
-	run bash_object.parse_filter -a '.["one"].["ab"].'
+	run bash_object.parse_filter --advanced '.["one"].["ab"].'
 
 	assert_failure
 	assert_line -p "A dot MUST be followed by an opening bracket"
 }
 
 @test "Advanced errors with trailing double dot" {
-	run bash_object.parse_filter -a '.["one"].["ab"]..'
+	run bash_object.parse_filter --advanced '.["one"].["ab"]..'
 
 	assert_failure
 	assert_line -p "A dot MUST be followed by an opening bracket"
 }
 
 @test "Advanced errors on incomplete 1" {
-	run bash_object.parse_filter -a '.['
+	run bash_object.parse_filter --advanced '.['
 
 	assert_failure
 	assert_line -p "A number or opening quote must follow an open bracket"
 }
 
 @test "Advanced errors on incomplete 2" {
-	run bash_object.parse_filter -a '.["'
+	run bash_object.parse_filter --advanced '.["'
 
 	assert_failure
 	assert_line -p "Filter is not complete"
 }
 
 @test "Advanced errors on incomplete 3" {
-	run bash_object.parse_filter -a '.[""'
+	run bash_object.parse_filter --advanced '.[""'
 
 	assert_failure
 	assert_line -p "Key cannot be empty"
 }
 
 @test "Advanced errors on incomplete 4" {
-	run bash_object.parse_filter -a '.["bottom"].["'
+	run bash_object.parse_filter --advanced '.["bottom"].["'
 
 	assert_failure
 	assert_line -p "Filter is not complete"
 }
 
 @test "Advanced errors on incomplete 5" {
-	run bash_object.parse_filter -a '.["top"].[""'
+	run bash_object.parse_filter --advanced '.["top"].[""'
 
 	assert_failure
 	assert_line -p "Key cannot be empty"
 }
 
 @test "Advanced errors on empty key" {
-	run bash_object.parse_filter -a '.[""]'
+	run bash_object.parse_filter --advanced '.[""]'
 
 	assert_failure
 	assert_line -p "Key cannot be empty"
 }
 
 @test "Advanced errors on empty key as subkey" {
-	run bash_object.parse_filter -a '.["subkey"].[""]'
+	run bash_object.parse_filter --advanced '.["subkey"].[""]'
 
 	assert_failure
 	assert_line -p "Key cannot be empty"
 }
 
 @test "Advanced errors on empty number key" {
-	run bash_object.parse_filter -a '.[]'
+	run bash_object.parse_filter --advanced '.[]'
 
 	assert_failure
 	assert_line -p "Key cannot be empty"
 }
 
 @test "Advanced errors on empty key as number subkey" {
-	run bash_object.parse_filter -a '.["subkey"].[]'
+	run bash_object.parse_filter --advanced '.["subkey"].[]'
 
 	assert_failure
 	assert_line -p "Key cannot be empty"
 }
 
 @test "Correctly parses advanced prop" {
-	bash_object.parse_filter -a '.["one"]'
+	bash_object.parse_filter --advanced '.["one"]'
 
 	assert [ "${#REPLIES[@]}" -eq 1 ]
 	assert [ "${REPLIES[0]}" = 'one' ]
 }
 
 @test "Correctly parses advanced prop and escape sequence" {
-	bash_object.parse_filter -a '.["esca\\p\"\]e"]'
+	bash_object.parse_filter --advanced '.["esca\\p\"\]e"]'
 
 	assert [ "${#REPLIES[@]}" -eq 1 ]
 	assert [ "${REPLIES[0]}" = 'esca\p"]e' ]
 }
 
 @test "Correctly parses advanced double prop" {
-	bash_object.parse_filter -a '.["aone"].["a\\two"]'
+	bash_object.parse_filter --advanced '.["aone"].["a\\two"]'
 
 	assert [ "${#REPLIES[@]}" -eq 2 ]
 	assert [ "${REPLIES[0]}" = 'aone' ]
 	assert [ "${REPLIES[1]}" = 'a\two' ]
 }
 
 @test "Correctly parses advanced number single" {
-	bash_object.parse_filter -a '.[3]'
+	bash_object.parse_filter --advanced '.[3]'
 
 	assert [ "${#REPLIES[@]}" -eq 1 ]
 	assert [ "${REPLIES[0]}" = $'\x1C3' ]
 }
 
 @test "Correctly parses advanced number" {
-	bash_object.parse_filter -a '.[341]'
+	bash_object.parse_filter --advanced '.[341]'
 
 	assert [ "${#REPLIES[@]}" -eq 1 ]
 	assert [ "${REPLIES[0]}" = $'\x1C341' ]
 }
 
 @test "Correctly parses advanced number nested" {
-	bash_object.parse_filter -a '.[341].[7]'
+	bash_object.parse_filter --advanced '.[341].[7]'
 
 	assert [ "${#REPLIES[@]}" -eq 2 ]
 	assert [ "${REPLIES[0]}" = $'\x1C341' ]
 	assert [ "${REPLIES[1]}" = $'\x1C7' ]
 }
 
 @test "Correctly parses advanced number then string" {
-	bash_object.parse_filter -a '.[3].["subprop"]'
+	bash_object.parse_filter --advanced '.[3].["subprop"]'
 
 	assert [ "${#REPLIES[@]}" -eq 2 ]
 	assert [ "${REPLIES[0]}" = $'\x1C3' ]
 	assert [ "${REPLIES[1]}" = 'subprop' ]
 }
 
 @test "Correctly parses advanced string then number" {
-	bash_object.parse_filter -a '.["subprop"].[9]'
+	bash_object.parse_filter --advanced '.["subprop"].[9]'
 
 	assert [ "${#REPLIES[@]}" -eq 2 ]
 	assert [ "${REPLIES[0]}" = 'subprop' ]

tests/parse-filter-simple.bats

@@ -3,50 +3,50 @@
 load './util/init.sh'
 
 @test "Simple errors on no starting dot 1" {
-	run bash_object.parse_filter -s ''
+	run bash_object.parse_filter --simple ''
 
 	assert_failure
 	assert_line -p "Filter must begin with a dot"
 }
 
 @test "Simple errors on no starting dot 2" {
-	run bash_object.parse_filter -s 'something.here'
+	run bash_object.parse_filter --simple 'something.here'
 
 	assert_failure
 	assert_line -p "Filter must begin with a dot"
 }
 
 @test "Simple succeeds on period" {
-	bash_object.parse_filter -s '.'
+	bash_object.parse_filter --simple '.'
 
 	assert [ "${#REPLIES[@]}" -eq 0 ]
 }
 
 @test "Simple succeeds on key" {
-	bash_object.parse_filter -s '.my_key'
+	bash_object.parse_filter --simple '.my_key'
 
 	assert [ "${#REPLIES[@]}" -eq 1 ]
 	assert [ "${REPLIES[0]}" = 'my_key' ]
 }
 
 @test "Simple succeeds on key and subkey" {
-	bash_object.parse_filter -s '.my_key.sub_key'
+	bash_object.parse_filter --simple '.my_key.sub_key'
 
 	assert [ "${#REPLIES[@]}" -eq 2 ]
 	assert [ "${REPLIES[0]}" = 'my_key' ]
 	assert [ "${REPLIES[1]}" = 'sub_key' ]
 }
 
 @test "Simple succeeds on key with weird characters" {
-	bash_object.parse_filter -s '.12fNe-	=='\\n'\+_m}\y.su/b []"_ke]y'\'
+	bash_object.parse_filter --simple '.12fNe-	=='\\n'\+_m}\y.su/b []"_ke]y'\'
 
 	assert [ "${#REPLIES[@]}" -eq 2 ]
 	assert [ "${REPLIES[0]}" = '12fNe-	=='\\n'\+_m}\y' ]
 	assert [ "${REPLIES[1]}" = 'su/b []"_ke]y'\' ]
 }
 
 @test "Simple succeeds on key with many periods" {
-	bash_object.parse_filter -s '...lima...mike.....oscar'
+	bash_object.parse_filter --simple '...lima...mike.....oscar'
 
 	assert [ "${#REPLIES[@]}" -eq 3 ]
 	assert [ "${REPLIES[0]}" = 'lima' ]