danog/liquid
1
0
Fork 0
mirror of https://github.com/danog/liquid.git synced 2024-12-02 17:17:48 +01:00
Code Issues Projects Releases Wiki Activity

Fix array[nil]

Browse Source
This commit is contained in:
Oliver Steele 2017-08-08 17:15:29 -04:00
parent 51d7166e88
commit e39a1fe0d4
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
values/value.go
View File

@ -169,7 +169,7 @@ func (v arrayValue) IndexValue(index Value) Value {
func (v mapValue) IndexValue(index Value) Value { func (v mapValue) IndexValue(index Value) Value {
rv := reflect.ValueOf(v.basis) rv := reflect.ValueOf(v.basis)
iv := reflect.ValueOf(index.Interface()) iv := reflect.ValueOf(index.Interface())
if rv.Type().Key() == iv.Type() { if iv.IsValid() && rv.Type().Key() == iv.Type() {
ev := rv.MapIndex(iv) ev := rv.MapIndex(iv)
if ev.IsValid() { if ev.IsValid() {
return ValueOf(ev.Interface()) return ValueOf(ev.Interface())
@ -198,6 +198,9 @@ func (v arrayValue) PropertyValue(index Value) Value {
func (v mapValue) PropertyValue(index Value) Value { func (v mapValue) PropertyValue(index Value) Value {
rv := reflect.ValueOf(v.Interface()) rv := reflect.ValueOf(v.Interface())
iv := reflect.ValueOf(index.Interface()) iv := reflect.ValueOf(index.Interface())
if !iv.IsValid() {
return nilValue
}
ev := rv.MapIndex(iv) ev := rv.MapIndex(iv)
switch { switch {
case ev.IsValid(): case ev.IsValid():

28
values/value_test.go
View File

@ -11,7 +11,7 @@ import (
func TestValue_Interface(t *testing.T) { func TestValue_Interface(t *testing.T) {
nv := ValueOf(nil) nv := ValueOf(nil)
iv := ValueOf(123) iv := ValueOf(123)
require.Equal(t, nil, nv.Interface()) require.Nil(t, nv.Interface())
require.Equal(t, true, ValueOf(true).Interface()) require.Equal(t, true, ValueOf(true).Interface())
require.Equal(t, false, ValueOf(false).Interface()) require.Equal(t, false, ValueOf(false).Interface())
require.Equal(t, 123, iv.Interface()) require.Equal(t, 123, iv.Interface())
@ -49,8 +49,8 @@ func TestValue_IndexValue(t *testing.T) {
// empty list // empty list
empty := ValueOf([]string{}) empty := ValueOf([]string{})
require.Equal(t, nil, empty.IndexValue(ValueOf(0)).Interface()) require.Nil(t, empty.IndexValue(ValueOf(0)).Interface())
require.Equal(t, nil, empty.IndexValue(ValueOf(-1)).Interface()) require.Nil(t, empty.IndexValue(ValueOf(-1)).Interface())
// list // list
av := ValueOf([]string{"first", "second", "third"}) av := ValueOf([]string{"first", "second", "third"})
@ -58,48 +58,54 @@ func TestValue_IndexValue(t *testing.T) {
require.Equal(t, "third", av.IndexValue(ValueOf(-1)).Interface()) require.Equal(t, "third", av.IndexValue(ValueOf(-1)).Interface())
require.Equal(t, "second", av.IndexValue(ValueOf(1.0)).Interface()) require.Equal(t, "second", av.IndexValue(ValueOf(1.0)).Interface())
require.Equal(t, "second", av.IndexValue(ValueOf(1.1)).Interface()) require.Equal(t, "second", av.IndexValue(ValueOf(1.1)).Interface())
require.Nil(t, av.IndexValue(ValueOf(nil)).Interface())
// hash // hash
hv := ValueOf(map[string]interface{}{"key": "value"}) hv := ValueOf(map[string]interface{}{"key": "value"})
require.Equal(t, "value", hv.IndexValue(ValueOf("key")).Interface()) require.Equal(t, "value", hv.IndexValue(ValueOf("key")).Interface())
require.Equal(t, nil, hv.IndexValue(ValueOf("missing_key")).Interface()) require.Nil(t, hv.IndexValue(ValueOf("missing_key")).Interface())
require.Nil(t, hv.IndexValue(ValueOf(nil)).Interface())
// hash ptr // hash ptr
hashPtr := ValueOf(&map[string]interface{}{"key": "value"}) hashPtr := ValueOf(&map[string]interface{}{"key": "value"})
require.Equal(t, "value", hashPtr.IndexValue(ValueOf("key")).Interface()) require.Equal(t, "value", hashPtr.IndexValue(ValueOf("key")).Interface())
require.Equal(t, nil, hashPtr.IndexValue(ValueOf("missing_key")).Interface()) require.Nil(t, hashPtr.IndexValue(ValueOf("missing_key")).Interface())
// MapSlice // MapSlice
msv := ValueOf(yaml.MapSlice{{Key: "key", Value: "value"}}) msv := ValueOf(yaml.MapSlice{{Key: "key", Value: "value"}})
require.Equal(t, "value", msv.IndexValue(ValueOf("key")).Interface()) require.Equal(t, "value", msv.IndexValue(ValueOf("key")).Interface())
require.Equal(t, nil, msv.IndexValue(ValueOf("missing_key")).Interface()) require.Nil(t, msv.IndexValue(ValueOf("missing_key")).Interface())
require.Nil(t, msv.IndexValue(ValueOf(nil)).Interface())
} }
func TestValue_PropertyValue(t *testing.T) { func TestValue_PropertyValue(t *testing.T) {
// empty list // empty list
empty := ValueOf([]string{}) empty := ValueOf([]string{})
require.Equal(t, nil, empty.PropertyValue(ValueOf("first")).Interface()) require.Nil(t, empty.PropertyValue(ValueOf("first")).Interface())
require.Equal(t, nil, empty.PropertyValue(ValueOf("last")).Interface()) require.Nil(t, empty.PropertyValue(ValueOf("last")).Interface())
// list // list
av := ValueOf([]string{"first", "second", "third"}) av := ValueOf([]string{"first", "second", "third"})
require.Equal(t, "first", av.PropertyValue(ValueOf("first")).Interface()) require.Equal(t, "first", av.PropertyValue(ValueOf("first")).Interface())
require.Equal(t, "third", av.PropertyValue(ValueOf("last")).Interface()) require.Equal(t, "third", av.PropertyValue(ValueOf("last")).Interface())
require.Nil(t, av.PropertyValue(ValueOf(nil)).Interface())
// hash // hash
hv := ValueOf(map[string]interface{}{"key": "value"}) hv := ValueOf(map[string]interface{}{"key": "value"})
require.Equal(t, "value", hv.PropertyValue(ValueOf("key")).Interface()) require.Equal(t, "value", hv.PropertyValue(ValueOf("key")).Interface())
require.Equal(t, nil, hv.PropertyValue(ValueOf("missing_key")).Interface()) require.Nil(t, hv.PropertyValue(ValueOf("missing_key")).Interface())
require.Nil(t, hv.PropertyValue(ValueOf(nil)).Interface())
// hash ptr // hash ptr
hashPtr := ValueOf(&map[string]interface{}{"key": "value"}) hashPtr := ValueOf(&map[string]interface{}{"key": "value"})
require.Equal(t, "value", hashPtr.PropertyValue(ValueOf("key")).Interface()) require.Equal(t, "value", hashPtr.PropertyValue(ValueOf("key")).Interface())
require.Equal(t, nil, hashPtr.PropertyValue(ValueOf("missing_key")).Interface()) require.Nil(t, hashPtr.PropertyValue(ValueOf("missing_key")).Interface())
// MapSlice // MapSlice
msv := ValueOf(yaml.MapSlice{{Key: "key", Value: "value"}}) msv := ValueOf(yaml.MapSlice{{Key: "key", Value: "value"}})
require.Equal(t, "value", msv.PropertyValue(ValueOf("key")).Interface()) require.Equal(t, "value", msv.PropertyValue(ValueOf("key")).Interface())
require.Equal(t, nil, msv.PropertyValue(ValueOf("missing_key")).Interface()) require.Nil(t, msv.PropertyValue(ValueOf("missing_key")).Interface())
require.Nil(t, msv.PropertyValue(ValueOf(nil)).Interface())
} }
func TestValue_Contains(t *testing.T) { func TestValue_Contains(t *testing.T) {