From 67df33f50069445d53d373790e8c636e47013a72 Mon Sep 17 00:00:00 2001 From: Anthony Fok Date: Wed, 11 Mar 2015 11:34:57 -0600 Subject: 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. --- transform/absurl.go | 10 +++---- transform/absurlreplacer.go | 66 ++++++++++++++++++++++----------------------- transform/chain_test.go | 8 +++--- 3 files changed, 42 insertions(+), 42 deletions(-) (limited to 'transform') 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(""/") - sqXmlMatch := []byte("'/") - - dqHtml := []byte("\"" + base + "/") - sqHtml := []byte("'" + base + "/") - - dqXml := []byte(""" + base + "/") - sqXml := []byte("'" + 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(""/") + sqXMLMatch := []byte("'/") + + dqHTML := []byte("\"" + base + "/") + sqHTML := []byte("'" + base + "/") + + dqXML := []byte(""" + base + "/") + sqXML := []byte("'" + 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) -- cgit v1.2.3