trip print, improve readme file

Author: yinpeng-zmeng

README.md

@@ -9,12 +9,15 @@
 * Calc field from JavaScript expression
 * Calc field from multi Object
 
-## Usage
+## Demo Usage
+
+* source
 
 ```go
 package main
 
 import (
+	"encoding/json"
 	"fmt"
 
 	"github.com/pkgng/structor"
@@ -24,40 +27,84 @@ type Human struct {
 	Name  string
 	Role  string
 	Age   *int32
+	Tel   string
 	Notes []string
-	Flags []byte
+	Flags string
+}
+
+type AddressT struct {
+	Address string
+	Adcode  string
+	Gps     string
+}
+
+type WifeT struct {
+	structor.BaseStructor `structor:"CopyByName,Wife"`
+	Name                  string
+	NickName              string `structor:"Wife.Name.toLocaleLowerCase()"`
+	Age                   int
+	Age3                  int32 `structor:"self.Age + 3"`
 }
 
 type Farmer struct {
-	Name      string
-	Age       int64
-	Nickname  string   `structor:"self.Name.toLocaleLowerCase()"`
-	DoubleAge int32    `structor:"Human.Age * 2"`
-	SuperRule string   `structor:"'Farmer-' + Human.Role"`
-	Notes     []string `structor:"Human.Notes.reverse()"`
-	FlagCnt   int      `structor:"Human.Flags.length"`
+	structor.BaseStructor `structor:"CopyByName,Human,address"`
+	Name                  string
+	Age                   int64
+	Nickname              string   `structor:"self.Name.toLocaleLowerCase()"`
+	DoubleAge             int32    `structor:"Human.Age * 2"`
+	SuperRole             string   `structor:"'Farmer-' + Human.Role"`
+	Notes                 []string `structor:"Human.Notes.reverse()"`
+	Flags                 []string `structor:"Human.Flags.split(',')"`
+	Contact               struct {
+		Tel     string `structor:"Human.Tel"`
+		Address string `structor:"address.Address"`
+		Adcode  string `structor:"address.Adcode"`
+	}
+	Wife WifeT
 }
 
 func main() {
-	var age int32 = 18
-	man := Human{Name: "ZhangSan", Age: &age, Role: "Admin", Notes: []string{"hello", "world"}, Flags: []byte{'x', 'y', 'z'}}
+	var age int32 = 23
+	var age2 int32 = 22
+	man := Human{Name: "LiLei", Age: &age, Tel: "18611009988", Role: "Farmer", Notes: []string{"hello", "world"}, Flags: "a,b,c"}
+	address := AddressT{Adcode: "110108", Address: "北京海淀区五道口优盛大厦D座", Gps: "116.328115,40.054629"}
+	wife := Human{Name: "HanMeiMei", Age: &age2, Role: "Wife", Notes: []string{"hello", "world"}, Flags: "e,f,g"}
+
 	farmer := Farmer{}
+	structor.New().Set("Human", &man).Set("address", address).Set("Wife", &wife).Construct(&farmer)
 
-	structor.NewStructor(&farmer).Set("Human", &man).CopyByName().Construct()
+	// fmt.Printf("%#v\n", farmer)
 
-	fmt.Printf("%#v\n", farmer)
+	b, err := json.Marshal(farmer)
+	if err != nil {
+		fmt.Println("JSON ERR:", err)
+	}
+	fmt.Println(string(b))
 }
 ```
 
+* output
+
 ```output
-	Farmer {
-		Name:		"ZhangSan", 
-		Age:		18, 
-		Nickname:	"zhangsan", 
-		DoubleAge:	36, 
-		SuperRule:	"Farmer-Admin", 
-		Notes:		[]string{"world", "hello"}, 
-		FlagCnt:	3
+	{
+		"Name":"LiLei",
+		"Age":23,
+		"Nickname":"lilei",
+		"DoubleAge":46,
+		"SuperRole":"Farmer-Farmer",
+		"Notes":["world","hello"],
+		"Flags":["a","b","c"],
+		"Contact":{
+			"Tel":"18611009988",
+			"Address":"北京海淀区五道口优盛大厦D座",
+			"Adcode":"110108"
+		},
+		"Wife":{
+			"Name":"HanMeiMei",
+			"NickName":"hanmeimei",
+			"Age":22,
+			"Age3":25
+		}
 	}
 ```
 

demo/basic.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"encoding/json"
 	"fmt"
 
 	"github.com/pkgng/structor"
@@ -56,5 +57,11 @@ func main() {
 	farmer := Farmer{}
 	structor.New().Set("Human", &man).Set("address", address).Set("Wife", &wife).Construct(&farmer)
 
-	fmt.Printf("%#v\n", farmer)
+	// fmt.Printf("%#v\n", farmer)
+
+	b, err := json.Marshal(farmer)
+	if err != nil {
+		fmt.Println("JSON ERR:", err)
+	}
+	fmt.Println(string(b))
 }

structor.go

@@ -3,7 +3,6 @@ package structor
 import (
 	"database/sql"
 	"errors"
-	"fmt"
 	"reflect"
 	"strings"
 
@@ -65,13 +64,13 @@ func (s *Structor) getStructorBase(t interface{}) *BaseStructor {
 	return nil
 }
 
-func execute(langis *otto.Otto, script string) interface{} {
-	value, _ := langis.Run(script)
-	r, e := value.Export()
+func execute(langis *otto.Otto, script string) (interface{}, error) {
+	value, e := langis.Run(script)
+	r, _ := value.Export()
 	if e != nil {
-		fmt.Println(e)
+		return nil, e
 	}
-	return r
+	return r, nil
 }
 
 func (s *Structor) Construct(target interface{}) error {
@@ -110,7 +109,7 @@ func calc(root *Structor, base *BaseStructor, target interface{}) (err error) {
 
 		toField := to.FieldByName(field.Name)
 		if toField.Kind() == reflect.Struct {
-			fmt.Printf("deep in %s @ %s\n", field.Name, field.Tag.Get("structor"))
+			// fmt.Printf("deep in %s @ %s\n", field.Name, field.Tag.Get("structor"))
 			base2 := root.getStructorBase(toField.Addr().Interface())
 			if base2 == nil {
 				calc(root, base, toField.Addr().Interface())
@@ -122,21 +121,13 @@ func calc(root *Structor, base *BaseStructor, target interface{}) (err error) {
 		}
 
 		script := field.Tag.Get("structor")
-		if script == "" {
+		if script == "" || !toField.IsValid() || !toField.CanSet() {
 			continue
 		}
 
-		r := execute(base.langis, script)
-		fmt.Printf("%s -> %v\n", script, r)
-
-		if toField.IsValid() {
-			if toField.CanSet() {
-				if !set(toField, indirect(reflect.ValueOf(r))) {
-					fmt.Printf("--------------- set failed on %s\n", field.Name)
-				}
-			} else {
-				fmt.Printf("---------------- can not set: %s\n", field.Name)
-			}
+		if r, err := execute(base.langis, script); err == nil {
+			// fmt.Printf("%s -> %v\n", script, r)
+			set(toField, indirect(reflect.ValueOf(r)))
 		}
 	}