Merge pull request #98 from x86kernel/master

Colorize Response for html
7 years ago · 66c5aa2526
parent 93274c1621 cd9fe21b90
commit 66c5aa2526
2 changed files with 32 additions and 6 deletions
--- a/formatter/formatter_test.go
+++ b/formatter/formatter_test.go
@ -6,6 +6,7 @@ import (

 	"github.com/asciimoo/wuzz/config"
 	"github.com/nwidger/jsoncolor"
+	"github.com/x86kernel/htmlcolor"
 )

 func TestFormat(t *testing.T) {
@ -17,18 +18,22 @@ func TestFormat(t *testing.T) {

 	var htmlBuffer bytes.Buffer
 	New(configFixture(true), "text/html; charset=utf-8").Format(&htmlBuffer, []byte("<html><span>unfomatted</span></html>"))
-	if htmlBuffer.String() != "<html><span>unfomatted</span></html>" {
+	var htmltargetBuffer bytes.Buffer
+	htmlcolor.NewFormatter().Format(&htmltargetBuffer, []byte("<html><span>unfomatted</span></html>"))
+	htmltarget := htmltargetBuffer.String()
+
+	if htmlBuffer.String() != htmltarget {
 		t.Error("Expected html to eq " + htmlBuffer.String())
 	}

 	var jsonEnabledBuffer bytes.Buffer
 	New(configFixture(true), "application/json; charset=utf-8").Format(&jsonEnabledBuffer, []byte("{\"json\": \"some value\"}"))
-	var targetBuffer bytes.Buffer
-	jsoncolor.NewFormatter().Format(&targetBuffer, []byte("{\"json\": \"some value\"}"))
-	target := targetBuffer.String()
+	var jsontargetBuffer bytes.Buffer
+	jsoncolor.NewFormatter().Format(&jsontargetBuffer, []byte("{\"json\": \"some value\"}"))
+	jsontarget := jsontargetBuffer.String()

-	if jsonEnabledBuffer.String() != target {
-		t.Error("Expected json to eq \n" + jsonEnabledBuffer.String() + "\nbut not\n" + target)
+	if jsonEnabledBuffer.String() != jsontarget {
+		t.Error("Expected json to eq \n" + jsonEnabledBuffer.String() + "\nbut not\n" + jsontarget)
 	}

 	var jsonDisabledBuffer bytes.Buffer
--- a/formatter/html.go
+++ b/formatter/html.go
@ -1,9 +1,30 @@
 package formatter

+import (
+	"bytes"
+	"errors"
+	"io"
+
+	"github.com/x86kernel/htmlcolor"
+)
+
 type htmlFormatter struct {
 	textFormatter
 }

+func (f *htmlFormatter) Format(writer io.Writer, data []byte) error {
+	htmlFormatter := htmlcolor.NewFormatter()
+	buf := bytes.NewBuffer(make([]byte, 0, len(data)))
+	err := htmlFormatter.Format(buf, data)
+
+	if err == io.EOF {
+		writer.Write(buf.Bytes())
+		return nil
+	}
+
+	return errors.New("html formatter error")
+}
+
 func (f *htmlFormatter) Title() string {
 	return "[html]"
 }