From 38f6f8eef79caa7cc1963a3898d8a3d44bd48933 Mon Sep 17 00:00:00 2001 From: miraclesu Date: Sat, 10 Aug 2013 10:29:29 +0800 Subject: [PATCH 1/3] update TestParseForm --- utils_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/utils_test.go b/utils_test.go index 9ef02282..d5750ee6 100644 --- a/utils_test.go +++ b/utils_test.go @@ -124,18 +124,18 @@ func TestParseForm(t *testing.T) { t.Fatal(err) } if u.Id != 0 { - t.Error("Id should not be changed") + t.Errorf("Id should equal 0 but got %v", u.Id) } if len(u.tag) != 0 { - t.Error("tag should not be changed") + t.Error("tag's length should equal 0 but got %v", len(u.tag)) } if u.Name.(string) != "test" { - t.Error("should be equal") + t.Error("Name should equal `test` but got `%v`", u.Name.(string)) } if u.Age != 40 { - t.Error("should be equal") + t.Error("Age should equal 40 but got %v", u.Age) } if u.Email != "test@gmail.com" { - t.Error("should be equal") + t.Error("Email should equal `test@gmail.com` but got `%v`", u.Email) } } From e47b2b677db77b7dcb9abd62f3cb6d622689cfbd Mon Sep 17 00:00:00 2001 From: miraclesu Date: Sat, 10 Aug 2013 11:42:25 +0800 Subject: [PATCH 2/3] Update ParserForm for new form tag style --- utils.go | 9 +++++++-- utils_test.go | 15 ++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/utils.go b/utils.go index 35f1aeb0..e0ead258 100644 --- a/utils.go +++ b/utils.go @@ -190,10 +190,15 @@ func ParseForm(form url.Values, obj interface{}) error { continue } fieldT := objT.Field(i) - tag := fieldT.Tag.Get("form") - if len(tag) == 0 { + + tags := strings.Split(fieldT.Tag.Get("form"), ",") + var tag string + if len(tags) == 0 || len(tags[0]) == 0 { tag = fieldT.Name + } else { + tag = tags[0] } + value := form.Get(tag) if len(value) == 0 { continue diff --git a/utils_test.go b/utils_test.go index d5750ee6..405c939c 100644 --- a/utils_test.go +++ b/utils_test.go @@ -106,8 +106,9 @@ func TestParseForm(t *testing.T) { Id int tag string `form:tag` Name interface{} `form:"username"` - Age int `form:"age"` + Age int `form:"age,text"` Email string + Intro string `form:",textarea"` } u := user{} @@ -116,6 +117,7 @@ func TestParseForm(t *testing.T) { "username": []string{"test"}, "age": []string{"40"}, "Email": []string{"test@gmail.com"}, + "Intro": []string{"I am an engineer!"}, } if err := ParseForm(form, u); err == nil { t.Fatal("nothing will be changed") @@ -127,15 +129,18 @@ func TestParseForm(t *testing.T) { t.Errorf("Id should equal 0 but got %v", u.Id) } if len(u.tag) != 0 { - t.Error("tag's length should equal 0 but got %v", len(u.tag)) + t.Errorf("tag's length should equal 0 but got %v", len(u.tag)) } if u.Name.(string) != "test" { - t.Error("Name should equal `test` but got `%v`", u.Name.(string)) + t.Errorf("Name should equal `test` but got `%v`", u.Name.(string)) } if u.Age != 40 { - t.Error("Age should equal 40 but got %v", u.Age) + t.Errorf("Age should equal 40 but got %v", u.Age) } if u.Email != "test@gmail.com" { - t.Error("Email should equal `test@gmail.com` but got `%v`", u.Email) + t.Errorf("Email should equal `test@gmail.com` but got `%v`", u.Email) + } + if u.Intro != "I am an engineer!" { + t.Errorf("Intro should equal `I am an engineer!` but got `%v`", u.Intro) } } From 9e1d5036f7535f8d869d5544cdb87fdaf0efdbe9 Mon Sep 17 00:00:00 2001 From: miraclesu Date: Sat, 10 Aug 2013 16:33:46 +0800 Subject: [PATCH 3/3] Add renderform template function --- template.go | 1 + utils.go | 67 +++++++++++++++++++++++++++++++++++++++++++++++++-- utils_test.go | 27 +++++++++++++++++++++ 3 files changed, 93 insertions(+), 2 deletions(-) diff --git a/template.go b/template.go index 6df25fd9..0feffbe3 100644 --- a/template.go +++ b/template.go @@ -31,6 +31,7 @@ func init() { beegoTplFuncMap["str2html"] = Str2html beegoTplFuncMap["htmlquote"] = Htmlquote beegoTplFuncMap["htmlunquote"] = Htmlunquote + beegoTplFuncMap["renderform"] = RenderForm } // AddFuncMap let user to register a func in the template diff --git a/utils.go b/utils.go index e0ead258..0afcb4ba 100644 --- a/utils.go +++ b/utils.go @@ -178,7 +178,7 @@ func inSlice(v string, sl []string) bool { func ParseForm(form url.Values, obj interface{}) error { objT := reflect.TypeOf(obj) objV := reflect.ValueOf(obj) - if !(objT.Kind() == reflect.Ptr && objT.Elem().Kind() == reflect.Struct) { + if !isStructPtr(objT) { return fmt.Errorf("%v must be a struct pointer", obj) } objT = objT.Elem() @@ -189,8 +189,8 @@ func ParseForm(form url.Values, obj interface{}) error { if !fieldV.CanSet() { continue } - fieldT := objT.Field(i) + fieldT := objT.Field(i) tags := strings.Split(fieldT.Tag.Get("form"), ",") var tag string if len(tags) == 0 || len(tags[0]) == 0 { @@ -238,6 +238,69 @@ func ParseForm(form url.Values, obj interface{}) error { return nil } +// form types for RenderForm function +var FormType = map[string]bool{ + "text": true, + "textarea": true, + "hidden": true, + "password": true, +} + +var unKind = map[reflect.Kind]bool{ + reflect.Uintptr: true, + reflect.Complex64: true, + reflect.Complex128: true, + reflect.Array: true, + reflect.Chan: true, + reflect.Func: true, + reflect.Map: true, + reflect.Ptr: true, + reflect.Slice: true, + reflect.Struct: true, + reflect.UnsafePointer: true, +} + +// obj must be a struct pointer +func RenderForm(obj interface{}) template.HTML { + objT := reflect.TypeOf(obj) + objV := reflect.ValueOf(obj) + if !isStructPtr(objT) { + return template.HTML("") + } + objT = objT.Elem() + objV = objV.Elem() + + var raw []string + for i := 0; i < objT.NumField(); i++ { + fieldV := objV.Field(i) + if !fieldV.CanSet() || unKind[fieldV.Kind()] { + continue + } + + fieldT := objT.Field(i) + tags := strings.Split(fieldT.Tag.Get("form"), ",") + name := fieldT.Name + if len(tags) < 2 { + if len(tags) == 1 && len(tags[0]) > 0 { + name = tags[0] + } + raw = append(raw, fmt.Sprintf(`%v: `, + fieldT.Name, name, fieldV.Interface())) + } else { + if len(tags[0]) > 0 { + name = tags[0] + } + raw = append(raw, fmt.Sprintf(`%v: `, + fieldT.Name, name, tags[1], fieldV.Interface())) + } + } + return template.HTML(strings.Join(raw, "
")) +} + +func isStructPtr(t reflect.Type) bool { + return t.Kind() == reflect.Ptr && t.Elem().Kind() == reflect.Struct +} + func stringsToJson(str string) string { rs := []rune(str) jsons := "" diff --git a/utils_test.go b/utils_test.go index 405c939c..994846fe 100644 --- a/utils_test.go +++ b/utils_test.go @@ -1,6 +1,7 @@ package beego import ( + "html/template" "net/url" "testing" "time" @@ -144,3 +145,29 @@ func TestParseForm(t *testing.T) { t.Errorf("Intro should equal `I am an engineer!` but got `%v`", u.Intro) } } + +func TestRenderForm(t *testing.T) { + type user struct { + Id int + tag string `form:tag` + Name interface{} `form:"username"` + Age int `form:"age,text"` + Email []string + Intro string `form:",textarea"` + } + + u := user{Name: "test"} + output := RenderForm(u) + if output != template.HTML("") { + t.Errorf("output should be empty but got %v", output) + } + output = RenderForm(&u) + result := template.HTML( + `Id:
` + + `Name:
` + + `Age:
` + + `Intro: `) + if output != result { + t.Errorf("output should equal `%v` but got `%v`", result, output) + } +}