Skip to content

Commit

Permalink
tpl/time: Make it a package that stands on its own
Browse files Browse the repository at this point in the history
  • Loading branch information
bep committed Apr 30, 2017
1 parent d101c10 commit 23a8799
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 8 deletions.
45 changes: 45 additions & 0 deletions tpl/time/init.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// Copyright 2017 The Hugo Authors. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package time

import (
"github.com/spf13/hugo/deps"
"github.com/spf13/hugo/tpl/internal"
)

const name = "time"

func init() {
f := func(d *deps.Deps) *internal.TemplateFuncsNamespace {
ctx := New()

examples := [][2]string{
{`{{ (time "2015-01-21").Year }}`, `2015`},
}

return &internal.TemplateFuncsNamespace{
Name: name,
Context: func() interface{} { return ctx },
Aliases: map[string]interface{}{
"dateFormat": ctx.Format,
"now": ctx.Now,
"time": ctx.AsTime,
},
Examples: examples,
}

}

internal.AddTemplateFuncsNamespace(f)
}
3 changes: 0 additions & 3 deletions tpl/tplimpl/templateFuncster.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (

bp "github.com/spf13/hugo/bufferpool"
"github.com/spf13/hugo/deps"
"github.com/spf13/hugo/tpl/time"
"github.com/spf13/hugo/tpl/transform"
"github.com/spf13/hugo/tpl/urls"
)
Expand All @@ -32,7 +31,6 @@ type templateFuncster struct {
cachedPartials partialCache

// Namespaces
time *time.Namespace
transform *transform.Namespace
urls *urls.Namespace

Expand All @@ -45,7 +43,6 @@ func newTemplateFuncster(deps *deps.Deps) *templateFuncster {
cachedPartials: partialCache{p: make(map[string]interface{})},

// Namespaces
time: time.New(),
transform: transform.New(deps),
urls: urls.New(deps),
}
Expand Down
4 changes: 1 addition & 3 deletions tpl/tplimpl/template_funcs.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import (
_ "github.com/spf13/hugo/tpl/os"
_ "github.com/spf13/hugo/tpl/safe"
_ "github.com/spf13/hugo/tpl/strings"
_ "github.com/spf13/hugo/tpl/time"
)

// Get retrieves partial output from the cache based upon the partial name.
Expand Down Expand Up @@ -95,14 +96,12 @@ func (t *templateFuncster) initFuncMap() {

"absURL": t.urls.AbsURL,
"absLangURL": t.urls.AbsLangURL,
"dateFormat": t.time.Format,
"emojify": t.transform.Emojify,
"highlight": t.transform.Highlight,
"htmlEscape": t.transform.HTMLEscape,
"htmlUnescape": t.transform.HTMLUnescape,
"int": func(v interface{}) (int, error) { return cast.ToIntE(v) },
"markdownify": t.transform.Markdownify,
"now": t.time.Now,
"partial": t.partial,
"partialCached": t.partialCached,
"plainify": t.transform.Plainify,
Expand All @@ -114,7 +113,6 @@ func (t *templateFuncster) initFuncMap() {
"relLangURL": t.urls.RelLangURL,
"relref": t.urls.RelRef,
"string": func(v interface{}) (string, error) { return cast.ToStringE(v) },
"time": t.time.AsTime,
"urlize": t.PathSpec.URLize,
}

Expand Down
2 changes: 0 additions & 2 deletions tpl/tplimpl/template_funcs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ relURL 1: {{ "http://gohugo.io/" | relURL }}
relURL 2: {{ "mystyle.css" | relURL }}
relURL 3: {{ mul 2 21 | relURL }}
strings.TrimPrefix: {{ strings.TrimPrefix "Goodbye,, world!" "Goodbye," }}
time: {{ (time "2015-01-21").Year }}
urlize: {{ "Bat Man" | urlize }}
`

Expand Down Expand Up @@ -174,7 +173,6 @@ relURL 1: http://gohugo.io/
relURL 2: /hugo/mystyle.css
relURL 3: /hugo/42
strings.TrimPrefix: , world!
time: 2015
urlize: bat-man
`

Expand Down

0 comments on commit 23a8799

Please sign in to comment.