- [+] add -p,--protect option

Author: suntong

cmdFmt.go

@@ -9,7 +9,6 @@ package main
 import (
 	"bytes"
 	"encoding/json"
-	"io/ioutil"
 
 	"github.com/mkideal/cli"
 )
@@ -18,14 +17,15 @@ func fmtCLI(ctx *cli.Context) error {
 	rootArgv = ctx.RootArgv().(*rootT)
 	argv := ctx.Argv().(*fmtT)
 	// fmt.Printf("[fmt]:\n  %+v\n  %+v\n  %v\n", rootArgv, argv, ctx.Args())
-	Opts.Prefix, Opts.Indent, Opts.Compact, Opts.Verbose =
-		rootArgv.Prefix, rootArgv.Indent, rootArgv.Compact, rootArgv.Verbose.Value()
+	Opts.Prefix, Opts.Indent, Opts.Compact, Opts.Protect, Opts.Verbose =
+		rootArgv.Prefix, rootArgv.Indent, rootArgv.Compact,
+		rootArgv.Protect, rootArgv.Verbose.Value()
 
-	data, err := ioutil.ReadAll(argv.Filei)
+	data := readJson(argv.Filei)
 	argv.Filei.Close()
-	abortOn("[::fmt] Reading input", err)
 
 	var out bytes.Buffer
+	var err error
 	if Opts.Compact {
 		err = json.Compact(&out, data)
 	} else {

cmdSort.go

@@ -10,7 +10,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 
 	"github.com/mkideal/cli"
 )
@@ -22,17 +21,18 @@ func sortCLI(ctx *cli.Context) error {
 	rootArgv = ctx.RootArgv().(*rootT)
 	argv := ctx.Argv().(*sortT)
 	//fmt.Printf("[sort]:\n  %+v\n  %+v\n  %v\n", rootArgv, argv, ctx.Args())
-	Opts.Prefix, Opts.Indent, Opts.Compact, Opts.Verbose =
-		rootArgv.Prefix, rootArgv.Indent, rootArgv.Compact, rootArgv.Verbose.Value()
+	Opts.Prefix, Opts.Indent, Opts.Compact, Opts.Protect, Opts.Verbose =
+		rootArgv.Prefix, rootArgv.Indent, rootArgv.Compact,
+		rootArgv.Protect, rootArgv.Verbose.Value()
 	return cmdSort(argv.Filei, argv.Fileo)
 }
 
 func cmdSort(r io.Reader, w io.Writer) error {
 	var res interface{}
-	content, err := ioutil.ReadAll(r)
-	abortOn("[::sort] Reading input", err)
+	content := readJson(r)
 	json.Unmarshal(content, &res)
 	var js []byte
+	var err error
 	if Opts.Compact {
 		js, err = json.Marshal(res)
 	} else {

jsonfiddle_cli.yaml

@@ -31,6 +31,11 @@ Options:
     Usage: indent for json string output
     Value: ' '
 
+  - Name: Protect
+    Type: bool
+    Flag: p,protect
+    Usage: protect {{TEMPLATE}} in JSON data
+
   - Name: Verbose
     Type: cli.Counter
     Flag: v,verbose

jsonfiddle_cliDef.go

@@ -22,6 +22,7 @@ type rootT struct {
 	Compact bool        `cli:"c,compact" usage:"Compact JSON data, remove all whitespaces"`
 	Prefix  string      `cli:"prefix" usage:"prefix for json string output"`
 	Indent  string      `cli:"d,indent" usage:"indent for json string output" dft:" "`
+	Protect bool        `cli:"p,protect" usage:"protect {{TEMPLATE}} in JSON data"`
 	Verbose cli.Counter `cli:"v,verbose" usage:"Verbose mode (Multiple -v options increase the verbosity.)"`
 }
 
@@ -37,16 +38,31 @@ var root = &cli.Command{
 }
 
 // Template for main starts here
+////////////////////////////////////////////////////////////////////////////
+// Constant and data type/structure definitions
+
+// The OptsT type defines all the configurable options from cli.
+//  type OptsT struct {
+//  	Compact	bool
+//  	Prefix	string
+//  	Indent	string
+//  	Protect	bool
+//  	Verbose	cli.Counter
+//  	Verbose int
+//  }
+
 ////////////////////////////////////////////////////////////////////////////
 // Global variables definitions
 
 //  var (
 //          progname  = "jsonfiddle"
 //          version   = "0.1.0"
-//          date = "2017-08-14"
-//  )
+//          date = "2017-09-09"
 
-//  var rootArgv *rootT
+//  	rootArgv *rootT
+//  	// Opts store all the configurable options
+//  	Opts OptsT
+//  )
 
 ////////////////////////////////////////////////////////////////////////////
 // Function definitions
@@ -87,6 +103,8 @@ var root = &cli.Command{
 //  	rootArgv = ctx.RootArgv().(*rootT)
 //  	argv := ctx.Argv().(*escT)
 //  	fmt.Printf("[esc]:\n  %+v\n  %+v\n  %v\n", rootArgv, argv, ctx.Args())
+//  	Opts.Compact, Opts.Prefix, Opts.Indent, Opts.Protect, Opts.Verbose, Opts.Verbose =
+//  		rootArgv.Compact, rootArgv.Prefix, rootArgv.Indent, rootArgv.Protect, rootArgv.Verbose, rootArgv.Verbose.Value()
 //  	return nil
 //  }
 
@@ -112,6 +130,8 @@ var escDef = &cli.Command{
 //  	rootArgv = ctx.RootArgv().(*rootT)
 //  	argv := ctx.Argv().(*fmtT)
 //  	fmt.Printf("[fmt]:\n  %+v\n  %+v\n  %v\n", rootArgv, argv, ctx.Args())
+//  	Opts.Compact, Opts.Prefix, Opts.Indent, Opts.Protect, Opts.Verbose, Opts.Verbose =
+//  		rootArgv.Compact, rootArgv.Prefix, rootArgv.Indent, rootArgv.Protect, rootArgv.Verbose, rootArgv.Verbose.Value()
 //  	return nil
 //  }
 
@@ -137,6 +157,8 @@ var fmtDef = &cli.Command{
 //  	rootArgv = ctx.RootArgv().(*rootT)
 //  	argv := ctx.Argv().(*sortT)
 //  	fmt.Printf("[sort]:\n  %+v\n  %+v\n  %v\n", rootArgv, argv, ctx.Args())
+//  	Opts.Compact, Opts.Prefix, Opts.Indent, Opts.Protect, Opts.Verbose, Opts.Verbose =
+//  		rootArgv.Compact, rootArgv.Prefix, rootArgv.Indent, rootArgv.Protect, rootArgv.Verbose, rootArgv.Verbose.Value()
 //  	return nil
 //  }
 
@@ -162,6 +184,8 @@ var sortDef = &cli.Command{
 //  	rootArgv = ctx.RootArgv().(*rootT)
 //  	argv := ctx.Argv().(*j2sT)
 //  	fmt.Printf("[j2s]:\n  %+v\n  %+v\n  %v\n", rootArgv, argv, ctx.Args())
+//  	Opts.Compact, Opts.Prefix, Opts.Indent, Opts.Protect, Opts.Verbose, Opts.Verbose =
+//  		rootArgv.Compact, rootArgv.Prefix, rootArgv.Indent, rootArgv.Protect, rootArgv.Verbose, rootArgv.Verbose.Value()
 //  	return nil
 //  }
 

jsonfiddle_main.go

@@ -10,7 +10,10 @@ package main
 
 import (
 	"fmt"
+	"io"
+	"io/ioutil"
 	"os"
+	"regexp"
 	"strings"
 
 	"github.com/mkideal/cli"
@@ -24,6 +27,7 @@ type OptsT struct {
 	Prefix  string
 	Indent  string
 	Compact bool
+	Protect bool
 	Verbose int
 }
 
@@ -33,8 +37,8 @@ type OptsT struct {
 var (
 	progname = "jsonfiddle"
 	// version tracks the release version.
-	version = "v0.3.0"
-	date    = "2017-08-16"
+	version = "v0.4.0"
+	date    = "2017-09-09"
 )
 
 var (
@@ -74,6 +78,22 @@ func jsonfiddle(ctx *cli.Context) error {
 //==========================================================================
 // support functions
 
+// Basename returns the file name without extension.
+func readJson(r io.Reader) []byte {
+	data, err := ioutil.ReadAll(r)
+	abortOn("Reading json input", err)
+
+	if Opts.Protect {
+		data = regexp.MustCompile(`({{)([^ }]+)(}})`).
+			ReplaceAll(data, []byte(`<<${2}>>`))
+		// "age":<<C_age>> => "age":"<<C_age>>"
+		data = regexp.MustCompile(`(:)(<<[^>]+>>)([]},])`).
+			ReplaceAll(data, []byte(`${1}"${2}"${3}`))
+	}
+	verbose(2, "%s", string(data))
+	return data
+}
+
 // Basename returns the file name without extension.
 func Basename(s string) string {
 	n := strings.LastIndexByte(s, '.')
@@ -92,8 +112,8 @@ func abortOn(errCase string, e error) {
 }
 
 // verbose will print info to stderr according to the verbose level setting
-func verbose(levelSet, levelNow int, format string, args ...interface{}) {
-	if levelNow >= levelSet {
+func verbose(levelSet int, format string, args ...interface{}) {
+	if Opts.Verbose >= levelSet {
 		fmt.Fprintf(os.Stderr, "["+progname+"] "+format+"\n", args...)
 	}
 }

jsonfiddle_test.go

@@ -62,21 +62,23 @@ func TestExec(t *testing.T) {
 
 	// == Test Basic Functions
 	// -- fmt
+	t.Logf("\n\n== Testing Basic fmt Functions\n\n")
 	testIt(t, "CustomerC", "fmt", "-c", "-i", "Customer.json")
 	testIt(t, "Customer", "fmt", "-i", "Customer.json")
 	testIt(t, "Schedules", "fmt", "-i", "Schedules.json")
+	testIt(t, "CustomerP", "fmt", "-p", "-i", "CustomerP.json")
+	testIt(t, "CustomerPC", "fmt", "-c", "-p", "-i", "CustomerP.json")
 	// -- sort
+	t.Logf("\n\n== Testing Basic sort Functions\n\n")
 	testIt(t, "CustomerSI", "sort", "-i", "Customer.json")
 	testIt(t, "CustomerSC", "sort", "-c", "-i", "Customer.json")
+	testIt(t, "CustomerPS", "sort", "-p", "-i", "CustomerP.json")
 	testIt(t, "SchedulesSI", "sort", "-i", "Schedules.json")
 	// -- j2s
+	t.Logf("\n\n== Testing Basic j2s Functions\n\n")
 	testIt(t, "CustomerJ2S", "j2s", "-i", "Customer.json")
 	testIt(t, "GoodsJ2S", "j2s", "-i", "Goods.json")
 	testIt(t, "MenuItemsJ2S", "j2s", "-i", "MenuItems.json")
 	testIt(t, "SmartyStreetsJ2S", "j2s", "-i", "SmartyStreets.json")
 	testIt(t, "SchedulesJ2S", "j2s", "-i", "Schedules.json")
-
-	//Test String Functions
-
-	//Test Bigger files
 }

test/CustomerP.json

@@ -0,0 +1 @@
+{"firstName":"{{C_firstName}}","lastName":"{{C_lastName}}","age":{{C_age}},"address":{"streetAddress":"{{C_address1}}","city":"{{C_city}}","state":"NY","postalCode":"10021"}}

test/CustomerP.ref

@@ -0,0 +1,12 @@
+{
+ "firstName": "<<C_firstName>>",
+ "lastName": "<<C_lastName>>",
+ "age": "<<C_age>>",
+ "address": {
+  "streetAddress": "<<C_address1>>",
+  "city": "<<C_city>>",
+  "state": "NY",
+  "postalCode": "10021"
+ }
+}
+

test/CustomerPC.ref

@@ -0,0 +1 @@
+{"firstName":"<<C_firstName>>","lastName":"<<C_lastName>>","age":"<<C_age>>","address":{"streetAddress":"<<C_address1>>","city":"<<C_city>>","state":"NY","postalCode":"10021"}}

test/CustomerPS.ref

@@ -0,0 +1,12 @@
+{
+ "address": {
+  "city": "\u003c\u003cC_city\u003e\u003e",
+  "postalCode": "10021",
+  "state": "NY",
+  "streetAddress": "\u003c\u003cC_address1\u003e\u003e"
+ },
+ "age": "\u003c\u003cC_age\u003e\u003e",
+ "firstName": "\u003c\u003cC_firstName\u003e\u003e",
+ "lastName": "\u003c\u003cC_lastName\u003e\u003e"
+}
+