tpl/data: Make it a package that stands on its own

See #3042

diff --git a/tpl/data/init.go b/tpl/data/init.go
new file mode 100644 (file)
index 0000000..476e9ab
--- /dev/null
+++ b/tpl/data/init.go
@@ -0,0 +1,43 @@
+// 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 data
+
+import (
+       "github.com/spf13/hugo/deps"
+       "github.com/spf13/hugo/tpl/internal"
+)
+
+const name = "data"
+
+func init() {
+       f := func(d *deps.Deps) *internal.TemplateFuncsNamespace {
+               ctx := New(d)
+
+               examples := [][2]string{
+                       {},
+               }
+
+               return &internal.TemplateFuncsNamespace{
+                       Name:    name,
+                       Context: func() interface{} { return ctx },
+                       Aliases: map[string]interface{}{
+                               "getCSV":  ctx.GetCSV,
+                               "getJSON": ctx.GetJSON,
+                       },
+                       Examples: examples,
+               }
+       }
+
+       internal.AddTemplateFuncsNamespace(f)
+}

diff --git a/tpl/tplimpl/templateFuncster.go b/tpl/tplimpl/templateFuncster.go
index 770eaf46ef0c590081304a70c667f9b2c1802745..a3ad97a29a7a32989edb1d9230ba733745ff0635 100644 (file)
--- a/tpl/tplimpl/templateFuncster.go
+++ b/tpl/tplimpl/templateFuncster.go
@@ -23,7 +23,6 @@ import (
        "github.com/spf13/hugo/deps"
        "github.com/spf13/hugo/tpl/collections"
        "github.com/spf13/hugo/tpl/crypto"
-       "github.com/spf13/hugo/tpl/data"
        "github.com/spf13/hugo/tpl/encoding"
        "github.com/spf13/hugo/tpl/images"
        "github.com/spf13/hugo/tpl/inflect"
@@ -42,7 +41,6 @@ type templateFuncster struct {
        // Namespaces
        collections *collections.Namespace
        crypto      *crypto.Namespace
-       data        *data.Namespace
        encoding    *encoding.Namespace
        images      *images.Namespace
        inflect     *inflect.Namespace
@@ -63,7 +61,6 @@ func newTemplateFuncster(deps *deps.Deps) *templateFuncster {
                // Namespaces
                collections: collections.New(deps),
                crypto:      crypto.New(),
-               data:        data.New(deps),
                encoding:    encoding.New(),
                images:      images.New(deps),
                inflect:     inflect.New(),

diff --git a/tpl/tplimpl/template_funcs.go b/tpl/tplimpl/template_funcs.go
index acf7790f04105a33b41100b51d7c4c5263ace2bb..3e4fc558a5aa7d02ff0c324ed7a30173f09bcc79 100644 (file)
--- a/tpl/tplimpl/template_funcs.go
+++ b/tpl/tplimpl/template_funcs.go
@@ -25,6 +25,7 @@ import (
        "github.com/spf13/hugo/tpl/internal"
 
        // Init the namespaces
+       _ "github.com/spf13/hugo/tpl/data"
        _ "github.com/spf13/hugo/tpl/lang"
        _ "github.com/spf13/hugo/tpl/math"
        _ "github.com/spf13/hugo/tpl/strings"
@@ -107,8 +108,6 @@ func (t *templateFuncster) initFuncMap() {
                "eq":            compare.Eq,
                "first":         t.collections.First,
                "ge":            compare.Ge,
-               "getCSV":        t.data.GetCSV,
-               "getJSON":       t.data.GetJSON,
                "getenv":        t.os.Getenv,
                "gt":            compare.Gt,
                "highlight":     t.transform.Highlight,