Merge branch 'master' into json

baked_in.go

@@ -168,6 +168,9 @@ var (
 		"url_encoded":          isURLEncoded,
 		"dir":                  isDir,
 		"json":                 isJSON,
+		"hostname_port":        isHostnamePort,
+		"lowercase":            isLowercase,
+		"uppercase":            isUppercase,
 	}
 )
 
@@ -2018,6 +2021,52 @@ func isJSON(fl FieldLevel) bool {
 		val := field.String()
 		return json.Valid([]byte(val))
   }
+  panic(fmt.Sprintf("Bad field type %T", field.Interface()))
+}
+
+// isHostnamePort validates a <dns>:<port> combination for fields typically used for socket address.
+func isHostnamePort(fl FieldLevel) bool {
+	val := fl.Field().String()
+	host, port, err := net.SplitHostPort(val)
+	if err != nil {
+		return false
+	}
+	// Port must be a iny <= 65535.
+	if portNum, err := strconv.ParseInt(port, 10, 32); err != nil || portNum > 65535 || portNum < 1 {
+		return false
+	}
+
+	// If host is specified, it should match a DNS name
+	if host != "" {
+		return hostnameRegexRFC1123.MatchString(host)
+	}
+	return true
+}
+
+// isLowercase is the validation function for validating if the current field's value is a lowercase string.
+func isLowercase(fl FieldLevel) bool {
+	field := fl.Field()
+
+	if field.Kind() == reflect.String {
+		if field.String() == "" {
+			return false
+		}
+		return field.String() == strings.ToLower(field.String())
+	}
+
+	panic(fmt.Sprintf("Bad field type %T", field.Interface()))
+}
+
+// isUppercase is the validation function for validating if the current field's value is an uppercase string.
+func isUppercase(fl FieldLevel) bool {
+	field := fl.Field()
+
+	if field.Kind() == reflect.String {
+		if field.String() == "" {
+			return false
+		}
+		return field.String() == strings.ToUpper(field.String())
+	}
 
 	panic(fmt.Sprintf("Bad field type %T", field.Interface()))
 }

doc.go

@@ -158,7 +158,7 @@ handy in ignoring embedded structs from being validated. (Usage: -)
 Or Operator
 
 This is the 'or' operator allowing multiple validators to be used and
-accepted. (Usage: rbg|rgba) <-- this would allow either rgb or rgba
+accepted. (Usage: rgb|rgba) <-- this would allow either rgb or rgba
 colors to be accepted. This can also be combined with 'and' for example
 ( Usage: omitempty,rgb|rgba)
 
@@ -641,6 +641,18 @@ hashtag (#)
 
 		Usage: hexcolor
 
+Lowercase String
+
+This validates that a string value contains only lowercase characters. An empty string is not a valid lowercase string.
+
+	Usage: lowercase
+
+Uppercase String
+
+This validates that a string value contains only uppercase characters. An empty string is not a valid uppercase string.
+
+	Usage: uppercase
+
 RGB String
 
 This validates that a string value contains a valid rgb color
@@ -1043,6 +1055,13 @@ This is done using os.Stat, which is a platform independent function.
 
 	Usage: dir
 
+HostPort
+
+This validates that a string value contains a valid DNS hostname and port that
+can be used to valiate fields typically passed to sockets and connections.
+
+	Usage: hostname_port
+
 Alias Validators and Tags
 
 NOTE: When returning an error, the tag returned in "FieldError" will be

regexes.go

@@ -37,7 +37,7 @@ const (
 	longitudeRegexString             = "^[-+]?(180(\\.0+)?|((1[0-7]\\d)|([1-9]?\\d))(\\.\\d+)?)$"
 	sSNRegexString                   = `^[0-9]{3}[ -]?(0[1-9]|[1-9][0-9])[ -]?([1-9][0-9]{3}|[0-9][1-9][0-9]{2}|[0-9]{2}[1-9][0-9]|[0-9]{3}[1-9])$`
 	hostnameRegexStringRFC952        = `^[a-zA-Z][a-zA-Z0-9\-\.]+[a-zA-Z0-9]$`                                            // https://tools.ietf.org/html/rfc952
-	hostnameRegexStringRFC1123       = `^[a-zA-Z0-9][a-zA-Z0-9\-\.]+[a-zA-Z0-9]$` // accepts hostname starting with a digit https://tools.ietf.org/html/rfc1123
+	hostnameRegexStringRFC1123       = `^([a-zA-Z0-9]{1}[a-zA-Z0-9_-]{0,62}){1}(\.[a-zA-Z0-9_]{1}[a-zA-Z0-9_-]{0,62})*?$` // accepts hostname starting with a digit https://tools.ietf.org/html/rfc1123
 	btcAddressRegexString            = `^[13][a-km-zA-HJ-NP-Z1-9]{25,34}$`                                                // bitcoin address
 	btcAddressUpperRegexStringBech32 = `^BC1[02-9AC-HJ-NP-Z]{7,76}$`                                                      // bitcoin bech32 address https://en.bitcoin.it/wiki/Bech32
 	btcAddressLowerRegexStringBech32 = `^bc1[02-9ac-hj-np-z]{7,76}$`                                                      // bitcoin bech32 address https://en.bitcoin.it/wiki/Bech32

translations/en/en.go

@@ -1326,6 +1326,16 @@ func RegisterDefaultTranslations(v *validator.Validate, trans ut.Translator) (er
 			translation: "{0} must be a valid json string",
       override:    false,
     },
+    {
+			tag:         "lowercase",
+			translation: "{0} must be a lowercase string",
+			override:    false,
+		},
+		{
+			tag:         "uppercase",
+			translation: "{0} must be an uppercase string",
+			override:    false,
+		},
 	}
 
 	for _, t := range translations {

translations/en/en_test.go

@@ -4,9 +4,9 @@ import (
 	"testing"
 	"time"
 
+	. "github.com/go-playground/assert/v2"
 	english "github.com/go-playground/locales/en"
 	ut "github.com/go-playground/universal-translator"
-	. "github.com/go-playground/assert/v2"
 	"github.com/go-playground/validator/v10"
 )
 
@@ -142,6 +142,8 @@ func TestTranslations(t *testing.T) {
 		UniqueArray       [3]string         `validate:"unique"`
 		UniqueMap         map[string]string `validate:"unique"`
 		JSONString        string            `validate:"json"`
+		LowercaseString   string            `validate:"lowercase"`
+		UppercaseString   string            `validate:"uppercase"`
 	}
 
 	var test Test
@@ -184,6 +186,9 @@ func TestTranslations(t *testing.T) {
 
 	test.MultiByte = "1234feerf"
 
+	test.LowercaseString = "ABCDEFG"
+	test.UppercaseString = "abcdefg"
+
 	s := "toolong"
 	test.StrPtrMaxLen = &s
 	test.StrPtrLen = &s
@@ -637,6 +642,14 @@ func TestTranslations(t *testing.T) {
 			ns:       "Test.JSONString",
 			expected: "JSONString must be a valid json string",
 		},
+		{
+			ns:       "Test.LowercaseString",
+			expected: "LowercaseString must be a lowercase string",
+		},
+		{
+			ns:       "Test.UppercaseString",
+			expected: "UppercaseString must be an uppercase string",
+		},
 	}
 
 	for _, tt := range tests {

translations/ru/ru_test.go

@@ -0,0 +1,656 @@
+package ru
+
+import (
+	"log"
+	//"github.com/rustery/validator"
+	"testing"
+	"time"
+
+	. "github.com/go-playground/assert/v2"
+	russian "github.com/go-playground/locales/en"
+	ut "github.com/go-playground/universal-translator"
+	"github.com/go-playground/validator/v10"
+)
+
+func TestTranslations(t *testing.T) {
+
+	ru := russian.New()
+	uni := ut.New(ru, ru)
+	trans, _ := uni.GetTranslator("ru")
+
+	validate := validator.New()
+
+	err := RegisterDefaultTranslations(validate, trans)
+	Equal(t, err, nil)
+
+	type Inner struct {
+		EqCSFieldString  string
+		NeCSFieldString  string
+		GtCSFieldString  string
+		GteCSFieldString string
+		LtCSFieldString  string
+		LteCSFieldString string
+	}
+
+	type Test struct {
+		Inner             Inner
+		RequiredString    string            `validate:"required"`
+		RequiredNumber    int               `validate:"required"`
+		RequiredMultiple  []string          `validate:"required"`
+		LenString         string            `validate:"len=1"`
+		LenNumber         float64           `validate:"len=1113.00"`
+		LenMultiple       []string          `validate:"len=7"`
+		MinString         string            `validate:"min=1"`
+		MinNumber         float64           `validate:"min=1113.00"`
+		MinMultiple       []string          `validate:"min=7"`
+		MaxString         string            `validate:"max=3"`
+		MaxNumber         float64           `validate:"max=1113.00"`
+		MaxMultiple       []string          `validate:"max=7"`
+		EqString          string            `validate:"eq=3"`
+		EqNumber          float64           `validate:"eq=2.33"`
+		EqMultiple        []string          `validate:"eq=7"`
+		NeString          string            `validate:"ne="`
+		NeNumber          float64           `validate:"ne=0.00"`
+		NeMultiple        []string          `validate:"ne=0"`
+		LtString          string            `validate:"lt=3"`
+		LtNumber          float64           `validate:"lt=5.56"`
+		LtMultiple        []string          `validate:"lt=2"`
+		LtTime            time.Time         `validate:"lt"`
+		LteString         string            `validate:"lte=3"`
+		LteNumber         float64           `validate:"lte=5.56"`
+		LteMultiple       []string          `validate:"lte=2"`
+		LteTime           time.Time         `validate:"lte"`
+		GtString          string            `validate:"gt=3"`
+		GtNumber          float64           `validate:"gt=5.56"`
+		GtMultiple        []string          `validate:"gt=2"`
+		GtTime            time.Time         `validate:"gt"`
+		GteString         string            `validate:"gte=3"`
+		GteNumber         float64           `validate:"gte=5.56"`
+		GteMultiple       []string          `validate:"gte=2"`
+		GteTime           time.Time         `validate:"gte"`
+		EqFieldString     string            `validate:"eqfield=MaxString"`
+		EqCSFieldString   string            `validate:"eqcsfield=Inner.EqCSFieldString"`
+		NeCSFieldString   string            `validate:"necsfield=Inner.NeCSFieldString"`
+		GtCSFieldString   string            `validate:"gtcsfield=Inner.GtCSFieldString"`
+		GteCSFieldString  string            `validate:"gtecsfield=Inner.GteCSFieldString"`
+		LtCSFieldString   string            `validate:"ltcsfield=Inner.LtCSFieldString"`
+		LteCSFieldString  string            `validate:"ltecsfield=Inner.LteCSFieldString"`
+		NeFieldString     string            `validate:"nefield=EqFieldString"`
+		GtFieldString     string            `validate:"gtfield=MaxString"`
+		GteFieldString    string            `validate:"gtefield=MaxString"`
+		LtFieldString     string            `validate:"ltfield=MaxString"`
+		LteFieldString    string            `validate:"ltefield=MaxString"`
+		AlphaString       string            `validate:"alpha"`
+		AlphanumString    string            `validate:"alphanum"`
+		NumericString     string            `validate:"numeric"`
+		NumberString      string            `validate:"number"`
+		HexadecimalString string            `validate:"hexadecimal"`
+		HexColorString    string            `validate:"hexcolor"`
+		RGBColorString    string            `validate:"rgb"`
+		RGBAColorString   string            `validate:"rgba"`
+		HSLColorString    string            `validate:"hsl"`
+		HSLAColorString   string            `validate:"hsla"`
+		Email             string            `validate:"email"`
+		URL               string            `validate:"url"`
+		URI               string            `validate:"uri"`
+		Base64            string            `validate:"base64"`
+		Contains          string            `validate:"contains=purpose"`
+		ContainsAny       string            `validate:"containsany=!@#$"`
+		Excludes          string            `validate:"excludes=text"`
+		ExcludesAll       string            `validate:"excludesall=!@#$"`
+		ExcludesRune      string            `validate:"excludesrune=☻"`
+		ISBN              string            `validate:"isbn"`
+		ISBN10            string            `validate:"isbn10"`
+		ISBN13            string            `validate:"isbn13"`
+		UUID              string            `validate:"uuid"`
+		UUID3             string            `validate:"uuid3"`
+		UUID4             string            `validate:"uuid4"`
+		UUID5             string            `validate:"uuid5"`
+		ASCII             string            `validate:"ascii"`
+		PrintableASCII    string            `validate:"printascii"`
+		MultiByte         string            `validate:"multibyte"`
+		DataURI           string            `validate:"datauri"`
+		Latitude          string            `validate:"latitude"`
+		Longitude         string            `validate:"longitude"`
+		SSN               string            `validate:"ssn"`
+		IP                string            `validate:"ip"`
+		IPv4              string            `validate:"ipv4"`
+		IPv6              string            `validate:"ipv6"`
+		CIDR              string            `validate:"cidr"`
+		CIDRv4            string            `validate:"cidrv4"`
+		CIDRv6            string            `validate:"cidrv6"`
+		TCPAddr           string            `validate:"tcp_addr"`
+		TCPAddrv4         string            `validate:"tcp4_addr"`
+		TCPAddrv6         string            `validate:"tcp6_addr"`
+		UDPAddr           string            `validate:"udp_addr"`
+		UDPAddrv4         string            `validate:"udp4_addr"`
+		UDPAddrv6         string            `validate:"udp6_addr"`
+		IPAddr            string            `validate:"ip_addr"`
+		IPAddrv4          string            `validate:"ip4_addr"`
+		IPAddrv6          string            `validate:"ip6_addr"`
+		UinxAddr          string            `validate:"unix_addr"` // can't fail from within Go's net package currently, but maybe in the future
+		MAC               string            `validate:"mac"`
+		IsColor           string            `validate:"iscolor"`
+		StrPtrMinLen      *string           `validate:"min=10"`
+		StrPtrMaxLen      *string           `validate:"max=1"`
+		StrPtrLen         *string           `validate:"len=2"`
+		StrPtrLt          *string           `validate:"lt=1"`
+		StrPtrLte         *string           `validate:"lte=1"`
+		StrPtrGt          *string           `validate:"gt=10"`
+		StrPtrGte         *string           `validate:"gte=10"`
+		OneOfString       string            `validate:"oneof=red green"`
+		OneOfInt          int               `validate:"oneof=5 63"`
+		UniqueSlice       []string          `validate:"unique"`
+		UniqueArray       [3]string         `validate:"unique"`
+		UniqueMap         map[string]string `validate:"unique"`
+	}
+
+	var test Test
+
+	test.Inner.EqCSFieldString = "1234"
+	test.Inner.GtCSFieldString = "1234"
+	test.Inner.GteCSFieldString = "1234"
+
+	test.MaxString = "1234"
+	test.MaxNumber = 2000
+	test.MaxMultiple = make([]string, 9)
+
+	test.LtString = "1234"
+	test.LtNumber = 6
+	test.LtMultiple = make([]string, 3)
+	test.LtTime = time.Now().Add(time.Hour * 24)
+
+	test.LteString = "1234"
+	test.LteNumber = 6
+	test.LteMultiple = make([]string, 3)
+	test.LteTime = time.Now().Add(time.Hour * 24)
+
+	test.LtFieldString = "12345"
+	test.LteFieldString = "12345"
+
+	test.LtCSFieldString = "1234"
+	test.LteCSFieldString = "1234"
+
+	test.AlphaString = "abc3"
+	test.AlphanumString = "abc3!"
+	test.NumericString = "12E.00"
+	test.NumberString = "12E"
+
+	test.Excludes = "this is some test text"
+	test.ExcludesAll = "This is Great!"
+	test.ExcludesRune = "Love it ☻"
+
+	test.ASCII = "ｶﾀｶﾅ"
+	test.PrintableASCII = "ｶﾀｶﾅ"
+
+	test.MultiByte = "1234feerf"
+
+	s := "toolong"
+	test.StrPtrMaxLen = &s
+	test.StrPtrLen = &s
+
+	test.UniqueSlice = []string{"1234", "1234"}
+	test.UniqueMap = map[string]string{"key1": "1234", "key2": "1234"}
+
+	err = validate.Struct(test)
+	NotEqual(t, err, nil)
+
+	errs, ok := err.(validator.ValidationErrors)
+	Equal(t, ok, true)
+
+	tests := []struct {
+		ns       string
+		expected string
+	}{
+		{
+			ns:       "Test.IsColor",
+			expected: "IsColor должен быть цветом",
+		},
+		{
+			ns:       "Test.MAC",
+			expected: "MAC должен содержать MAC адрес",
+		},
+		{
+			ns:       "Test.IPAddr",
+			expected: "IPAddr должен быть распознаваемым IP адресом",
+		},
+		{
+			ns:       "Test.IPAddrv4",
+			expected: "IPAddrv4 должен быть распознаваемым IPv4 адресом",
+		},
+		{
+			ns:       "Test.IPAddrv6",
+			expected: "IPAddrv6 должен быть распознаваемым IPv6 адресом",
+		},
+		{
+			ns:       "Test.UDPAddr",
+			expected: "UDPAddr должен быть UDP адресом",
+		},
+		{
+			ns:       "Test.UDPAddrv4",
+			expected: "UDPAddrv4 должен быть IPv4 UDP адресом",
+		},
+		{
+			ns:       "Test.UDPAddrv6",
+			expected: "UDPAddrv6 должен быть IPv6 UDP адресом",
+		},
+		{
+			ns:       "Test.TCPAddr",
+			expected: "TCPAddr должен быть TCP адресом",
+		},
+		{
+			ns:       "Test.TCPAddrv4",
+			expected: "TCPAddrv4 должен быть IPv4 TCP адресом",
+		},
+		{
+			ns:       "Test.TCPAddrv6",
+			expected: "TCPAddrv6 должен быть IPv6 TCP адресом",
+		},
+		{
+			ns:       "Test.CIDR",
+			expected: "CIDR должен содержать CIDR обозначения",
+		},
+		{
+			ns:       "Test.CIDRv4",
+			expected: "CIDRv4 должен содержать CIDR обозначения для IPv4 адреса",
+		},
+		{
+			ns:       "Test.CIDRv6",
+			expected: "CIDRv6 должен содержать CIDR обозначения для IPv6 адреса",
+		},
+		{
+			ns:       "Test.SSN",
+			expected: "SSN должен быть SSN номером",
+		},
+		{
+			ns:       "Test.IP",
+			expected: "IP должен быть IP адресом",
+		},
+		{
+			ns:       "Test.IPv4",
+			expected: "IPv4 должен быть IPv4 адресом",
+		},
+		{
+			ns:       "Test.IPv6",
+			expected: "IPv6 должен быть IPv6 адресом",
+		},
+		{
+			ns:       "Test.DataURI",
+			expected: "DataURI должен содержать Data URI",
+		},
+		{
+			ns:       "Test.Latitude",
+			expected: "Latitude должен содержать координаты широты",
+		},
+		{
+			ns:       "Test.Longitude",
+			expected: "Longitude должен содержать координаты долготы",
+		},
+		{
+			ns:       "Test.MultiByte",
+			expected: "MultiByte должен содержать мультибайтные символы",
+		},
+		{
+			ns:       "Test.ASCII",
+			expected: "ASCII должен содержать только ascii символы",
+		},
+		{
+			ns:       "Test.PrintableASCII",
+			expected: "PrintableASCII должен содержать только доступные для печати ascii символы",
+		},
+		{
+			ns:       "Test.UUID",
+			expected: "UUID должен быть UUID",
+		},
+		{
+			ns:       "Test.UUID3",
+			expected: "UUID3 должен быть UUID 3 версии",
+		},
+		{
+			ns:       "Test.UUID4",
+			expected: "UUID4 должен быть UUID 4 версии",
+		},
+		{
+			ns:       "Test.UUID5",
+			expected: "UUID5 должен быть UUID 5 версии",
+		},
+		{
+			ns:       "Test.ISBN",
+			expected: "ISBN должен быть ISBN номером",
+		},
+		{
+			ns:       "Test.ISBN10",
+			expected: "ISBN10 должен быть ISBN-10 номером",
+		},
+		{
+			ns:       "Test.ISBN13",
+			expected: "ISBN13 должен быть ISBN-13 номером",
+		},
+		{
+			ns:       "Test.Excludes",
+			expected: "Excludes не должен содержать текст 'text'",
+		},
+		{
+			ns:       "Test.ExcludesAll",
+			expected: "ExcludesAll не должен содержать символы '!@#$'",
+		},
+		{
+			ns:       "Test.ExcludesRune",
+			expected: "ExcludesRune не должен содержать '☻'",
+		},
+		{
+			ns:       "Test.ContainsAny",
+			expected: "ContainsAny должен содержать минимум один из символов '!@#$'",
+		},
+		{
+			ns:       "Test.Contains",
+			expected: "Contains должен содержать текст 'purpose'",
+		},
+		{
+			ns:       "Test.Base64",
+			expected: "Base64 должен быть Base64 строкой",
+		},
+		{
+			ns:       "Test.Email",
+			expected: "Email должен быть email адресом",
+		},
+		{
+			ns:       "Test.URL",
+			expected: "URL должен быть URL",
+		},
+		{
+			ns:       "Test.URI",
+			expected: "URI должен быть URI",
+		},
+		{
+			ns:       "Test.RGBColorString",
+			expected: "RGBColorString должен быть RGB цветом",
+		},
+		{
+			ns:       "Test.RGBAColorString",
+			expected: "RGBAColorString должен быть RGBA цветом",
+		},
+		{
+			ns:       "Test.HSLColorString",
+			expected: "HSLColorString должен быть HSL цветом",
+		},
+		{
+			ns:       "Test.HSLAColorString",
+			expected: "HSLAColorString должен быть HSLA цветом",
+		},
+		{
+			ns:       "Test.HexadecimalString",
+			expected: "HexadecimalString должен быть шестнадцатеричной строкой",
+		},
+		{
+			ns:       "Test.HexColorString",
+			expected: "HexColorString должен быть HEX цветом",
+		},
+		{
+			ns:       "Test.NumberString",
+			expected: "NumberString должен быть цифрой",
+		},
+		{
+			ns:       "Test.NumericString",
+			expected: "NumericString должен быть цифровым значением",
+		},
+		{
+			ns:       "Test.AlphanumString",
+			expected: "AlphanumString должен содержать только буквы и цифры",
+		},
+		{
+			ns:       "Test.AlphaString",
+			expected: "AlphaString должен содержать только буквы",
+		},
+		{
+			ns:       "Test.LtFieldString",
+			expected: "LtFieldString должен быть менее MaxString",
+		},
+		{
+			ns:       "Test.LteFieldString",
+			expected: "LteFieldString должен быть менее или равен MaxString",
+		},
+		{
+			ns:       "Test.GtFieldString",
+			expected: "GtFieldString должен быть больше MaxString",
+		},
+		{
+			ns:       "Test.GteFieldString",
+			expected: "GteFieldString должен быть больше или равен MaxString",
+		},
+		{
+			ns:       "Test.NeFieldString",
+			expected: "NeFieldString не должен быть равен EqFieldString",
+		},
+		{
+			ns:       "Test.LtCSFieldString",
+			expected: "LtCSFieldString должен быть менее Inner.LtCSFieldString",
+		},
+		{
+			ns:       "Test.LteCSFieldString",
+			expected: "LteCSFieldString должен быть менее или равен Inner.LteCSFieldString",
+		},
+		{
+			ns:       "Test.GtCSFieldString",
+			expected: "GtCSFieldString должен быть больше Inner.GtCSFieldString",
+		},
+		{
+			ns:       "Test.GteCSFieldString",
+			expected: "GteCSFieldString должен быть больше или равен Inner.GteCSFieldString",
+		},
+		{
+			ns:       "Test.NeCSFieldString",
+			expected: "NeCSFieldString не должен быть равен Inner.NeCSFieldString",
+		},
+		{
+			ns:       "Test.EqCSFieldString",
+			expected: "EqCSFieldString должен быть равен Inner.EqCSFieldString",
+		},
+		{
+			ns:       "Test.EqFieldString",
+			expected: "EqFieldString должен быть равен MaxString",
+		},
+		{
+			ns:       "Test.GteString",
+			expected: "GteString должен содержать минимум 3 символы",
+		},
+		{
+			ns:       "Test.GteNumber",
+			expected: "GteNumber должен быть больше или равно 5.56",
+		},
+		{
+			ns:       "Test.GteMultiple",
+			expected: "GteMultiple должен содержать минимум 2 элементы",
+		},
+		{
+			ns:       "Test.GteTime",
+			expected: "GteTime должна быть позже или равна текущему моменту",
+		},
+		{
+			ns:       "Test.GtString",
+			expected: "GtString должен быть длиннее 3 символы",
+		},
+		{
+			ns:       "Test.GtNumber",
+			expected: "GtNumber должен быть больше 5.56",
+		},
+		{
+			ns:       "Test.GtMultiple",
+			expected: "GtMultiple должен содержать более 2 элементы",
+		},
+		{
+			ns:       "Test.GtTime",
+			expected: "GtTime должна быть позже текущего момента",
+		},
+		{
+			ns:       "Test.LteString",
+			expected: "LteString должен содержать максимум 3 символы",
+		},
+		{
+			ns:       "Test.LteNumber",
+			expected: "LteNumber должен быть менее или равен 5.56",
+		},
+		{
+			ns:       "Test.LteMultiple",
+			expected: "LteMultiple должен содержать максимум 2 элементы",
+		},
+		{
+			ns:       "Test.LteTime",
+			expected: "LteTime must be less than or equal to the current Date & Time",
+		},
+		{
+			ns:       "Test.LtString",
+			expected: "LtString должен иметь менее 3 символы",
+		},
+		{
+			ns:       "Test.LtNumber",
+			expected: "LtNumber должен быть менее 5.56",
+		},
+		{
+			ns:       "Test.LtMultiple",
+			expected: "LtMultiple должен содержать менее 2 элементы",
+		},
+		{
+			ns:       "Test.LtTime",
+			expected: "LtTime must be less than the current Date & Time",
+		},
+		{
+			ns:       "Test.NeString",
+			expected: "NeString должен быть не равен ",
+		},
+		{
+			ns:       "Test.NeNumber",
+			expected: "NeNumber должен быть не равен 0.00",
+		},
+		{
+			ns:       "Test.NeMultiple",
+			expected: "NeMultiple должен быть не равен 0",
+		},
+		{
+			ns:       "Test.EqString",
+			expected: "EqString не равен 3",
+		},
+		{
+			ns:       "Test.EqNumber",
+			expected: "EqNumber не равен 2.33",
+		},
+		{
+			ns:       "Test.EqMultiple",
+			expected: "EqMultiple не равен 7",
+		},
+		{
+			ns:       "Test.MaxString",
+			expected: "MaxString должен содержать максимум 3 символы",
+		},
+		{
+			ns:       "Test.MaxNumber",
+			expected: "MaxNumber должен быть меньше или равно 1,113.00",
+		},
+		{
+			ns:       "Test.MaxMultiple",
+			expected: "MaxMultiple должен содержать максимум 7 элементы",
+		},
+		{
+			ns:       "Test.MinString",
+			expected: "MinString должен содержать минимум 1 символ",
+		},
+		{
+			ns:       "Test.MinNumber",
+			expected: "MinNumber должен быть больше или равно 1,113.00",
+		},
+		{
+			ns:       "Test.MinMultiple",
+			expected: "MinMultiple должен содержать минимум 7 элементы",
+		},
+		{
+			ns:       "Test.LenString",
+			expected: "LenString должен быть длиной в 1 символ",
+		},
+		{
+			ns:       "Test.LenNumber",
+			expected: "LenNumber должен быть равен 1,113.00",
+		},
+		{
+			ns:       "Test.LenMultiple",
+			expected: "LenMultiple должен содержать 7 элементы",
+		},
+		{
+			ns:       "Test.RequiredString",
+			expected: "RequiredString обязательное поле",
+		},
+		{
+			ns:       "Test.RequiredNumber",
+			expected: "RequiredNumber обязательное поле",
+		},
+		{
+			ns:       "Test.RequiredMultiple",
+			expected: "RequiredMultiple обязательное поле",
+		},
+		{
+			ns:       "Test.StrPtrMinLen",
+			expected: "StrPtrMinLen должен содержать минимум 10 символы",
+		},
+		{
+			ns:       "Test.StrPtrMaxLen",
+			expected: "StrPtrMaxLen должен содержать максимум 1 символ",
+		},
+		{
+			ns:       "Test.StrPtrLen",
+			expected: "StrPtrLen должен быть длиной в 2 символы",
+		},
+		{
+			ns:       "Test.StrPtrLt",
+			expected: "StrPtrLt должен иметь менее 1 символ",
+		},
+		{
+			ns:       "Test.StrPtrLte",
+			expected: "StrPtrLte должен содержать максимум 1 символ",
+		},
+		{
+			ns:       "Test.StrPtrGt",
+			expected: "StrPtrGt должен быть длиннее 10 символы",
+		},
+		{
+			ns:       "Test.StrPtrGte",
+			expected: "StrPtrGte должен содержать минимум 10 символы",
+		},
+		{
+			ns:       "Test.OneOfString",
+			expected: "OneOfString должен быть одним из [red green]",
+		},
+		{
+			ns:       "Test.OneOfInt",
+			expected: "OneOfInt должен быть одним из [5 63]",
+		},
+		{
+			ns:       "Test.UniqueSlice",
+			expected: "UniqueSlice должен содержать уникальные значения",
+		},
+		{
+			ns:       "Test.UniqueArray",
+			expected: "UniqueArray должен содержать уникальные значения",
+		},
+		{
+			ns:       "Test.UniqueMap",
+			expected: "UniqueMap должен содержать уникальные значения",
+		},
+	}
+
+	for _, tt := range tests {
+
+		var fe validator.FieldError
+
+		for _, e := range errs {
+			if tt.ns == e.Namespace() {
+				fe = e
+				break
+			}
+		}
+
+		log.Println(fe)
+
+		NotEqual(t, fe, nil)
+		Equal(t, tt.expected, fe.Translate(trans))
+	}
+
+}

validator_test.go

@@ -7954,15 +7954,15 @@ func TestHostnameRFC1123Validation(t *testing.T) {
 
 		if test.expected {
 			if !IsEqual(errs, nil) {
-				t.Fatalf("Index: %d hostname failed Error: %v", i, errs)
+				t.Fatalf("Hostname: %v failed Error: %v", test, errs)
 			}
 		} else {
 			if IsEqual(errs, nil) {
-				t.Fatalf("Index: %d hostname failed Error: %v", i, errs)
+				t.Fatalf("Hostname: %v failed Error: %v", test, errs)
 			} else {
 				val := getError(errs, "", "")
 				if val.Tag() != "hostname_rfc1123" {
-					t.Fatalf("Index: %d hostname failed Error: %v", i, errs)
+					t.Fatalf("Hostname: %v failed Error: %v", i, errs)
 				}
 			}
 		}
@@ -9051,3 +9051,108 @@ func TestJSONValidation(t *testing.T) {
 		_ = validate.Var(2, "json")
 	}, "Bad field type int")
 }
+
+func Test_hostnameport_validator(t *testing.T) {
+
+	type Host struct {
+		Addr string `validate:"hostname_port"`
+	}
+
+	type testInput struct {
+		data     string
+		expected bool
+	}
+	testData := []testInput{
+		{"bad..domain.name:234", false},
+		{"extra.dot.com.", false},
+		{"localhost:1234", true},
+		{"192.168.1.1:1234", true},
+		{":1234", true},
+		{"domain.com:1334", true},
+		{"this.domain.com:234", true},
+		{"domain:75000", false},
+		{"missing.port", false},
+	}
+	for _, td := range testData {
+		h := Host{Addr: td.data}
+		v := New()
+		err := v.Struct(h)
+		if td.expected != (err == nil) {
+			t.Fatalf("Test failed for data: %v Error: %v", td.data, err)
+		}
+	}
+}
+
+func TestLowercaseValidation(t *testing.T) {
+	tests := []struct {
+		param    string
+		expected bool
+	}{
+		{`abcdefg`, true},
+		{`Abcdefg`, false},
+		{"", false},
+	}
+
+	validate := New()
+
+	for i, test := range tests {
+
+		errs := validate.Var(test.param, "lowercase")
+
+		if test.expected {
+			if !IsEqual(errs, nil) {
+				t.Fatalf("Index: %d lowercase failed Error: %s", i, errs)
+			}
+		} else {
+			if IsEqual(errs, nil) {
+				t.Fatalf("Index: %d lowercase failed Error: %s", i, errs)
+			} else {
+				val := getError(errs, "", "")
+				if val.Tag() != "lowercase" {
+					t.Fatalf("Index: %d lowercase failed Error: %s", i, errs)
+				}
+			}
+		}
+	}
+
+	PanicMatches(t, func() {
+		_ = validate.Var(2, "lowercase")
+	}, "Bad field type int")
+}
+
+func TestUppercaseValidation(t *testing.T) {
+	tests := []struct {
+		param    string
+		expected bool
+	}{
+		{`ABCDEFG`, true},
+		{`aBCDEFG`, false},
+		{"", false},
+	}
+
+	validate := New()
+
+	for i, test := range tests {
+
+		errs := validate.Var(test.param, "uppercase")
+
+		if test.expected {
+			if !IsEqual(errs, nil) {
+				t.Fatalf("Index: %d uppercase failed Error: %s", i, errs)
+			}
+		} else {
+			if IsEqual(errs, nil) {
+				t.Fatalf("Index: %d uppercase failed Error: %s", i, errs)
+			} else {
+				val := getError(errs, "", "")
+				if val.Tag() != "uppercase" {
+					t.Fatalf("Index: %d uppercase failed Error: %s", i, errs)
+				}
+			}
+		}
+	}
+
+	PanicMatches(t, func() {
+		_ = validate.Var(2, "uppercase")
+	}, "Bad field type int")
+}