Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed issue with delegate call. Added ability to set custom error texts. #42

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
- Added default error texts setup.
Georgiy Malyukov committed Sep 2, 2018
commit e766c0bd95d096b32d3df8df9665f9da5f80827e
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ public struct CardExpirationDateInputValidator: InputValidatable {
public var validation: Validation?

public init(validation _: Validation? = nil) {
var predefinedValidation = Validation()
var predefinedValidation = Validation(name: "Card expiration date")
predefinedValidation.minimumLength = "MM/YY".count
predefinedValidation.maximumLength = "MM/YY".count
// predefinedValidation.required = validation?.required ?? false
56 changes: 48 additions & 8 deletions Source/Validation/Validation.swift
Original file line number Diff line number Diff line change
@@ -30,28 +30,68 @@ public class ValidationErrors: CustomStringConvertible {
string.append(" \(text).")
}
}
return string.trimmingCharacters(in: .whitespaces)
// remove whitespaces and possible repeating dots
return string.trimmingCharacters(in: .whitespaces).replacingOccurrences(of: "..", with: ".")
}

}

public class Validation {

public var minimumLength = 0
public var maximumLength: Int?
public var maximumValue: Double?
public var minimumValue: Double?
public var characterSet: CharacterSet?
public var format: String?
public var name: String? { didSet { reloadErrorTexts() } }
public var minimumLength = 0 { didSet { reloadErrorTexts() } }
public var maximumLength: Int? { didSet { reloadErrorTexts() } }
public var maximumValue: Double? { didSet { reloadErrorTexts() } }
public var minimumValue: Double? { didSet { reloadErrorTexts() } }
public var characterSet: CharacterSet? { didSet { reloadErrorTexts() } }
public var format: String? { didSet { reloadErrorTexts() } }
public var errors = ValidationErrors()

public init(minLength: Int = 0, maxLength: Int? = nil, minValue: Double? = nil, maxValue: Double? = nil, charSet: CharacterSet? = nil, format: String? = nil) {
public init(name: String? = nil, minLength: Int = 0, maxLength: Int? = nil, minValue: Double? = nil, maxValue: Double? = nil, charSet: CharacterSet? = nil, format: String? = nil) {
self.name = name
minimumLength = minLength
maximumLength = maxLength
if maximumLength != nil {
assert(minimumLength <= maximumLength!, "Invalid min/max length bounds.")
}
minimumValue = minValue
maximumValue = maxValue
if let min = minimumValue, let max = maximumValue {
assert(min <= max, "Invalid min/max value bounds.")
}
characterSet = charSet
self.format = format
// configure default errors text
reloadErrorTexts()
}

/// Sets default texts for different error types. Depends on `name` field, it must be non-nil to proceed.
public func reloadErrorTexts() {
guard let name = name else {
return
}
if errors.minimumLength.text == nil {
errors.minimumLength.text = (
minimumLength == 1
? "\(name) is required."
: "\(name) must contain \(minimumLength) characters or more."
)
}
if errors.maximumLength.text == nil && maximumLength != nil {
errors.maximumLength.text = "\(name) must contain \(maximumLength!) characters or less."
}
if errors.minimumValue.text == nil && minimumValue != nil {
errors.minimumValue.text = "\(name) must be greater than or equal to \(minimumValue!)."
}
if errors.maximumValue.text == nil && maximumValue != nil {
errors.maximumValue.text = "\(name) must be less than or equal to \(maximumValue!)."
}
if errors.characterSet.text == nil && characterSet != nil {
errors.characterSet.text = "\(name) must contain only characters in set \(characterSet!)."
}
if errors.format.text == nil && self.format != nil {
errors.format.text = "\(name) has invalid format."
}
}

// Making complete false will cause minimumLength, minimumValue and format to be ignored