Skip to content

Commit

Permalink
Fixed updating array bug (Issue 3 in git)
Browse files Browse the repository at this point in the history
  • Loading branch information
mikefarah authored and Mike Farah committed Feb 9, 2017
1 parent 037314a commit 0d75edf
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 5 deletions.
24 changes: 19 additions & 5 deletions data_navigator.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,25 @@ func write(context map[interface{}]interface{}, head string, tail []string, valu
if len(tail) == 0 {
context[head] = value
} else {
// e.g. if updating a.b.c, we need to get the 'b' map...
toUpdate := readMap(context, head, tail[0:len(tail)-1]).(map[interface{}]interface{})
// and then set the 'c' key.
key := (tail[len(tail)-1])
toUpdate[key] = value
// e.g. if updating a.b.c, we need to get the 'b', this could be a map or an array
var parent = readMap(context, head, tail[0:len(tail)-1])
switch parent.(type) {
case map[interface{}]interface{}:
toUpdate := parent.(map[interface{}]interface{})
// b is a map, update the key 'c' to the supplied value
key := (tail[len(tail)-1])
toUpdate[key] = value
case []interface{}:
toUpdate := parent.([]interface{})
// b is an array, update it at index 'c' to the supplied value
rawIndex := (tail[len(tail)-1])
index, err := strconv.ParseInt(rawIndex, 10, 64)
if err != nil {
die("Error accessing array: %v", err)
}
toUpdate[index] = value
}

}
}

Expand Down
12 changes: 12 additions & 0 deletions data_navigator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,18 @@ b:
assertResult(t, "4", b["c"].(string))
}

func TestWrite_array(t *testing.T) {
var data = parseData(`
b:
- aa
`)

write(data, "b", []string{"0"}, "bb")

b := data["b"].([]interface{})
assertResult(t, "bb", b[0].(string))
}

func TestWrite_with_no_tail(t *testing.T) {
var data = parseData(`
b:
Expand Down

0 comments on commit 0d75edf

Please sign in to comment.