shithub: hugo

Download patch

ref: be366bfe1e9318c78f0982caa16f9a94c05a57eb
parent: be8e6d4f1fbde728c0e2ede438e1827aba73fdd2
author: bep <[email protected]>
date: Tue Apr 21 17:25:42 EDT 2015 

pagination: export pager to make Golint happy


--- a/hugolib/node.go
+++ b/hugolib/node.go
@@ -32,7 +32,7 @@
 	Date        time.Time
 	Sitemap     Sitemap
 	URLPath
-	paginator     *pager
+	paginator     *Pager
 	paginatorInit sync.Once
 	scratch       *Scratch
 }
--- a/hugolib/pagination.go
+++ b/hugolib/pagination.go
@@ -25,12 +25,12 @@
 	"reflect"
 )
 
-type pager struct {
+type Pager struct {
 	number int
 	*paginator
 }
 
-type pagers []*pager
+type pagers []*Pager
 
 var paginatorEmptyPages Pages
 
@@ -47,23 +47,23 @@
 type paginationURLFactory func(int) string
 
 // PageNumber returns the current page's number in the pager sequence.
-func (p *pager) PageNumber() int {
+func (p *Pager) PageNumber() int {
 	return p.number
 }
 
 // URL returns the URL to the current page.
-func (p *pager) URL() template.HTML {
+func (p *Pager) URL() template.HTML {
 	return template.HTML(p.paginationURLFactory(p.PageNumber()))
 }
 
 // Url is deprecated. Will be removed in 0.15.
-func (p *pager) Url() template.HTML {
+func (p *Pager) Url() template.HTML {
 	helpers.Deprecated("Paginator", ".Url", ".URL")
 	return p.URL()
 }
 
 // Pages returns the elements on this page.
-func (p *pager) Pages() Pages {
+func (p *Pager) Pages() Pages {
 	if len(p.paginatedPages) == 0 {
 		return paginatorEmptyPages
 	}
@@ -71,17 +71,17 @@
 }
 
 // NumberOfElements gets the number of elements on this page.
-func (p *pager) NumberOfElements() int {
+func (p *Pager) NumberOfElements() int {
 	return len(p.Pages())
 }
 
 // HasPrev tests whether there are page(s) before the current.
-func (p *pager) HasPrev() bool {
+func (p *Pager) HasPrev() bool {
 	return p.PageNumber() > 1
 }
 
 // Prev returns the pager for the previous page.
-func (p *pager) Prev() *pager {
+func (p *Pager) Prev() *Pager {
 	if !p.HasPrev() {
 		return nil
 	}
@@ -89,12 +89,12 @@
 }
 
 // HasNext tests whether there are page(s) after the current.
-func (p *pager) HasNext() bool {
+func (p *Pager) HasNext() bool {
 	return p.PageNumber() < len(p.paginatedPages)
 }
 
 // Next returns the pager for the next page.
-func (p *pager) Next() *pager {
+func (p *Pager) Next() *Pager {
 	if !p.HasNext() {
 		return nil
 	}
@@ -102,12 +102,12 @@
 }
 
 // First returns the pager for the first page.
-func (p *pager) First() *pager {
+func (p *Pager) First() *Pager {
 	return p.pagers[0]
 }
 
 // Last returns the pager for the last page.
-func (p *pager) Last() *pager {
+func (p *Pager) Last() *Pager {
 	return p.pagers[len(p.pagers)-1]
 }
 
@@ -143,7 +143,7 @@
 
 // Paginator gets this Node's paginator if it's already created.
 // If it's not, one will be created with all pages in Data["Pages"].
-func (n *Node) Paginator(options ...interface{}) (*pager, error) {
+func (n *Node) Paginator(options ...interface{}) (*Pager, error) {
 
 	pagerSize, err := resolvePagerSize(options...)
 
@@ -182,12 +182,12 @@
 }
 
 // Paginator on Page isn't supported, calling this yields an error.
-func (p *Page) Paginator(options ...interface{}) (*pager, error) {
+func (p *Page) Paginator(options ...interface{}) (*Pager, error) {
 	return nil, errors.New("Paginators not supported for content pages.")
 }
 
 // Paginate on Page isn't supported, calling this yields an error.
-func (p *Page) Paginate(seq interface{}, options ...interface{}) (*pager, error) {
+func (p *Page) Paginate(seq interface{}, options ...interface{}) (*Pager, error) {
 	return nil, errors.New("Paginators not supported for content pages.")
 }
 
@@ -194,7 +194,7 @@
 // Paginate gets this Node's paginator if it's already created.
 // If it's not, one will be created with the qiven sequence.
 // Note that repeated calls will return the same result, even if the sequence is different.
-func (n *Node) Paginate(seq interface{}, options ...interface{}) (*pager, error) {
+func (n *Node) Paginate(seq interface{}, options ...interface{}) (*Pager, error) {
 
 	pagerSize, err := resolvePagerSize(options...)
 
@@ -230,12 +230,12 @@
 
 	if n.paginator.source == "paginator" {
 		return nil, errors.New("a Paginator was previously built for this Node without filters; look for earlier .Paginator usage")
-	} else {
-		if !reflect.DeepEqual(options, n.paginator.options) || !probablyEqualPageLists(n.paginator.source, seq) {
-			return nil, errors.New("invoked multiple times with different arguments")
-		}
 	}
 
+	if !reflect.DeepEqual(options, n.paginator.options) || !probablyEqualPageLists(n.paginator.source, seq) {
+		return nil, errors.New("invoked multiple times with different arguments")
+	}
+
 	return n.paginator, nil
 }
 
@@ -338,11 +338,11 @@
 	if len(split) > 0 {
 		ps = make(pagers, len(split))
 		for i := range p.paginatedPages {
-			ps[i] = &pager{number: (i + 1), paginator: p}
+			ps[i] = &Pager{number: (i + 1), paginator: p}
 		}
 	} else {
 		ps = make(pagers, 1)
-		ps[0] = &pager{number: 1, paginator: p}
+		ps[0] = &Pager{number: 1, paginator: p}
 	}
 
 	p.pagers = ps
--- a/hugolib/pagination_test.go
+++ b/hugolib/pagination_test.go
@@ -129,7 +129,7 @@
 	n2 := s.newHomeNode()
 	n1.Data["Pages"] = pages
 
-	var paginator1 *pager
+	var paginator1 *Pager
 	var err error
 
 	if useViper {
@@ -184,7 +184,7 @@
 	n1 := s.newHomeNode()
 	n2 := s.newHomeNode()
 
-	var paginator1, paginator2 *pager
+	var paginator1, paginator2 *Pager
 	var err error
 
 	if useViper {