@@ -49,11 +49,12 @@ defmodule Helper.Validator.Schema do
4949end )
5050end
5151
52- defp match ( field , nil , enum: _ , required: false ) , do: done ( field , nil )
52+ defp option_valid? ( { :min , v } ) when is_integer ( v ) , do: true
53+ defp option_valid? ( { :required , v } ) when is_boolean ( v ) , do: true
54+ defp option_valid? ( _ ) , do: false
5355
54- defp match ( field , value , enum: enum , required: _ ) do
55- match ( field , value , enum: enum )
56- end
56+ defp match ( field , nil , enum: _ , required: false ) , do: done ( field , nil )
57+ defp match ( field , value , enum: enum , required: _ ) , do: match ( field , value , enum: enum )
5758
5859defp match ( field , value , enum: enum ) do
5960case value in enum do
@@ -69,13 +70,8 @@ defmodule Helper.Validator.Schema do
6970end
7071end
7172
72- defp match ( field , value , [ type | options ] ) do
73- match ( field , value , type , options )
74- end
75-
76- defp match ( field , nil , _type , [ { :required , false } | _options ] ) do
77- done ( field , nil )
78- end
73+ defp match ( field , value , [ type | options ] ) , do: match ( field , value , type , options )
74+ defp match ( field , nil , _type , [ { :required , false } | _options ] ) , do: done ( field , nil )
7975
8076defp match ( field , value , type , [ { :required , _ } | options ] ) do
8177match ( field , value , type , options )
@@ -138,15 +134,7 @@ defmodule Helper.Validator.Schema do
138134{ :error , % { field: field |> to_string , value: value , message: "unknow option:#{ option } } }
139135end
140136
141- defp error ( field , value , :option ) do
142- { :error , % { field: field |> to_string , value: value , message: "unknow option" } }
143- end
144-
145137defp error ( field , value , schema ) do
146138{ :error , % { field: field |> to_string , value: value , message: "should be:#{ schema } } }
147139end
148-
149- defp option_valid? ( { :min , v } ) when is_integer ( v ) , do: true
150- defp option_valid? ( { :required , v } ) when is_boolean ( v ) , do: true
151- defp option_valid? ( _ ) , do: false
152140end