-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Resolves #62 `Optional validator`
- Loading branch information
Aaron McTavish
committed
Apr 10, 2018
1 parent
8070571
commit 9425181
Showing
3 changed files
with
119 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| // | ||
| // OptionalValidator.swift | ||
| // FormValidatorSwift | ||
| // | ||
| // Created by Aaron McTavish on 10/04/2018. | ||
| // Copyright © 2018 ustwo Fampany Ltd. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
|
|
||
| /// The `OptionalValidator` has two stages of conditions. First the `primaryCondition` is checked. If it is met, then the subsequent `condition` are checked for violations. If the `primaryCondition` is not met, then *no* violation is returned. | ||
| /// | ||
| /// As an example, say you only want violations to show if there is text in the field, but otherwise ignore it as it is an optional field in a form. In this case you would use a `PresentCondition` as the `primaryCondition` and your subsequent validation requirements as the `conditions`. | ||
| public struct OptionalValidator: Validator { | ||
|
|
||
|
|
||
| // MARK: - Properties | ||
|
|
||
| public var primaryCondition: Condition | ||
| public var conditions: [Condition] | ||
|
|
||
|
|
||
| // MARK: - Initializers | ||
|
|
||
| public init() { | ||
| primaryCondition = PresentCondition() | ||
| conditions = [PresentCondition()] | ||
| } | ||
|
|
||
| public init(conditions: [Condition], primaryCondition: Condition = PresentCondition()) { | ||
| self.primaryCondition = primaryCondition | ||
| self.conditions = conditions | ||
| } | ||
|
|
||
|
|
||
| // MARK: - Validity | ||
|
|
||
| public func checkConditions(_ text: String?) -> [Condition]? { | ||
| if primaryCondition.check(text) { | ||
| let violations = conditions.filter { !($0.check(text)) } | ||
|
|
||
| return violations.isEmpty ? nil : violations | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| // | ||
| // OptionalValidatorTests.swift | ||
| // FormValidatorSwift | ||
| // | ||
| // Created by Aaron McTavish on 10/04/2018. | ||
| // Copyright © 2018 ustwo. All rights reserved. | ||
| // | ||
|
|
||
| import XCTest | ||
|
|
||
| @testable import FormValidatorSwift | ||
|
|
||
|
|
||
| final class OptionalValidatorTests: XCTestCase { | ||
|
|
||
|
|
||
| // MARK: - Properties | ||
|
|
||
| let validator = OptionalValidator(conditions: [AlphabeticCondition()]) | ||
|
|
||
|
|
||
| // MARK: - Test Success | ||
|
|
||
| func testOptionalValidator_Success_PrimaryAndConditionsMet() { | ||
| // Given | ||
| let testInput = "Foo" | ||
| let expectedResult: [Condition]? = nil | ||
|
|
||
| // Test | ||
| AssertValidator(validator, testInput: testInput, expectedResult: expectedResult) | ||
| } | ||
|
|
||
| func testOptionalValidator_Success_PrimaryNotMet() { | ||
| // Given | ||
| let testInput = "" | ||
| let expectedResult: [Condition]? = nil | ||
|
|
||
| // Test | ||
| AssertValidator(validator, testInput: testInput, expectedResult: expectedResult) | ||
| } | ||
|
|
||
|
|
||
| // MARK: - Test Failure | ||
|
|
||
| func testOptionalValidator_Failure() { | ||
| // Given | ||
| let testInput = "Foo123" | ||
| let expectedResult: [Condition]? = validator.conditions | ||
|
|
||
| // Test | ||
| AssertValidator(validator, testInput: testInput, expectedResult: expectedResult) | ||
| } | ||
|
|
||
| } |