Reorganize helpers - hugo - [fork] hugo port for 9front
HTML git clone git@git.drkhsh.at/hugo.git
DIR Log
DIR Files
DIR Refs
DIR Submodules
DIR README
DIR LICENSE
---
DIR commit 44d57fdc0ce6743a92a8ad8b73566e344762cc24
DIR parent 10c7cf29424b6c230ae9df14de41656e97ea85c8
HTML Author: spf13 <steve.francia@gmail.com>
Date: Thu, 5 Dec 2013 09:29:41 -0500
Reorganize helpers
Diffstat:
A helpers/templates.go | 29 +++++++++++++++++++++++++++++
M hugolib/index.go | 4 ++--
M hugolib/page.go | 6 +++---
M hugolib/permalinks.go | 4 ++--
M hugolib/site.go | 2 +-
M target/htmlredirect.go | 2 +-
M template/bundle/template.go | 2 +-
D template/helpers.go | 29 -----------------------------
8 files changed, 39 insertions(+), 39 deletions(-)
---
DIR diff --git a/helpers/templates.go 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, "")
+}
DIR diff --git 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)] }
DIR diff --git 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":
DIR diff --git 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
DIR diff --git 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"
DIR diff --git 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"
DIR diff --git 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"
DIR diff --git a/template/helpers.go b/template/helpers.go
@@ -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, "")
-}