github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Unexport ShouldBuild and AssertShouldBuild

Browse source
This commit is contained in:
Bjørn Erik Pedersen 2016-06-14 15:53:49 +02:00
parent eeaafb4b26
commit 8588103316
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hugolib/page.go
View file

@ -467,12 +467,12 @@ func (p *Page) LinkTitle() string {
return p.Title
}
func (p *Page) ShouldBuild() bool {
return AssertShouldBuild(viper.GetBool("BuildFuture"), viper.GetBool("BuildExpired"),
func (p *Page) shouldBuild() bool {
return shouldBuild(viper.GetBool("BuildFuture"), viper.GetBool("BuildExpired"),
viper.GetBool("BuildDrafts"), p.Draft, p.PublishDate, p.ExpiryDate)
}
func AssertShouldBuild(buildFuture bool, buildExpired bool, buildDrafts bool, Draft bool,
func shouldBuild(buildFuture bool, buildExpired bool, buildDrafts bool, Draft bool,
publishDate time.Time, expiryDate time.Time) bool {
if !(buildDrafts || !Draft) {
return false

4
hugolib/page_test.go
View file

@ -1090,7 +1090,7 @@ func compareObjects(a interface{}, b interface{}) bool {
return strings.Join(aStr, "") == strings.Join(bStr, "")
}
func TestAssertShouldBuild(t *testing.T) {
func TestShouldBuild(t *testing.T) {
var past = time.Date(2009, 11, 17, 20, 34, 58, 651387237, time.UTC)
var future = time.Date(2037, 11, 17, 20, 34, 58, 651387237, time.UTC)
var zero = time.Time{}
@ -1128,7 +1128,7 @@ func TestAssertShouldBuild(t *testing.T) {
}
for _, ps := range publishSettings {
s := AssertShouldBuild(ps.buildFuture, ps.buildExpired, ps.buildDrafts, ps.draft,
s := shouldBuild(ps.buildFuture, ps.buildExpired, ps.buildDrafts, ps.draft,
ps.publishDate, ps.expiryDate)
if s != ps.out {
t.Errorf("AssertShouldBuild unexpected output with params: %+v", ps)

2
hugolib/site.go
View file

@ -996,7 +996,7 @@ func converterCollator(s *Site, results <-chan HandledResult, errs chan<- error)
}
func (s *Site) addPage(page *Page) {
if page.ShouldBuild() {
if page.shouldBuild() {
s.Pages = append(s.Pages, page)
}