summaryrefslogtreecommitdiffstats
path: root/transform
diff options
context:
space:
mode:
authorNoah Campbell <noahcampbell@gmail.com>2013-11-05 22:28:06 +0000
committerNoah Campbell <noahcampbell@gmail.com>2013-11-05 22:28:06 +0000
commit86233c00a0a04e8f0130a5970de8d40e6738ef74 (patch)
tree772e16697927e7bc564e640f6524781699437f02 /transform
parent1cebce12ad2335e1140646763dd56009c57d6495 (diff)
Remove the hugo-nav function
Remove the hugo-nav since it relied on a slow library. The current build reimplements the absurl functionality based on string replace. Discovered that my prior implementation missed the requirement for making absolute paths (/path) absolute with the host, whereas a relative path is left untouched. Updated the test cases to support this if this is reimplemented.
Diffstat (limited to 'transform')
-rw-r--r--transform/absurl.go19
-rw-r--r--transform/chain.go27
-rw-r--r--transform/chain_test.go33
-rw-r--r--transform/nav.go12
-rw-r--r--transform/nav_test.go58
-rw-r--r--transform/posttrans_test.go14
6 files changed, 49 insertions, 114 deletions
diff --git a/transform/absurl.go b/transform/absurl.go
index f66edab9d..5967e597e 100644
--- a/transform/absurl.go
+++ b/transform/absurl.go
@@ -3,18 +3,29 @@ package transform
import (
htmltran "code.google.com/p/go-html-transform/html/transform"
"net/url"
+ "bytes"
)
-func AbsURL(absURL string) (trs []*htmltran.Transform, err error) {
+func AbsURL(absURL string) (trs []link, err error) {
var baseURL *url.URL
if baseURL, err = url.Parse(absURL); err != nil {
return
}
- if trs, err = absUrlify(baseURL, elattr{"a", "href"}, elattr{"script", "src"}); err != nil {
- return
- }
+ var (
+ srcdq = []byte(" src=\""+baseURL.String()+"/")
+ hrefdq = []byte(" href=\""+baseURL.String()+"/")
+ srcsq = []byte(" src='"+baseURL.String()+"/")
+ hrefsq = []byte(" href='"+baseURL.String()+"/")
+ )
+ trs = append(trs, func(content []byte) []byte {
+ content = bytes.Replace(content, []byte(" src=\"/"), srcdq, -1)
+ content = bytes.Replace(content, []byte(" src='/"), srcsq, -1)
+ content = bytes.Replace(content, []byte(" href=\"/"), hrefdq, -1)
+ content = bytes.Replace(content, []byte(" href='/"), hrefsq, -1)
+ return content
+ })
return
}
diff --git a/transform/chain.go b/transform/chain.go
index a4929b70d..fb3c2985c 100644
--- a/transform/chain.go
+++ b/transform/chain.go
@@ -1,25 +1,30 @@
package transform
import (
- htmltran "code.google.com/p/go-html-transform/html/transform"
+ "bytes"
"io"
)
-type chain []*htmltran.Transform
+type trans func([]byte) []byte
-func NewChain(trs ...*htmltran.Transform) chain {
+type link trans
+
+type chain []link
+
+func NewChain(trs ...link) chain {
return trs
}
func (c *chain) Apply(w io.Writer, r io.Reader) (err error) {
- var tr *htmltran.Transformer
-
- if tr, err = htmltran.NewFromReader(r); err != nil {
- return
+ buffer := new(bytes.Buffer)
+ buffer.ReadFrom(r)
+ b := buffer.Bytes()
+ for _, tr := range *c {
+ b = tr(b)
}
-
- tr.ApplyAll(*c...)
-
- return tr.Render(w)
+ buffer.Reset()
+ buffer.Write(b)
+ buffer.WriteTo(w)
+ return
}
diff --git a/transform/chain_test.go b/transform/chain_test.go
index 594b5a5d4..94135f6d7 100644
--- a/transform/chain_test.go
+++ b/transform/chain_test.go
@@ -5,41 +5,26 @@ import (
"testing"
)
-func TestChainZeroTransformers(t *testing.T) {
- tr := NewChain()
- in := new(bytes.Buffer)
- out := new(bytes.Buffer)
- if err := tr.Apply(in, out); err != nil {
- t.Errorf("A zero transformer chain returned an error.")
- }
-}
-
-func TestChainOneTransformer(t *testing.T) {
- absURL, _ := AbsURL("http://base")
- tr := NewChain(absURL...)
- apply(t.Errorf, tr, abs_url_tests)
-}
-
const H5_JS_CONTENT_ABS_URL_WITH_NAV = "<!DOCTYPE html><html><head><script src=\"/foobar.js\"></script></head><body><nav><ul><li hugo-nav=\"section_0\"></li><li hugo-nav=\"section_1\"></li></ul></nav><article>content <a href=\"/foobar\">foobar</a>. Follow up</article></body></html>"
-const CORRECT_OUTPUT_SRC_HREF_WITH_NAV = "<!DOCTYPE html><html><head><script src=\"http://two/foobar.js\"></script></head><body><nav><ul><li hugo-nav=\"section_0\"></li><li hugo-nav=\"section_1\" class=\"active\"></li></ul></nav><article>content <a href=\"http://two/foobar\">foobar</a>. Follow up</article></body></html>"
+const CORRECT_OUTPUT_SRC_HREF_WITH_NAV = "<!DOCTYPE html><html><head><script src=\"http://two/foobar.js\"></script></head><body><nav><ul><li hugo-nav=\"section_0\"></li><li hugo-nav=\"section_1\"></li></ul></nav><article>content <a href=\"http://two/foobar\">foobar</a>. Follow up</article></body></html>"
var two_chain_tests = []test{
{H5_JS_CONTENT_ABS_URL_WITH_NAV, CORRECT_OUTPUT_SRC_HREF_WITH_NAV},
}
-func TestChainTwoTransformer(t *testing.T) {
- absURL, _ := AbsURL("http://two")
- nav := NavActive("section_1", "hugo-nav")
- tr := NewChain(append(absURL, nav...)...)
- apply(t.Errorf, tr, two_chain_tests)
+func TestChainZeroTransformers(t *testing.T) {
+ tr := NewChain()
+ in := new(bytes.Buffer)
+ out := new(bytes.Buffer)
+ if err := tr.Apply(in, out); err != nil {
+ t.Errorf("A zero transformer chain returned an error.")
+ }
}
func BenchmarkChain(b *testing.B) {
-
absURL, _ := AbsURL("http://two")
- nav := NavActive("section_1", "hugo-nav")
- tr := NewChain(append(absURL, nav...)...)
+ tr := NewChain(absURL...)
b.ResetTimer()
for i := 0; i < b.N; i++ {
diff --git a/transform/nav.go b/transform/nav.go
deleted file mode 100644
index 7783b6175..000000000
--- a/transform/nav.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package transform
-
-import (
- htmltran "code.google.com/p/go-html-transform/html/transform"
- "fmt"
-)
-
-func NavActive(section, attrName string) (tr []*htmltran.Transform) {
- ma := htmltran.MustTrans(htmltran.ModifyAttrib("class", "active"), fmt.Sprintf("li[%s=%s]", attrName, section))
- tr = append(tr, ma)
- return
-}
diff --git a/transform/nav_test.go b/transform/nav_test.go
deleted file mode 100644
index 372d3f594..000000000
--- a/transform/nav_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package transform
-
-import (
- "bytes"
- "strings"
- "testing"
-)
-
-const HTML_WITH_NAV = `<!DOCTYPE html>
-<html>
-<head></head>
-<body>
-<nav>
- <ul class="nav navbar-nav">
- <li hugo-nav="section_1"><a href="#">Section 1</a></li>
- <li hugo-nav="section_2"><a href="#">Section 2</a></li>
- </ul>
-</nav>
-</body>
-</html>
-`
-const EXPECTED_HTML_WITH_NAV_1 = `<!DOCTYPE html><html><head></head>
-<body>
-<nav>
- <ul class="nav navbar-nav">
- <li hugo-nav="section_1"><a href="#">Section 1</a></li>
- <li hugo-nav="section_2" class="active"><a href="#">Section 2</a></li>
- </ul>
-</nav>
-
-
-</body></html>`
-
-func TestSetNav(t *testing.T) {
- trs := NavActive("section_2", "hugo-nav")
- chain := NewChain(trs...)
- out := new(bytes.Buffer)
- if err := chain.Apply(out, strings.NewReader(HTML_WITH_NAV)); err != nil {
- t.Errorf("Unexpected error in Apply() for NavActive: %s", err)
- }
-
- expected := EXPECTED_HTML_WITH_NAV_1
- if out.String() != expected {
- t.Errorf("NavActive.Apply output expected and got:\n%q\n%q", expected, out.String())
- }
-}
-
-func BenchmarkTransform(b *testing.B) {
- tr := NavActive("section_2", "hugo-nav")
- chain := NewChain(tr...)
- out := new(bytes.Buffer)
- for i := 0; i < b.N; i++ {
- if err := chain.Apply(out, strings.NewReader(HTML_WITH_NAV)); err != nil {
- b.Errorf("Unexpected error in Apply() for NavActive: %s", err)
- }
- out.Reset()
- }
-}
diff --git a/transform/posttrans_test.go b/transform/posttrans_test.go
index 12f7df1f6..d7d06fee7 100644
--- a/transform/posttrans_test.go
+++ b/transform/posttrans_test.go
@@ -6,14 +6,18 @@ import (
"testing"
)
-const H5_JS_CONTENT_DOUBLE_QUOTE = "<!DOCTYPE html><html><head><script src=\"foobar.js\"></script></head><body><nav><h1>title</h1></nav><article>content <a href='/foobar'>foobar</a>. Follow up</article></body></html>"
-const H5_JS_CONTENT_SINGLE_QUOTE = "<!DOCTYPE html><html><head><script src='foobar.js'></script></head><body><nav><h1>title</h1></nav><article>content <a href='/foobar'>foobar</a>. Follow up</article></body></html>"
+const H5_JS_CONTENT_DOUBLE_QUOTE = "<!DOCTYPE html><html><head><script src=\"foobar.js\"></script><script src=\"/barfoo.js\"></script></head><body><nav><h1>title</h1></nav><article>content <a href=\"foobar\">foobar</a>. <a href=\"/foobar\">Follow up</a></article></body></html>"
+
+const H5_JS_CONTENT_SINGLE_QUOTE = "<!DOCTYPE html><html><head><script src='foobar.js'></script><script src='/barfoo.js'></script></head><body><nav><h1>title</h1></nav><article>content <a href='foobar'>foobar</a>. <a href='/foobar'>Follow up</a></article></body></html>"
+
const H5_JS_CONTENT_ABS_URL = "<!DOCTYPE html><html><head><script src=\"http://user@host:10234/foobar.js\"></script></head><body><nav><h1>title</h1></nav><article>content <a href=\"https://host/foobar\">foobar</a>. Follow up</article></body></html>"
// URL doesn't recognize authorities. BUG?
//const H5_JS_CONTENT_ABS_URL = "<!DOCTYPE html><html><head><script src=\"//host/foobar.js\"></script></head><body><nav><h1>title</h1></nav><article>content <a href=\"https://host/foobar\">foobar</a>. Follow up</article></body></html>"
-const CORRECT_OUTPUT_SRC_HREF = "<!DOCTYPE html><html><head><script src=\"http://base/foobar.js\"></script></head><body><nav><h1>title</h1></nav><article>content <a href=\"http://base/foobar\">foobar</a>. Follow up</article></body></html>"
+const CORRECT_OUTPUT_SRC_HREF_DQ = "<!DOCTYPE html><html><head><script src=\"foobar.js\"></script><script src=\"http://base/barfoo.js\"></script></head><body><nav><h1>title</h1></nav><article>content <a href=\"foobar\">foobar</a>. <a href=\"http://base/foobar\">Follow up</a></article></body></html>"
+
+const CORRECT_OUTPUT_SRC_HREF_SQ = "<!DOCTYPE html><html><head><script src='foobar.js'></script><script src='http://base/barfoo.js'></script></head><body><nav><h1>title</h1></nav><article>content <a href='foobar'>foobar</a>. <a href='http://base/foobar'>Follow up</a></article></body></html>"
func TestAbsUrlify(t *testing.T) {
tr, _ := AbsURL("http://base")
@@ -27,8 +31,8 @@ type test struct {
}
var abs_url_tests = []test{
- {H5_JS_CONTENT_DOUBLE_QUOTE, CORRECT_OUTPUT_SRC_HREF},
- {H5_JS_CONTENT_SINGLE_QUOTE, CORRECT_OUTPUT_SRC_HREF},
+ {H5_JS_CONTENT_DOUBLE_QUOTE, CORRECT_OUTPUT_SRC_HREF_DQ},
+ {H5_JS_CONTENT_SINGLE_QUOTE, CORRECT_OUTPUT_SRC_HREF_SQ},
{H5_JS_CONTENT_ABS_URL, H5_JS_CONTENT_ABS_URL},
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 23:36:15 +0000