summaryrefslogtreecommitdiffstats
path: root/transform
diff options
context:
space:
mode:
authorAnthony Fok <foka@debian.org>2015-03-11 11:34:57 -0600
committerbep <bjorn.erik.pedersen@gmail.com>2015-03-11 21:55:00 +0100
commit67df33f50069445d53d373790e8c636e47013a72 (patch)
treec4e9d646f32aa2a7a40e6c5597b904647bc85e3f /transform
parent00f07c5374d859057c6e7c4731000b5978364819 (diff)
Correct initialisms as suggested by golint
First step to use initialisms that golint suggests, for example: Line 116: func GetHtmlRenderer should be GetHTMLRenderer as see on http://goreportcard.com/report/spf13/hugo Thanks to @bep for the idea! Note that command-line flags (cobra and pflag) as well as struct fields like .BaseUrl and .Url that are used in Go HTML templates need more work to maintain backward-compatibility, and thus are NOT yet dealt with in this commit. First step in fixing #959.
Diffstat (limited to 'transform')
-rw-r--r--transform/absurl.go10
-rw-r--r--transform/absurlreplacer.go66
-rw-r--r--transform/chain_test.go8
3 files changed, 42 insertions, 42 deletions
diff --git a/transform/absurl.go b/transform/absurl.go
index 0efe624ac..12f616eea 100644
--- a/transform/absurl.go
+++ b/transform/absurl.go
@@ -4,12 +4,12 @@ import (
"sync"
)
-var absUrlInit sync.Once
-var ar *absurlReplacer
+var absURLInit sync.Once
+var ar *absURLReplacer
// for performance reasons, we reuse the first baseUrl given
func initAbsurlReplacer(baseURL string) {
- absUrlInit.Do(func() {
+ absURLInit.Do(func() {
ar = newAbsurlReplacer(baseURL)
})
}
@@ -18,7 +18,7 @@ func AbsURL(absURL string) (trs []link, err error) {
initAbsurlReplacer(absURL)
trs = append(trs, func(content []byte) []byte {
- return ar.replaceInHtml(content)
+ return ar.replaceInHTML(content)
})
return
}
@@ -27,7 +27,7 @@ func AbsURLInXML(absURL string) (trs []link, err error) {
initAbsurlReplacer(absURL)
trs = append(trs, func(content []byte) []byte {
- return ar.replaceInXml(content)
+ return ar.replaceInXML(content)
})
return
}
diff --git a/transform/absurlreplacer.go b/transform/absurlreplacer.go
index 9f7e4a313..a3c68eac9 100644
--- a/transform/absurlreplacer.go
+++ b/transform/absurlreplacer.go
@@ -29,7 +29,7 @@ type contentlexer struct {
start int // item start position
width int // width of last element
- matchers []absurlMatcher
+ matchers []absURLMatcher
state stateFunc
prefixLookup *prefixes
@@ -101,13 +101,13 @@ func (l *contentlexer) emit() {
var mainPrefixRunes = []prefixRunes{{'s', 'r', 'c', '='}, {'h', 'r', 'e', 'f', '='}}
-type absurlMatcher struct {
+type absURLMatcher struct {
prefix int
match []byte
replacement []byte
}
-func (a absurlMatcher) isSourceType() bool {
+func (a absURLMatcher) isSourceType() bool {
return a.prefix == matchPrefixSrc
}
@@ -177,7 +177,7 @@ func (l *contentlexer) replace() {
}
}
-func doReplace(content []byte, matchers []absurlMatcher) []byte {
+func doReplace(content []byte, matchers []absURLMatcher) []byte {
b := bp.GetBuffer()
defer bp.PutBuffer(b)
@@ -191,48 +191,48 @@ func doReplace(content []byte, matchers []absurlMatcher) []byte {
return b.Bytes()
}
-type absurlReplacer struct {
- htmlMatchers []absurlMatcher
- xmlMatchers []absurlMatcher
+type absURLReplacer struct {
+ htmlMatchers []absURLMatcher
+ xmlMatchers []absURLMatcher
}
-func newAbsurlReplacer(baseUrl string) *absurlReplacer {
- u, _ := url.Parse(baseUrl)
+func newAbsurlReplacer(baseURL string) *absURLReplacer {
+ u, _ := url.Parse(baseURL)
base := strings.TrimRight(u.String(), "/")
// HTML
- dqHtmlMatch := []byte("\"/")
- sqHtmlMatch := []byte("'/")
+ dqHTMLMatch := []byte("\"/")
+ sqHTMLMatch := []byte("'/")
// XML
- dqXmlMatch := []byte("&#34;/")
- sqXmlMatch := []byte("&#39;/")
-
- dqHtml := []byte("\"" + base + "/")
- sqHtml := []byte("'" + base + "/")
-
- dqXml := []byte("&#34;" + base + "/")
- sqXml := []byte("&#39;" + base + "/")
-
- return &absurlReplacer{
- htmlMatchers: []absurlMatcher{
- {matchPrefixSrc, dqHtmlMatch, dqHtml},
- {matchPrefixSrc, sqHtmlMatch, sqHtml},
- {matchPrefixHref, dqHtmlMatch, dqHtml},
- {matchPrefixHref, sqHtmlMatch, sqHtml}},
- xmlMatchers: []absurlMatcher{
- {matchPrefixSrc, dqXmlMatch, dqXml},
- {matchPrefixSrc, sqXmlMatch, sqXml},
- {matchPrefixHref, dqXmlMatch, dqXml},
- {matchPrefixHref, sqXmlMatch, sqXml},
+ dqXMLMatch := []byte("&#34;/")
+ sqXMLMatch := []byte("&#39;/")
+
+ dqHTML := []byte("\"" + base + "/")
+ sqHTML := []byte("'" + base + "/")
+
+ dqXML := []byte("&#34;" + base + "/")
+ sqXML := []byte("&#39;" + base + "/")
+
+ return &absURLReplacer{
+ htmlMatchers: []absURLMatcher{
+ {matchPrefixSrc, dqHTMLMatch, dqHTML},
+ {matchPrefixSrc, sqHTMLMatch, sqHTML},
+ {matchPrefixHref, dqHTMLMatch, dqHTML},
+ {matchPrefixHref, sqHTMLMatch, sqHTML}},
+ xmlMatchers: []absURLMatcher{
+ {matchPrefixSrc, dqXMLMatch, dqXML},
+ {matchPrefixSrc, sqXMLMatch, sqXML},
+ {matchPrefixHref, dqXMLMatch, dqXML},
+ {matchPrefixHref, sqXMLMatch, sqXML},
}}
}
-func (au *absurlReplacer) replaceInHtml(content []byte) []byte {
+func (au *absURLReplacer) replaceInHTML(content []byte) []byte {
return doReplace(content, au.htmlMatchers)
}
-func (au *absurlReplacer) replaceInXml(content []byte) []byte {
+func (au *absURLReplacer) replaceInXML(content []byte) []byte {
return doReplace(content, au.xmlMatchers)
}
diff --git a/transform/chain_test.go b/transform/chain_test.go
index cd7749ec7..8fa45f5a9 100644
--- a/transform/chain_test.go
+++ b/transform/chain_test.go
@@ -54,7 +54,7 @@ func TestChainZeroTransformers(t *testing.T) {
}
}
-func BenchmarkAbsUrl(b *testing.B) {
+func BenchmarkAbsURL(b *testing.B) {
absURL, _ := AbsURL("http://base")
tr := NewChain(absURL...)
@@ -64,7 +64,7 @@ func BenchmarkAbsUrl(b *testing.B) {
}
}
-func TestAbsUrl(t *testing.T) {
+func TestAbsURL(t *testing.T) {
absURL, _ := AbsURL("http://base")
tr := NewChain(absURL...)
@@ -72,7 +72,7 @@ func TestAbsUrl(t *testing.T) {
}
-func BenchmarkXmlAbsUrl(b *testing.B) {
+func BenchmarkXMLAbsURL(b *testing.B) {
absURLInXML, _ := AbsURLInXML("http://base")
tr := NewChain(absURLInXML...)
@@ -82,7 +82,7 @@ func BenchmarkXmlAbsUrl(b *testing.B) {
}
}
-func TestXMLAbsUrl(t *testing.T) {
+func TestXMLAbsURL(t *testing.T) {
absURLInXML, _ := AbsURLInXML("http://base")
tr := NewChain(absURLInXML...)
apply(t.Errorf, tr, xml_abs_url_tests)