Reorganize helpers

diff --git a/helpers/templates.go b/helpers/templates.go
new file mode 100644 (file)
index 0000000..793450b
--- /dev/null
+++ b/helpers/templates.go
@@ -0,0 +1,29 @@
+// Copyright © 2013 Steve Francia <spf@spf13.com>.
+//
+// Licensed under the Simple Public 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://opensource.org/licenses/Simple-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 helpers
+
+import (
+       "regexp"
+       "strings"
+)
+
+var sanitizeRegexp = regexp.MustCompile("[^a-zA-Z0-9./_-]")
+
+func Urlize(url string) string {
+       return Sanitize(strings.ToLower(strings.Replace(strings.TrimSpace(url), " ", "-", -1)))
+}
+
+func Sanitize(s string) string {
+       return sanitizeRegexp.ReplaceAllString(s, "")
+}

diff --git a/hugolib/index.go b/hugolib/index.go
index c3396b286fad0bd36d054866bbef43eae10e0318..38441d463efc2e9bd1405d424b1224d8e2a8d546 100644 (file)
--- a/hugolib/index.go
+++ b/hugolib/index.go
@@ -14,7 +14,7 @@
 package hugolib
 
 import (
-       "github.com/spf13/hugo/template"
+       "github.com/spf13/hugo/helpers"
        "sort"
 )
 
@@ -50,7 +50,7 @@ type IndexList map[string]Index
 
 // KeyPrep... Indexes should be case insensitive. Can make it easily conditional later.
 func kp(in string) string {
-       return template.Urlize(in)
+       return helpers.Urlize(in)
 }
 
 func (i Index) Get(key string) IndexedPages { return i[kp(key)] }

diff --git a/hugolib/page.go b/hugolib/page.go
index 101f6c88488a03688792113edda87525c5bf9ee2..d9f4ad6cadb879ea549edb4de7cf2ebc8ebe0a01 100644 (file)
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -18,8 +18,8 @@ import (
        "errors"
        "fmt"
        "github.com/BurntSushi/toml"
+       "github.com/spf13/hugo/helpers"
        "github.com/spf13/hugo/parser"
-       helper "github.com/spf13/hugo/template"
        "github.com/spf13/hugo/template/bundle"
        "github.com/theplant/blackfriday"
        "html/template"
@@ -366,12 +366,12 @@ func (page *Page) update(f interface{}) error {
                case "description":
                        page.Description = interfaceToString(v)
                case "slug":
-                       page.Slug = helper.Urlize(interfaceToString(v))
+                       page.Slug = helpers.Urlize(interfaceToString(v))
                case "url":
                        if url := interfaceToString(v); strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://") {
                                return fmt.Errorf("Only relative urls are supported, %v provided", url)
                        }
-                       page.Url = helper.Urlize(interfaceToString(v))
+                       page.Url = helpers.Urlize(interfaceToString(v))
                case "type":
                        page.contentType = interfaceToString(v)
                case "keywords":

diff --git a/hugolib/permalinks.go b/hugolib/permalinks.go
index 41e797ea3fb7bb0ca74c539405b32061d15ab180..155b1b81340a9ecb9c5ab723876ca63c7390abc1 100644 (file)
--- a/hugolib/permalinks.go
+++ b/hugolib/permalinks.go
@@ -6,7 +6,7 @@ import (
        "strconv"
        "strings"
 
-       helper "github.com/spf13/hugo/template"
+       "github.com/spf13/hugo/helpers"
 )
 
 // PathPattern represents a string which builds up a URL from attributes
@@ -117,7 +117,7 @@ func pageToPermalinkDate(p *Page, dateField string) (string, error) {
 func pageToPermalinkTitle(p *Page, _ string) (string, error) {
        // Page contains Node which has Title
        // (also contains UrlPath which has Slug, sometimes)
-       return helper.Urlize(p.Title), nil
+       return helpers.Urlize(p.Title), nil
 }
 
 // if the page has a slug, return the slug, else return the title

diff --git a/hugolib/site.go b/hugolib/site.go
index 128b239620b12bb48330b62f1088a5de3e3eb48d..75ba6bfa896386c55f819773cacd148887478024 100644 (file)
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -17,9 +17,9 @@ import (
        "bitbucket.org/pkg/inflect"
        "bytes"
        "fmt"
+       "github.com/spf13/hugo/helpers"
        "github.com/spf13/hugo/source"
        "github.com/spf13/hugo/target"
-       helpers "github.com/spf13/hugo/template"
        "github.com/spf13/hugo/template/bundle"
        "github.com/spf13/hugo/transform"
        "github.com/spf13/nitro"

diff --git a/target/htmlredirect.go b/target/htmlredirect.go
index a2695c6d9a3e1ddb011a8782ddb6a9f78bb91fc2..53e900f9163207aa086a5f8179b3c7f96610bad4 100644 (file)
--- a/target/htmlredirect.go
+++ b/target/htmlredirect.go
@@ -2,7 +2,7 @@ package target
 
 import (
        "bytes"
-       helpers "github.com/spf13/hugo/template"
+       "github.com/spf13/hugo/helpers"
        "html/template"
        "path"
        "strings"

diff --git a/template/bundle/template.go b/template/bundle/template.go
index 879bd14910f64062ae7aeb12ee49e9f02941e610..a53b38fadbbc896f959347625f55175c2b4a8aea 100644 (file)
--- a/template/bundle/template.go
+++ b/template/bundle/template.go
@@ -3,7 +3,7 @@ package bundle
 import (
        "errors"
        "github.com/eknkc/amber"
-       helpers "github.com/spf13/hugo/template"
+       "github.com/spf13/hugo/helpers"
        "html/template"
        "io"
        "io/ioutil"

diff --git a/template/helpers.go b/template/helpers.go
deleted file mode 100644 (file)
index d12ffd9..0000000
--- a/template/helpers.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright © 2013 Steve Francia <spf@spf13.com>.
-//
-// Licensed under the Simple Public 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://opensource.org/licenses/Simple-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 template
-
-import (
-       "regexp"
-       "strings"
-)
-
-var sanitizeRegexp = regexp.MustCompile("[^a-zA-Z0-9./_-]")
-
-func Urlize(url string) string {
-       return Sanitize(strings.ToLower(strings.Replace(strings.TrimSpace(url), " ", "-", -1)))
-}
-
-func Sanitize(s string) string {
-       return sanitizeRegexp.ReplaceAllString(s, "")
-}