Switch .Data to .Pages in the PageGroup functionality for increased consistency.

diff --git a/hugolib/pageGroup.go b/hugolib/pageGroup.go
index 2fd159ab8b4c23b63cf2ef39e6f5f5a8cb025c44..77380a6eecad53cf337714cb86b411f6a8c6133a 100644 (file)
--- a/hugolib/pageGroup.go
+++ b/hugolib/pageGroup.go
@@ -20,8 +20,8 @@ import (
 )
 
 type PageGroup struct {
-       Key  interface{}
-       Data Pages
+       Key   interface{}
+       Pages Pages
 }
 
 type mapKeyValues []reflect.Value
@@ -87,8 +87,8 @@ func (p Pages) GroupBy(key, order string) ([]PageGroup, error) {
        }
 
        var r []PageGroup
-       for _, k := range sortKeys(tmp.MapKeys(), order) {
-               r = append(r, PageGroup{Key: k.Interface(), Data: tmp.MapIndex(k).Interface().([]*Page)})
+       for _, k := range sortKeys(tmp.MapKeys(), direction) {
+               r = append(r, PageGroup{Key: k.Interface(), Pages: tmp.MapIndex(k).Interface().([]*Page)})
        }
 
        return r, nil
@@ -110,8 +110,8 @@ func (p Pages) GroupByDate(format, order string) ([]PageGroup, error) {
 
        date := sp[0].Date.Format(format)
        var r []PageGroup
-       r = append(r, PageGroup{Key: date, Data: make(Pages, 0)})
-       r[0].Data = append(r[0].Data, sp[0])
+       r = append(r, PageGroup{Key: date, Pages: make(Pages, 0)})
+       r[0].Pages = append(r[0].Pages, sp[0])
 
        i := 0
        for _, e := range sp[1:] {
@@ -120,7 +120,7 @@ func (p Pages) GroupByDate(format, order string) ([]PageGroup, error) {
                        r = append(r, PageGroup{Key: date})
                        i++
                }
-               r[i].Data = append(r[i].Data, e)
+               r[i].Pages = append(r[i].Pages, e)
        }
        return r, nil
 }

diff --git a/hugolib/site_test.go b/hugolib/site_test.go
index 5ab09f102ad3c129c26aa1449289a0862039dec3..aef1e04432bbd82e79c6be99f3125dfb6ba869d8 100644 (file)
--- a/hugolib/site_test.go
+++ b/hugolib/site_test.go
@@ -522,11 +522,11 @@ func TestGroupedPages(t *testing.T) {
        if rbysection[2].Key != "sect1" {
                t.Errorf("PageGroup array in unexpected order. Third group key should be '%s', got '%s'", "sect1", rbysection[2].Key)
        }
-       if rbysection[0].Data[0].Title != "Four" {
-               t.Errorf("PageGroup has an unexpected page. First group's data should have '%s', got '%s'", "Four", rbysection[0].Data[0].Title)
+       if rbysection[0].Pages[0].Title != "Four" {
+               t.Errorf("PageGroup has an unexpected page. First group's pages should have '%s', got '%s'", "Four", rbysection[0].Pages[0].Title)
        }
-       if len(rbysection[2].Data) != 2 {
-               t.Errorf("PageGroup has unexpected number of pages. Third group should have '%d' pages, got '%d' pages", 2, len(rbysection[2].Data))
+       if len(rbysection[2].Pages) != 2 {
+               t.Errorf("PageGroup has unexpected number of pages. Third group should have '%d' pages, got '%d' pages", 2, len(rbysection[2].Pages))
        }
 
        bydate, err := s.Pages.GroupByDate("2006-01", "asc")
@@ -542,11 +542,11 @@ func TestGroupedPages(t *testing.T) {
        if bydate[2].Key != "2012-04" {
                t.Errorf("PageGroup array in unexpected order. Third group key should be '%s', got '%s'", "2012-04", bydate[2].Key)
        }
-       if bydate[2].Data[0].Title != "Three" {
-               t.Errorf("PageGroup has an unexpected page. Third group's data should have '%s', got '%s'", "Three", bydate[2].Data[0].Title)
+       if bydate[2].Pages[0].Title != "Three" {
+               t.Errorf("PageGroup has an unexpected page. Third group's pages should have '%s', got '%s'", "Three", bydate[2].Pages[0].Title)
        }
-       if len(bydate[0].Data) != 2 {
-               t.Errorf("PageGroup has unexpected number of pages. First group should have '%d' pages, got '%d' pages", 2, len(bydate[2].Data))
+       if len(bydate[0].Pages) != 2 {
+               t.Errorf("PageGroup has unexpected number of pages. First group should have '%d' pages, got '%d' pages", 2, len(bydate[2].Pages))
        }
 }