Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
beego
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
beego
Commits
92db56c0
Commit
92db56c0
authored
Jul 24, 2013
by
miraclesu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add struct tag support
parent
4c6163ba
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
77 additions
and
29 deletions
+77
-29
util.go
validation/util.go
+18
-3
util_test.go
validation/util_test.go
+4
-1
validation.go
validation/validation.go
+19
-16
validation_test.go
validation/validation_test.go
+36
-9
No files found.
validation/util.go
View file @
92db56c0
...
...
@@ -48,6 +48,11 @@ type ValidFunc struct {
type
Funcs
map
[
string
]
reflect
.
Value
func
(
f
Funcs
)
Call
(
name
string
,
params
...
interface
{})
(
result
[]
reflect
.
Value
,
err
error
)
{
defer
func
()
{
if
r
:=
recover
();
r
!=
nil
{
err
=
r
.
(
error
)
}
}()
if
_
,
ok
:=
f
[
name
];
!
ok
{
err
=
fmt
.
Errorf
(
"%s does not exist"
,
name
)
return
...
...
@@ -109,7 +114,7 @@ func parseFunc(vfunc string) (v ValidFunc, err error) {
err
=
fmt
.
Errorf
(
"%s require %d parameters"
,
vfunc
,
num
)
return
}
v
=
ValidFunc
{
Name
:
vfunc
}
v
=
ValidFunc
{
vfunc
,
[]
interface
{}{
vfunc
}
}
return
}
...
...
@@ -145,12 +150,13 @@ func numIn(name string) (num int, err error) {
err
=
fmt
.
Errorf
(
"doesn't exsits %s valid function"
,
name
)
return
}
// sub *Validation obj and key
num
=
fn
.
Type
()
.
NumIn
()
-
3
return
}
func
trim
(
name
string
,
s
[]
string
)
(
ts
[]
interface
{},
err
error
)
{
ts
=
make
([]
interface
{},
len
(
s
))
ts
=
make
([]
interface
{},
len
(
s
)
,
len
(
s
)
+
1
)
fn
,
ok
:=
funcs
[
name
]
if
!
ok
{
err
=
fmt
.
Errorf
(
"doesn't exsits %s valid function"
,
name
)
...
...
@@ -158,14 +164,17 @@ func trim(name string, s []string) (ts []interface{}, err error) {
}
for
i
:=
0
;
i
<
len
(
s
);
i
++
{
var
param
interface
{}
// skip *Validation and obj params
if
param
,
err
=
magic
(
fn
.
Type
()
.
In
(
i
+
2
),
strings
.
TrimSpace
(
s
[
i
]));
err
!=
nil
{
return
}
ts
[
i
]
=
param
}
ts
=
append
(
ts
,
name
)
return
}
// modify the parameters's type to adapt the function input parameters' type
func
magic
(
t
reflect
.
Type
,
s
string
)
(
i
interface
{},
err
error
)
{
switch
t
.
Kind
()
{
case
reflect
.
Int
:
...
...
@@ -174,10 +183,16 @@ func magic(t reflect.Type, s string) (i interface{}, err error) {
i
=
s
case
reflect
.
Ptr
:
if
t
.
Elem
()
.
String
()
!=
"regexp.Regexp"
{
err
=
fmt
.
Errorf
(
"
%s does not support
"
,
t
.
Elem
()
.
String
())
err
=
fmt
.
Errorf
(
"
does not support %s
"
,
t
.
Elem
()
.
String
())
return
}
i
,
err
=
regexp
.
Compile
(
s
)
default
:
err
=
fmt
.
Errorf
(
"does not support %s"
,
t
.
Kind
()
.
String
())
}
return
}
func
mergeParam
(
v
*
Validation
,
obj
interface
{},
params
[]
interface
{})
[]
interface
{}
{
return
append
([]
interface
{}{
v
,
obj
},
params
...
)
}
validation/util_test.go
View file @
92db56c0
...
...
@@ -67,7 +67,10 @@ func TestCall(t *testing.T) {
t
.
Fatal
(
err
)
}
valid
:=
&
Validation
{}
funcs
.
Call
(
vfs
[
1
]
.
Name
,
valid
,
u
.
Age
,
vfs
[
1
]
.
Params
[
0
],
vfs
[
1
]
.
Params
[
1
],
vfs
[
1
]
.
Name
)
vfs
[
1
]
.
Params
=
append
([]
interface
{}{
valid
,
u
.
Age
},
vfs
[
1
]
.
Params
...
)
if
_
,
err
=
funcs
.
Call
(
vfs
[
1
]
.
Name
,
vfs
[
1
]
.
Params
...
);
err
!=
nil
{
t
.
Fatal
(
err
)
}
if
len
(
valid
.
Errors
)
!=
1
{
t
.
Error
(
"age out of range should be has an error"
)
}
...
...
validation/validation.go
View file @
92db56c0
...
...
@@ -179,26 +179,29 @@ func (v *Validation) Check(obj interface{}, checks ...Validator) *ValidationResu
// the obj parameter must be a struct or a struct pointer
func
(
v
*
Validation
)
Valid
(
obj
interface
{})
(
b
bool
,
err
error
)
{
t
:=
reflect
.
TypeOf
(
obj
)
objT
:=
reflect
.
TypeOf
(
obj
)
objV
:=
reflect
.
ValueOf
(
obj
)
switch
{
case
isStruct
(
t
)
:
case
isStructPtr
(
t
)
:
t
=
t
.
Elem
()
case
isStruct
(
objT
)
:
case
isStructPtr
(
objT
)
:
objT
=
objT
.
Elem
()
objV
=
objV
.
Elem
()
default
:
err
=
fmt
.
Errorf
(
"%v must be a struct or a struct pointer"
,
obj
)
return
}
// tv := reflect.TypeOf(v)
// for i := 0; i < t.NumField(); i++ {
// f := t.Field(i)
// var vfs []ValidFunc
// if vfs, err = getValidFuncs(f); err != nil {
// return
// }
// for _, vf := range vfs {
// m, _ := tv.MethodByName(vf.Name)
// m.Func
// }
// }
for
i
:=
0
;
i
<
objT
.
NumField
();
i
++
{
var
vfs
[]
ValidFunc
if
vfs
,
err
=
getValidFuncs
(
objT
.
Field
(
i
));
err
!=
nil
{
return
}
for
_
,
vf
:=
range
vfs
{
if
_
,
err
=
funcs
.
Call
(
vf
.
Name
,
mergeParam
(
v
,
objV
.
Field
(
i
)
.
Interface
(),
vf
.
Params
)
...
);
err
!=
nil
{
return
}
}
}
return
!
v
.
HasErrors
(),
nil
}
validation/validation_test.go
View file @
92db56c0
...
...
@@ -57,16 +57,16 @@ func TestMax(t *testing.T) {
}
}
//
func TestRange(t *testing.T) {
//
valid := Validation{}
func
TestRange
(
t
*
testing
.
T
)
{
valid
:=
Validation
{}
//
if valid.Range(-1, 0, 1, "range0_1").Ok {
//
t.Error("-1 is bettween 0 and 1 should be false")
//
}
//
if !valid.Range(1, 0, 1, "range0_1").Ok {
//
t.Error("1 is bettween 0 and 1 should be true")
//
}
//
}
if
valid
.
Range
(
-
1
,
0
,
1
,
"range0_1"
)
.
Ok
{
t
.
Error
(
"-1 is bettween 0 and 1 should be false"
)
}
if
!
valid
.
Range
(
1
,
0
,
1
,
"range0_1"
)
.
Ok
{
t
.
Error
(
"1 is bettween 0 and 1 should be true"
)
}
}
func
TestMinSize
(
t
*
testing
.
T
)
{
valid
:=
Validation
{}
...
...
@@ -217,3 +217,30 @@ func TestBase64(t *testing.T) {
t
.
Error
(
"
\"
c3VjaHVhbmdqaUBnbWFpbC5jb20=
\"
are a valid base64 characters should be true"
)
}
}
func
TestValid
(
t
*
testing
.
T
)
{
type
user
struct
{
Id
int
Name
string
`valid:"Required"`
Age
int
`valid:"Required;Range(1, 140)"`
}
valid
:=
Validation
{}
u
:=
user
{
Name
:
"test"
,
Age
:
40
}
b
,
err
:=
valid
.
Valid
(
u
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
if
!
b
{
t
.
Error
(
"validation should be passed"
)
}
uptr
:=
&
user
{
Name
:
"test"
,
Age
:
180
}
b
,
err
=
valid
.
Valid
(
uptr
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
if
b
{
t
.
Error
(
"validation should not be passed"
)
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment