Skip to content

Commit

Permalink
Added support for RegExp pattern Validation (#2856)
Browse files Browse the repository at this point in the history
  • Loading branch information
K1NXZ committed Jul 25, 2022
1 parent d9d83cd commit b518199
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 0 deletions.
37 changes: 37 additions & 0 deletions Sources/Vapor/Validation/Validators/Pattern.swift
@@ -0,0 +1,37 @@
extension Validator where T == String {
/// Validates whether a `String` matches a RegularExpression pattern
public static func pattern(_ pattern: String) -> Validator<T> {
.init {
guard
let range = $0.range(of: pattern, options: [.regularExpression]),
range.lowerBound == $0.startIndex && range.upperBound == $0.endIndex
else {
return ValidatorResults.Pattern(isValidPattern: false, pattern: pattern)
}
return ValidatorResults.Pattern(isValidPattern: true, pattern: pattern)
}
}
}

extension ValidatorResults {
/// `ValidatorResult` of a validator that validates whether a `String`matches a RegularExpression pattern
public struct Pattern {
public let isValidPattern: Bool
public let pattern: String
}
}

extension ValidatorResults.Pattern: ValidatorResult {
public var isFailure: Bool {
/// The input is valid for the pattern
!self.isValidPattern
}

public var successDescription: String? {
"is a valid pattern"
}

public var failureDescription: String? {
"is not a valid pattern \(self.pattern)"
}
}
5 changes: 5 additions & 0 deletions Tests/VaporTests/ValidationTests.swift
Expand Up @@ -542,6 +542,11 @@ class ValidationTests: XCTestCase {
assert(true, fails: !.valid, "is valid")
assert("123", fails: !.valid, "is valid")
}

func testPattern() {
assert("this are not numbers", fails: .pattern("^[0-9]*$"), "is not a valid pattern ^[0-9]*$")
assert("12345", passes: .pattern("^[0-9]*$"))
}

func testPreexistingValidatorResultIsIncluded() throws {
struct CustomValidatorResult: ValidatorResult {
Expand Down

0 comments on commit b518199

Please sign in to comment.