phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-07-05 08:42:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change the order of Apply to be more Unixy

Browse source 
Typically the destination is on the left and the src is on the right.
This commit is contained in:
Noah Campbell 2013-10-01 14:42:08 -07:00
parent 94a3184ad0
commit 80009b427f
7 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
hugolib/site.go
View file

@ -618,10 +618,13 @@ func (s *Site) WritePublic(path string, content io.Reader) (err error) {
} }
if s.Transformer == nil { if s.Transformer == nil {
s.Transformer = &transform.AbsURL{BaseURL: s.Config.BaseUrl} s.Transformer = transform.NewChain(
&transform.AbsURL{BaseURL: s.Config.BaseUrl},
&transform.NavActive{Section: "tbd"},
)
} }
final := new(bytes.Buffer) final := new(bytes.Buffer)
s.Transformer.Apply(content, final) s.Transformer.Apply(final, content)
return s.Target.Publish(path, final) return s.Target.Publish(path, final)
} }

2
transform/absurl.go
View file

@ -10,7 +10,7 @@ type AbsURL struct {
BaseURL string BaseURL string
} }
func (t *AbsURL) Apply(r io.Reader, w io.Writer) (err error) { func (t *AbsURL) Apply(w io.Writer, r io.Reader) (err error) {
var tr *htmltran.Transformer var tr *htmltran.Transformer
if tr, err = htmltran.NewFromReader(r); err != nil { if tr, err = htmltran.NewFromReader(r); err != nil {

4
transform/chain.go
View file

@ -13,11 +13,11 @@ func NewChain(trs ...Transformer) Transformer {
return &chain{transformers: trs} return &chain{transformers: trs}
} }
func (c *chain) Apply(r io.Reader, w io.Writer) (err error) { func (c *chain) Apply(w io.Writer, r io.Reader) (err error) {
in := r in := r
for _, tr := range c.transformers { for _, tr := range c.transformers {
out := new(bytes.Buffer) out := new(bytes.Buffer)
err = tr.Apply(in, out) err = tr.Apply(out, in)
if err != nil { if err != nil {
return return
} }

2
transform/nav.go
View file

@ -11,7 +11,7 @@ type NavActive struct {
AttrName string AttrName string
} }
func (n *NavActive) Apply(r io.Reader, w io.Writer) (err error) { func (n *NavActive) Apply(w io.Writer, r io.Reader) (err error) {
var tr *htmltran.Transformer var tr *htmltran.Transformer
if n.Section == "" { if n.Section == "" {

4
transform/nav_test.go
View file

@ -37,7 +37,7 @@ func TestDegenerateNoSectionSet(t *testing.T) {
out = new(bytes.Buffer) out = new(bytes.Buffer)
) )
if err := tr.Apply(strings.NewReader(HTML_WITH_NAV), out); err != nil { if err := tr.Apply(out, strings.NewReader(HTML_WITH_NAV)); err != nil {
t.Errorf("Unexpected error in NavActive.Apply: %s", err) t.Errorf("Unexpected error in NavActive.Apply: %s", err)
} }
@ -49,7 +49,7 @@ func TestDegenerateNoSectionSet(t *testing.T) {
func TestSetNav(t *testing.T) { func TestSetNav(t *testing.T) {
tr := &NavActive{Section: "section_2"} tr := &NavActive{Section: "section_2"}
out := new(bytes.Buffer) out := new(bytes.Buffer)
if err := tr.Apply(strings.NewReader(HTML_WITH_NAV), out); err != nil { if err := tr.Apply(out, strings.NewReader(HTML_WITH_NAV)); err != nil {
t.Errorf("Unexpected error in Apply() for NavActive: %s", err) t.Errorf("Unexpected error in Apply() for NavActive: %s", err)
} }

2
transform/post.go
View file

@ -5,5 +5,5 @@ import (
) )
type Transformer interface { type Transformer interface {
Apply(io.Reader, io.Writer) error Apply(io.Writer, io.Reader) error
} }

2
transform/posttrans_test.go
View file

@ -38,7 +38,7 @@ var abs_url_tests = []test {
func apply(t *testing.T, tr Transformer, tests []test) { func apply(t *testing.T, tr Transformer, tests []test) {
for _, test := range tests { for _, test := range tests {
out := new(bytes.Buffer) out := new(bytes.Buffer)
err := tr.Apply(strings.NewReader(test.content), out) err := tr.Apply(out, strings.NewReader(test.content))
if err != nil { if err != nil {
t.Errorf("Unexpected error: %s", err) t.Errorf("Unexpected error: %s", err)
} }