- [#] rename MapStringString as OutputStyleMap

cascadia_cli.yaml

@@ -39,7 +39,7 @@ Options:
     Usage: Raw text output, no trimming of leading and trailing white space
 
   - Name: Piece
-    Type: MapStringString
+    Type: OutputStyleMap
     Flag: 'p,piece'
     Usage: 'sub CSS selectors within -css to split that block up into pieces\n\t\t\tformat: PieceName=[RAW:]selector_string\n\t\t\tRAW: will return the selected as-is; else the text will be returned'
 

cascadia_cliDef.go

@@ -28,7 +28,7 @@ type rootT struct {
 	CSS      []string        `cli:"*c,css" usage:"CSS selectors (can provide more if not using --piece)"`
 	TextOut  bool            `cli:"t,text" usage:"Text output for none-block selection mode"`
 	TextRaw  bool            `cli:"R,Raw" usage:"Raw text output, no trimming of leading and trailing white space"`
-	Piece    MapStringString `cli:"p,piece" usage:"sub CSS selectors within -css to split that block up into pieces\n\t\t\tformat: PieceName=[OutputStyle:]selector_string\n\t\t\tOutputStyle:\n\t\t\t\tRAW : will return the selected as-is\n\t\t\t\tattr[xxx] : will return the value of an attribute named xxx \n\t\t\telse the text will be returned"`
+	Piece    OutputStyleMap `cli:"p,piece" usage:"sub CSS selectors within -css to split that block up into pieces\n\t\t\tformat: PieceName=[OutputStyle:]selector_string\n\t\t\tOutputStyle:\n\t\t\t\tRAW : will return the selected as-is\n\t\t\t\tattr[xxx] : will return the value of an attribute named xxx \n\t\t\telse the text will be returned"`
 	Deli     string          `cli:"d,delimiter" usage:"delimiter for pieces csv output" dft:"\t"`
 	WrapHTML bool            `cli:"w,wrap-html" usage:"wrap up the output with html tags"`
 	Style    string          `cli:"y,style" usage:"style component within the wrapped html head"`
@@ -59,7 +59,7 @@ var root = &cli.Command{
 //  	CSS	[]string
 //  	TextOut	bool
 //  	TextRaw	bool
-//  	Piece	MapStringString
+//  	Piece	OutputStyleMap
 //  	Deli	string
 //  	WrapHTML	bool
 //  	Style	string

cascadia_main.go

@@ -38,7 +38,7 @@ const (
 	OutputStyleTEXT
 )
 
-type MapStringString struct {
+type OutputStyleMap struct {
 	Keys         []string
 	Values       map[string]string
 	OutputStyles map[string]OutputStyle
@@ -50,7 +50,7 @@ type OptsT struct {
 	CSS      []string
 	TextOut  bool
 	TextRaw  bool
-	Piece    MapStringString
+	Piece    OutputStyleMap
 	Deli     string
 	WrapHTML bool
 	Style    string
@@ -209,10 +209,10 @@ func Cascadia(bi io.Reader, bw io.Writer, Opts OptsT) error {
 
 // DecodeSlice implements cli.SliceDecoder
 // NOTE: if SliceDecoder not implemented, the Decode method would be only invoked once
-func (MapStringString) DecodeSlice() {}
+func (OutputStyleMap) DecodeSlice() {}
 
 // Decode implements cli.Decoder interface
-func (m *MapStringString) Decode(s string) error {
+func (m *OutputStyleMap) Decode(s string) error {
 	if (m.Values) == nil {
 		m.Values = make(map[string]string)
 		m.OutputStyles = make(map[string]OutputStyle)

cascadia_test.go

@@ -11,7 +11,7 @@ func TestSelectors(t *testing.T) {
 		buf := bytes.NewBufferString("")
 		Opts.CSS, Opts.Piece, Opts.Deli,
 			Opts.WrapHTML, Opts.TextOut, Opts.TextRaw, Opts.Quiet =
-			[]string{test.selector}, MapStringString{}, ",",
+			[]string{test.selector}, OutputStyleMap{}, ",",
 			false, false, false, false
 		Cascadia(strings.NewReader(test.HTML), buf, Opts)
 		got := buf.String()
@@ -553,7 +553,7 @@ var selectorTests = []selectorTest{
 type PieceAttrTest struct {
 	HTML, selector string
 	results        []string
-	piece          MapStringString
+	piece          OutputStyleMap
 }
 
 var PieceAttrTests = []PieceAttrTest{
@@ -572,7 +572,7 @@ var PieceAttrTests = []PieceAttrTest{
 			`a3,`,
 			`a4,`,
 		},
-		MapStringString{
+		OutputStyleMap{
 			[]string{"id"},
 			map[string]string{"id": "a"},
 			map[string]OutputStyle{"id": OutputStyleATTR},
@@ -594,7 +594,7 @@ var PieceAttrTests = []PieceAttrTest{
 			`,`,
 			`,`,
 		},
-		MapStringString{
+		OutputStyleMap{
 			[]string{"href2"},
 			map[string]string{"href2": "a"},
 			map[string]OutputStyle{"href2": OutputStyleATTR},
@@ -616,7 +616,7 @@ var PieceAttrTests = []PieceAttrTest{
 			`https://www.google.com/news,`,
 			`http://news.yahoo.com,`,
 		},
-		MapStringString{
+		OutputStyleMap{
 			[]string{"href"},
 			map[string]string{"href": "a"},
 			map[string]OutputStyle{"href": OutputStyleATTR},