Fix Jsontablewriter: must return slice of *json (#2)

Author: Thomas Charlot

tabify/json_table_writer.go

@@ -4,21 +4,21 @@ import "github.com/datasweet/jsonmap"
 
 // JSONTableWriter to writes a json array
 type JSONTableWriter struct {
-	row   map[string]interface{}
-	table []map[string]interface{}
+	row   *jsonmap.Json
+	table []*jsonmap.Json
 }
 
 // OpenRow implements TableWriter interface
 func (w *JSONTableWriter) OpenRow() {
-	w.row = make(map[string]interface{})
+	w.row = jsonmap.New()
 }
 
 // Cell implements TableWriter interface
 func (w *JSONTableWriter) Cell(k string, v interface{}) {
 	if w.row == nil {
 		w.OpenRow()
 	}
-	w.row[k] = v
+	w.row.Set(k, v)
 }
 
 // CloseRow implements TableWriter interface
@@ -27,8 +27,6 @@ func (w *JSONTableWriter) CloseRow() {
 }
 
 // Table to gets the output table
-func (w *JSONTableWriter) JSON() *jsonmap.Json {
-	j := jsonmap.New()
-	j.Set("", w.table)
-	return j
+func (w *JSONTableWriter) JSON() []*jsonmap.Json {
+	return w.table
 }

tabify/tabify.go

@@ -14,7 +14,7 @@ type TableWriter interface {
 }
 
 // JSON to flatten a json
-func JSON(j *jsonmap.Json, opt ...Option) (*jsonmap.Json, error) {
+func JSON(j *jsonmap.Json, opt ...Option) ([]*jsonmap.Json, error) {
 	t := newTabify(opt...)
 	writer := &JSONTableWriter{}
 

tabify/tabify_test.go

@@ -49,7 +49,9 @@ func testfile(t *testing.T, filename string) {
 		t.Fatal("json tabify", err)
 	}
 	jtw := readJSON(t, "./tests/"+filename+"_expected.json")
-	assert.JSONEq(t, jtw.Stringify(), jt.Stringify(), "json table writer")
+	jo := jsonmap.New()
+	jo.Set("", jt)
+	assert.JSONEq(t, jtw.Stringify(), jo.Stringify(), "json table writer")
 
 	// SliceTableWriter
 	st, err := Slice(src, KeyExcluder(excluder), KeyFormatter(formatter))