From f1db7eb35f37183949091e7956cd59f06ec8bd83 Mon Sep 17 00:00:00 2001 From: Vincent Smith Date: Tue, 28 Aug 2018 08:25:54 -0400 Subject: [PATCH] Add support for struct slices This commit continues the work done in #205 by adding support for slices of structs. Closes #197 --- unmarshal.go | 6 ++++++ unmarshal_test.go | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/unmarshal.go b/unmarshal.go index e36c20dd5..c4a66c4a6 100644 --- a/unmarshal.go +++ b/unmarshal.go @@ -150,6 +150,12 @@ func unmarshalSlice(s *goquery.Selection, selector, htmlAttr string, attrV refle UnmarshalHTML(someVal.Interface(), innerSel) attrV.Set(reflect.Append(attrV, someVal)) }) + case reflect.Struct: + s.Find(selector).Each(func(_ int, innerSel *goquery.Selection) { + someVal := reflect.New(attrV.Type().Elem()) + UnmarshalHTML(someVal.Interface(), innerSel) + attrV.Set(reflect.Append(attrV, reflect.Indirect(someVal))) + }) default: return errors.New("Invalid slice type") } diff --git a/unmarshal_test.go b/unmarshal_test.go index 2ef635516..59ae58a51 100644 --- a/unmarshal_test.go +++ b/unmarshal_test.go @@ -99,3 +99,31 @@ func TestPointerSliceUnmarshall(t *testing.T) { } } + +func TestStructSliceUnmarshall(t *testing.T) { + type info struct { + Text string `selector:"span"` + } + type object struct { + Info []info `selector:"li.info"` + } + + doc, _ := goquery.NewDocumentFromReader(bytes.NewBuffer(pointerSliceTestData)) + e := HTMLElement{DOM: doc.First()} + o := object{} + err := e.Unmarshal(&o) + if err != nil { + t.Fatalf("Failed to unmarshal page: %s\n", err.Error()) + } + + if len(o.Info) != 2 { + t.Errorf("Invalid length for Info: %d, expected 2", len(o.Info)) + } + if o.Info[0].Text != "Info 1" { + t.Errorf("Invalid data for Info.[0].Text: %s, expected Info 1", o.Info[0].Text) + } + if o.Info[1].Text != "Info 2" { + t.Errorf("Invalid data for Info.[1].Text: %s, expected Info 2", o.Info[1].Text) + } + +}