Merge pull request #175 from andriast/master

Update RegexRule + RequiredRule
This commit is contained in:
David Patterson 2017-07-15 19:38:18 -05:00 committed by GitHub
commit 6cff6cac3e
2 changed files with 6 additions and 6 deletions

View File

@ -11,7 +11,7 @@ import Foundation
/**
`RegexRule` is a subclass of Rule that defines how a regular expression is validated.
*/
public class RegexRule : Rule {
open class RegexRule : Rule {
/// Regular express string to be used in validation.
private var REGEX: String = "^(?=.*?[A-Z]).{8,}$"
/// String that holds error message.
@ -35,7 +35,7 @@ public class RegexRule : Rule {
- parameter value: String to checked for validation.
- returns: Boolean value. True if validation is successful; False if validation fails.
*/
public func validate(_ value: String) -> Bool {
open func validate(_ value: String) -> Bool {
let test = NSPredicate(format: "SELF MATCHES %@", self.REGEX)
return test.evaluate(with: value)
}
@ -45,7 +45,7 @@ public class RegexRule : Rule {
- returns: String of error message.
*/
public func errorMessage() -> String {
open func errorMessage() -> String {
return message
}
}

View File

@ -11,7 +11,7 @@ import Foundation
/**
`RequiredRule` is a subclass of Rule that defines how a required field is validated.
*/
public class RequiredRule: Rule {
open class RequiredRule: Rule {
/// String that holds error message.
private var message : String
@ -31,7 +31,7 @@ public class RequiredRule: Rule {
- parameter value: String to checked for validation.
- returns: Boolean value. True if validation is successful; False if validation fails.
*/
public func validate(_ value: String) -> Bool {
open func validate(_ value: String) -> Bool {
return !value.isEmpty
}
@ -40,7 +40,7 @@ public class RequiredRule: Rule {
- returns: String of error message.
*/
public func errorMessage() -> String {
open func errorMessage() -> String {
return message
}
}