Un-export ContentReWriter

This commit is contained in:
bep 2015-03-18 17:33:12 +01:00
parent 98ee69bce2
commit e7099cfa26
5 changed files with 14 additions and 14 deletions

View file

@ -17,7 +17,7 @@ func initAbsURLReplacer(baseURL string) {
func AbsURL(absURL string) (trs []link, err error) { func AbsURL(absURL string) (trs []link, err error) {
initAbsURLReplacer(absURL) initAbsURLReplacer(absURL)
trs = append(trs, func(rw ContentReWriter) { trs = append(trs, func(rw contentRewriter) {
ar.replaceInHTML(rw) ar.replaceInHTML(rw)
}) })
return return
@ -26,7 +26,7 @@ func AbsURL(absURL string) (trs []link, err error) {
func AbsURLInXML(absURL string) (trs []link, err error) { func AbsURLInXML(absURL string) (trs []link, err error) {
initAbsURLReplacer(absURL) initAbsURLReplacer(absURL)
trs = append(trs, func(rw ContentReWriter) { trs = append(trs, func(rw contentRewriter) {
ar.replaceInXML(rw) ar.replaceInXML(rw)
}) })
return return

View file

@ -176,7 +176,7 @@ func (l *contentlexer) replace() {
} }
} }
func doReplace(rw ContentReWriter, matchers []absURLMatcher) { func doReplace(rw contentRewriter, matchers []absURLMatcher) {
lexer := &contentlexer{ lexer := &contentlexer{
content: rw.Content(), content: rw.Content(),
@ -226,10 +226,10 @@ func newAbsURLReplacer(baseURL string) *absURLReplacer {
} }
func (au *absURLReplacer) replaceInHTML(rw ContentReWriter) { func (au *absURLReplacer) replaceInHTML(rw contentRewriter) {
doReplace(rw, au.htmlMatchers) doReplace(rw, au.htmlMatchers)
} }
func (au *absURLReplacer) replaceInXML(rw ContentReWriter) { func (au *absURLReplacer) replaceInXML(rw contentRewriter) {
doReplace(rw, au.xmlMatchers) doReplace(rw, au.xmlMatchers)
} }

View file

@ -6,7 +6,7 @@ import (
"io" "io"
) )
type trans func(rw ContentReWriter) type trans func(rw contentRewriter)
type link trans type link trans
@ -20,14 +20,14 @@ func NewEmptyTransforms() []link {
return make([]link, 0, 20) return make([]link, 0, 20)
} }
// ContentReWriter is an interface that enables rotation // contentRewriter is an interface that enables rotation
// of pooled buffers in the transformer chain. // of pooled buffers in the transformer chain.
type ContentReWriter interface { type contentRewriter interface {
Content() []byte Content() []byte
io.Writer io.Writer
} }
// Implements ContentReWriter // Implements contentRewriter
// Content is read from the from-buffer, // Content is read from the from-buffer,
// and rewritten to to the to-buffer. // and rewritten to to the to-buffer.
type fromToBuffer struct { type fromToBuffer struct {

View file

@ -56,17 +56,17 @@ func TestChainZeroTransformers(t *testing.T) {
} }
func TestChaingMultipleTransformers(t *testing.T) { func TestChaingMultipleTransformers(t *testing.T) {
f1 := func(rw ContentReWriter) { f1 := func(rw contentRewriter) {
rw.Write(bytes.Replace(rw.Content(), []byte("f1"), []byte("f1r"), -1)) rw.Write(bytes.Replace(rw.Content(), []byte("f1"), []byte("f1r"), -1))
} }
f2 := func(rw ContentReWriter) { f2 := func(rw contentRewriter) {
rw.Write(bytes.Replace(rw.Content(), []byte("f2"), []byte("f2r"), -1)) rw.Write(bytes.Replace(rw.Content(), []byte("f2"), []byte("f2r"), -1))
} }
f3 := func(rw ContentReWriter) { f3 := func(rw contentRewriter) {
rw.Write(bytes.Replace(rw.Content(), []byte("f3"), []byte("f3r"), -1)) rw.Write(bytes.Replace(rw.Content(), []byte("f3"), []byte("f3r"), -1))
} }
f4 := func(rw ContentReWriter) { f4 := func(rw contentRewriter) {
rw.Write(bytes.Replace(rw.Content(), []byte("f4"), []byte("f4r"), -1)) rw.Write(bytes.Replace(rw.Content(), []byte("f4"), []byte("f4r"), -1))
} }

View file

@ -5,7 +5,7 @@ import (
"github.com/spf13/viper" "github.com/spf13/viper"
) )
func LiveReloadInject(rw ContentReWriter) { func LiveReloadInject(rw contentRewriter) {
match := []byte("</body>") match := []byte("</body>")
port := viper.GetString("port") port := viper.GetString("port")
replace := []byte(`<script>document.write('<script src="http://' replace := []byte(`<script>document.write('<script src="http://'