shithub: hugo

Download patch

ref: 80009b427fdc9ccac3d27218e41f0fa378087e87
parent: 94a3184ad0e037f9faefda2bc330503b01f21016
author: Noah Campbell <[email protected]>
date: Tue Oct 1 10:42:08 EDT 2013 

Change the order of Apply to be more Unixy

Typically the destination is on the left and the src is on the right.


--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -618,10 +618,13 @@
 	}
 
 	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)
-	s.Transformer.Apply(content, final)
+	s.Transformer.Apply(final, content)
 	return s.Target.Publish(path, final)
 }
 
--- a/transform/absurl.go
+++ b/transform/absurl.go
@@ -10,7 +10,7 @@
 	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
 
 	if tr, err = htmltran.NewFromReader(r); err != nil {
--- a/transform/chain.go
+++ b/transform/chain.go
@@ -13,11 +13,11 @@
 	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
 	for _, tr := range c.transformers {
 		out := new(bytes.Buffer)
-		err = tr.Apply(in, out)
+		err = tr.Apply(out, in)
 		if err != nil {
 			return
 		}
--- a/transform/nav.go
+++ b/transform/nav.go
@@ -11,7 +11,7 @@
 	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
 
 	if n.Section == "" {
--- a/transform/nav_test.go
+++ b/transform/nav_test.go
@@ -37,7 +37,7 @@
 		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)
 	}
 
@@ -49,7 +49,7 @@
 func TestSetNav(t *testing.T) {
 	tr := &NavActive{Section: "section_2"}
 	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)
 	}
 
--- a/transform/post.go
+++ b/transform/post.go
@@ -5,5 +5,5 @@
 )
 
 type Transformer interface {
-	Apply(io.Reader, io.Writer) error
+	Apply(io.Writer, io.Reader) error
 }
--- a/transform/posttrans_test.go
+++ b/transform/posttrans_test.go
@@ -38,7 +38,7 @@
 func apply(t *testing.T, tr Transformer, tests []test) {
 	for _, test := range tests {
 		out := new(bytes.Buffer)
-		err := tr.Apply(strings.NewReader(test.content), out)
+		err := tr.Apply(out, strings.NewReader(test.content))
 		if err != nil {
 			t.Errorf("Unexpected error: %s", err)
 		}