TouchInstinct
/
SwiftValidator
312
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #111 from dadalar/ValidatableProtocol 

Remove UITextField limitations
This commit is contained in:
David Patterson 2016-05-25 17:22:31 -05:00
parent ca7ec31141 f344bdc370
commit 59d1a6398e
21 changed files with 181 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
SwiftValidator/Core/Validatable.swift Normal file
View File

@ -0,0 +1,25 @@
//
// Validatable.swift
// Validator
//
// Created by Deniz Adalar on 28/04/16.
// Copyright © 2016 jpotts18. All rights reserved.
//
import Foundation
public typealias ValidatableField = protocol<AnyObject, Validatable>
public protocol Validatable {
var validationText: String {
get
}
}
extension UITextField: Validatable {
public var validationText: String {
return text ?? ""
}
}

4
SwiftValidator/Core/ValidationDelegate.swift
View File

@ -11,7 +11,7 @@ import UIKit
/**
Protocol for `ValidationDelegate` adherents, which comes with two required methods that are called depending on whether validation succeeded or failed.
*/
@objc public protocol ValidationDelegate {
public protocol ValidationDelegate {
/**
This method will be called on delegate object when validation is successful.
@ -23,5 +23,5 @@ import UIKit
- returns: No return value.
*/
func validationFailed(errors: [UITextField:ValidationError])
func validationFailed(errors: [(Validatable, ValidationError)])
}

16
SwiftValidator/Core/ValidationError.swift
View File

@ -7,26 +7,26 @@ import Foundation
import UIKit
/**
The `ValidationError` class is used for representing errors of a failed validation. It contains the text field, error label, and error message of a failed validation.
The `ValidationError` class is used for representing errors of a failed validation. It contains the field, error label, and error message of a failed validation.
*/
public class ValidationError: NSObject {
/// the textField of the field
public let textField:UITextField
/// the Validatable field of the field
public let field:ValidatableField
/// the error label of the field
public var errorLabel:UILabel?
/// the error message of the field
public let errorMessage:String
/**
Initializes `ValidationError` object with a textField, errorLabel, and errorMessage.
- parameter textField: UITextField that holds textField.
Initializes `ValidationError` object with a field, errorLabel, and errorMessage.
- parameter field: Validatable field that holds field.
- parameter errorLabel: UILabel that holds error label.
- parameter errorMessage: String that holds error message.
- returns: An initialized object, or nil if an object could not be created for some reason that would not result in an exception.
*/
public init(textField:UITextField, errorLabel:UILabel?, error:String){
self.textField = textField
public init(field:ValidatableField, errorLabel:UILabel?, error:String){
self.field = field
self.errorLabel = errorLabel
self.errorMessage = error
}

49
SwiftValidator/Core/Validator.swift
View File

@ -14,10 +14,12 @@ import UIKit
*/
public class Validator {
/// Dictionary to hold all fields (and accompanying rules) that will undergo validation.
public var validations = [UITextField:ValidationRule]()
public var validations = ValidatorDictionary<ValidationRule>()
/// Dictionary to hold fields (and accompanying errors) that were unsuccessfully validated.
public var errors = [UITextField:ValidationError]()
/// Variable that holds success closure to display positive status of field.
public var errors = ValidatorDictionary<ValidationError>()
/// Dictionary to hold fields by their object identifiers
private var fields = ValidatorDictionary<Validatable>()
/// Variable that holds success closure to display positive status of field.
private var successStyleTransform:((validationRule:ValidationRule)->Void)?
/// Variable that holds error closure to display negative status of field.
private var errorStyleTransform:((validationError:ValidationError)->Void)?
@ -34,11 +36,11 @@ public class Validator {
*/
private func validateAllFields() {
errors = [:]
errors = ValidatorDictionary<ValidationError>()
for (textField, rule) in validations {
for (_, rule) in validations {
if let error = rule.validateField() {
errors[textField] = error
errors[rule.field] = error
// let the user transform the field if they want
if let transform = self.errorStyleTransform {
@ -60,13 +62,13 @@ public class Validator {
This method is used to validate a single field registered to Validator. If validation is unsuccessful,
field gets added to errors dictionary.
- parameter textField: Holds validator field data.
- parameter field: Holds validator field data.
- returns: No return value.
*/
public func validateField(textField: UITextField, callback: (error:ValidationError?) -> Void){
if let fieldRule = validations[textField] {
public func validateField(field: ValidatableField, callback: (error:ValidationError?) -> Void){
if let fieldRule = validations[field] {
if let error = fieldRule.validateField() {
errors[textField] = error
errors[field] = error
if let transform = self.errorStyleTransform {
transform(validationError: error)
}
@ -95,28 +97,29 @@ public class Validator {
self.successStyleTransform = success
self.errorStyleTransform = error
}
/**
This method is used to add a field to validator.
- parameter textfield: field that is to be validated.
- parameter field: field that is to be validated.
- parameter errorLabel: A UILabel that holds error label data
- parameter rules: A Rule array that holds different rules that apply to said textField.
- parameter rules: A Rule array that holds different rules that apply to said field.
- returns: No return value
*/
public func registerField(textField:UITextField, errorLabel:UILabel? = nil, rules:[Rule]) {
validations[textField] = ValidationRule(textField: textField, rules:rules, errorLabel:errorLabel)
public func registerField(field: ValidatableField, errorLabel:UILabel? = nil, rules:[Rule]) {
validations[field] = ValidationRule(field: field, rules:rules, errorLabel:errorLabel)
fields[field] = field
}
/**
This method is for removing a field validator.
- parameter textField: field used to locate and remove textField from validator.
- parameter field: field used to locate and remove field from validator.
- returns: No return value
*/
public func unregisterField(textField:UITextField) {
validations.removeValueForKey(textField)
errors.removeValueForKey(textField)
public func unregisterField(field:ValidatableField) {
validations.removeValueForKey(field)
errors.removeValueForKey(field)
}
/**
@ -131,7 +134,7 @@ public class Validator {
if errors.isEmpty {
delegate.validationSuccessful()
} else {
delegate.validationFailed(errors)
delegate.validationFailed(errors.map { (fields[$1.field]!, $1) })
}
}
@ -139,13 +142,13 @@ public class Validator {
/**
This method validates all fields in validator and sets any errors to errors parameter of callback.
- parameter callback: A closure which is called with errors, a dictionary of type UITextField:ValidationError.
- parameter callback: A closure which is called with errors, a dictionary of type Validatable:ValidationError.
- returns: No return value.
*/
public func validate(callback:(errors:[UITextField:ValidationError])->Void) -> Void {
public func validate(callback:(errors:[(Validatable, ValidationError)])->Void) -> Void {
self.validateAllFields()
callback(errors: errors)
callback(errors: errors.map { (fields[$1.field]!, $1) } )
}
}

45
SwiftValidator/Core/ValidatorDictionary.swift Normal file
View File

@ -0,0 +1,45 @@
//
// ValidatorDictionary.swift
// Validator
//
// Created by Deniz Adalar on 04/05/16.
// Copyright © 2016 jpotts18. All rights reserved.
//
import Foundation
public struct ValidatorDictionary<T> : SequenceType {
private var innerDictionary: [ObjectIdentifier: T] = [:];
public subscript(key: ValidatableField?) -> T? {
get {
if let key = key {
return innerDictionary[ObjectIdentifier(key)];
} else {
return nil;
}
}
set(newValue) {
if let key = key {
innerDictionary[ObjectIdentifier(key)] = newValue;
}
}
}
public mutating func removeAll() {
innerDictionary.removeAll()
}
public mutating func removeValueForKey(key: ValidatableField) {
innerDictionary.removeValueForKey(ObjectIdentifier(key))
}
public var isEmpty: Bool {
return innerDictionary.isEmpty
}
public func generate() -> DictionaryGenerator<ObjectIdentifier ,T> {
return innerDictionary.generate()
}
}

2
SwiftValidator/Rules/CharacterSetRule.swift
View File

@ -45,7 +45,7 @@ public class CharacterSetRule: Rule {
}
/**
Displays error message when text field fails validation.
Displays error message when field fails validation.
- returns: String of error message.
*/

18
SwiftValidator/Rules/ConfirmRule.swift
View File

@ -10,35 +10,35 @@ import Foundation
import UIKit
/**
`ConfirmationRule` is a subclass of Rule that defines how a text field that has to be equal
to another text field is validated.
`ConfirmationRule` is a subclass of Rule that defines how a field that has to be equal
to another field is validated.
*/
public class ConfirmationRule: Rule {
/// parameter confirmField: text field to which original text field will be compared to.
private let confirmField: UITextField
/// parameter confirmField: field to which original text field will be compared to.
private let confirmField: ValidatableField
/// parameter message: String of error message.
private var message : String
/**
Initializes a `ConfirmationRule` object to validate the text of a text field that should equal the text of another text field.
Initializes a `ConfirmationRule` object to validate the text of a field that should equal the text of another field.
- parameter confirmField: text field to which original text field will be compared to.
- parameter confirmField: field to which original field will be compared to.
- parameter message: String of error message.
- returns: An initialized object, or nil if an object could not be created for some reason that would not result in an exception.
*/
public init(confirmField: UITextField, message : String = "This field does not match"){
public init(confirmField: ValidatableField, message : String = "This field does not match"){
self.confirmField = confirmField
self.message = message
}
/**
Used to validate a text field.
Used to validate a field.
- parameter value: String to checked for validation.
- returns: A boolean value. True if validation is successful; False if validation fails.
*/
public func validate(value: String) -> Bool {
return confirmField.text == value
return confirmField.validationText == value
}
/**

2
SwiftValidator/Rules/EmailRule.swift
View File

@ -16,7 +16,7 @@ public class EmailRule: RegexRule {
static let regex = "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}"
/**
Initializes an `EmailRule` object to validate an email text field.
Initializes an `EmailRule` object to validate an email field.
- parameter message: String of error message.
- returns: An initialized object, or nil if an object could not be created for some reason that would not result in an exception.

8
SwiftValidator/Rules/ExactLengthRule.swift
View File

@ -9,7 +9,7 @@
import Foundation
/**
`ExactLengthRule` is a subclass of Rule that is used to make sure a the text of a text field is an exact length.
`ExactLengthRule` is a subclass of Rule that is used to make sure a the text of a field is an exact length.
*/
public class ExactLengthRule : Rule {
/// parameter message: String of error message.
@ -18,7 +18,7 @@ public class ExactLengthRule : Rule {
private var length : Int
/**
Initializes an `ExactLengthRule` object to validate the text of a text field against an exact length.
Initializes an `ExactLengthRule` object to validate the text of a field against an exact length.
- parameter length: Integer value of exact string length being specified.
- parameter message: String of error message.
@ -30,7 +30,7 @@ public class ExactLengthRule : Rule {
}
/**
Used to validate a text field.
Used to validate a field.
- parameter value: String to checked for validation.
- returns: A boolean value. True if validation is successful; False if validation fails.
@ -40,7 +40,7 @@ public class ExactLengthRule : Rule {
}
/**
Displays error message if a text field fails validation.
Displays error message if a field fails validation.
- returns: String of error message.
*/

6
SwiftValidator/Rules/FloatRule.swift
View File

@ -16,7 +16,7 @@ public class FloatRule:Rule {
private var message : String
/**
Initializes a `FloatRule` object to validate that the text of a text field is a floating point number.
Initializes a `FloatRule` object to validate that the text of a field is a floating point number.
- parameter message: String of error message.
- returns: An initialized object, or nil if an object could not be created for some reason that would not result in an exception.
@ -26,7 +26,7 @@ public class FloatRule:Rule {
}
/**
Used to validate text field.
Used to validate field.
- parameter value: String to checked for validation.
- returns: Boolean value. True if validation is successful; False if validation fails.
@ -41,7 +41,7 @@ public class FloatRule:Rule {
}
/**
Displays error message when text field fails validation.
Displays error message when field fails validation.
- returns: String of error message.
*/

6
SwiftValidator/Rules/FullNameRule.swift
View File

@ -15,7 +15,7 @@ public class FullNameRule : Rule {
private var message : String
/**
Initializes a `FullNameRule` object that is used to verify that text in text field is a full name.
Initializes a `FullNameRule` object that is used to verify that text in field is a full name.
- parameter message: String of error message.
- returns: An initialized `FullNameRule` object, or nil if an object could not be created for some reason that would not result in an exception.
@ -25,7 +25,7 @@ public class FullNameRule : Rule {
}
/**
Used to validate a text field.
Used to validate a field.
- parameter value: String to checked for validation.
- returns: A boolean value. True if validation is successful; False if validation fails.
@ -36,7 +36,7 @@ public class FullNameRule : Rule {
}
/**
Used to display error message of a text field that has failed validation.
Used to display error message of a field that has failed validation.
- returns: String of error message.
*/

4
SwiftValidator/Rules/ISBNRule.swift
View File

@ -27,7 +27,7 @@ public class ISBNRule: Rule {
}
/**
Method used to validate text field.
Method used to validate field.
- parameter value: String to checked for validation.
- returns: Boolean value. True if validation is successful; False if validation fails.
@ -44,7 +44,7 @@ public class ISBNRule: Rule {
}
/**
Method used to dispaly error message when text field fails validation.
Method used to dispaly error message when field fails validation.
- returns: String of error message.
*/

6
SwiftValidator/Rules/MaxLengthRule.swift
View File

@ -19,7 +19,7 @@ public class MaxLengthRule: Rule {
public init(){}
/**
Initializes a `MaxLengthRule` object that is to validate the length of the text of a text field.
Initializes a `MaxLengthRule` object that is to validate the length of the text of a field.
- parameter length: Maximum character length.
- parameter message: String of error message.
@ -31,7 +31,7 @@ public class MaxLengthRule: Rule {
}
/**
Used to validate a text field.
Used to validate a field.
- parameter value: String to checked for validation.
- returns: A boolean value. True if validation is successful; False if validation fails.
@ -41,7 +41,7 @@ public class MaxLengthRule: Rule {
}
/**
Displays an error message if a text field fails validation.
Displays an error message if a field fails validation.
- returns: String of error message.
*/

6
SwiftValidator/Rules/MinLengthRule.swift
View File

@ -21,7 +21,7 @@ public class MinLengthRule: Rule {
public init(){}
/**
Initializes a `MaxLengthRule` object that is to validate the length of the text of a text field.
Initializes a `MaxLengthRule` object that is to validate the length of the text of a field.
- parameter length: Minimum character length.
- parameter message: String of error message.
@ -33,7 +33,7 @@ public class MinLengthRule: Rule {
}
/**
Validates a text field.
Validates a field.
- parameter value: String to checked for validation.
- returns: A boolean value. True if validation is successful; False if validation fails.
*/
@ -42,7 +42,7 @@ public class MinLengthRule: Rule {
}
/**
Displays error message when text field has failed validation.
Displays error message when field has failed validation.
- returns: String of error message.
*/

2
SwiftValidator/Rules/PasswordRule.swift
View File

@ -24,7 +24,7 @@ public class PasswordRule : RegexRule {
static let regex = "^(?=.*?[A-Z]).{8,}$"
/**
Initializes a `PasswordRule` object that will validate a text field is a valid password.
Initializes a `PasswordRule` object that will validate a field is a valid password.
- parameter message: String of error message.
- returns: An initialized `PasswordRule` object, or nil if an object could not be created for some reason that would not result in an exception.

4
SwiftValidator/Rules/RegexRule.swift
View File

@ -30,7 +30,7 @@ public class RegexRule : Rule {
}
/**
Method used to validate text field.
Method used to validate field.
- parameter value: String to checked for validation.
- returns: Boolean value. True if validation is successful; False if validation fails.
@ -41,7 +41,7 @@ public class RegexRule : Rule {
}
/**
Method used to dispaly error message when text field fails validation.
Method used to dispaly error message when field fails validation.
- returns: String of error message.
*/

4
SwiftValidator/Rules/RequiredRule.swift
View File

@ -9,7 +9,7 @@
import Foundation
/**
`RequiredRule` is a subclass of Rule that defines how a required text field is validated.
`RequiredRule` is a subclass of Rule that defines how a required field is validated.
*/
public class RequiredRule: Rule {
/// String that holds error message.
@ -26,7 +26,7 @@ public class RequiredRule: Rule {
}
/**
Validates a text field.
Validates a field.
- parameter value: String to checked for validation.
- returns: Boolean value. True if validation is successful; False if validation fails.

4
SwiftValidator/Rules/Rule.swift
View File

@ -12,14 +12,14 @@ import Foundation
*/
public protocol Rule {
/**
Validates text of a text field.
Validates text of a field.
- parameter value: String of text to be validated.
- returns: Boolean value. True if validation is successful; False if validation fails.
*/
func validate(value: String) -> Bool
/**
Displays error message of a text field that has failed validation.
Displays error message of a field that has failed validation.
- returns: String of error message.
*/

25
SwiftValidator/Rules/ValidationRule.swift
View File

@ -9,36 +9,37 @@ import Foundation
import UIKit
/**
`ValidationRule` is a class that creates an object which holds validation info of a text field.
`ValidationRule` is a class that creates an object which holds validation info of a field.
*/
public class ValidationRule {
/// the text field of the field
public var textField:UITextField
/// the field of the field
public var field:ValidatableField
/// the errorLabel of the field
public var errorLabel:UILabel?
/// the rules of the field
public var rules:[Rule] = []
/**
Initializes `ValidationRule` instance with text field, rules, and errorLabel.
Initializes `ValidationRule` instance with field, rules, and errorLabel.
- parameter textField: text field that holds actual text in text field.
- parameter errorLabel: label that holds error label of text field.
- parameter rules: array of Rule objects, which text field will be validated against.
- parameter field: field that holds actual text in field.
- parameter errorLabel: label that holds error label of field.
- parameter rules: array of Rule objects, which field will be validated against.
- returns: An initialized `ValidationRule` object, or nil if an object could not be created for some reason that would not result in an exception.
*/
public init(textField: UITextField, rules:[Rule], errorLabel:UILabel?){
self.textField = textField
public init(field: ValidatableField, rules:[Rule], errorLabel:UILabel?){
self.field = field
self.errorLabel = errorLabel
self.rules = rules
}
/**
Used to validate text field against its validation rules.
Used to validate field against its validation rules.
- returns: `ValidationError` object if at least one error is found. Nil is returned if there are no validation errors.
*/
public func validateField() -> ValidationError? {
return rules.filter{ !$0.validate(self.textField.text ?? "") }
.map{ rule -> ValidationError in return ValidationError(textField: self.textField, errorLabel:self.errorLabel, error: rule.errorMessage()) }.first
return rules.filter{
return !$0.validate(field.validationText ?? "")
}.map{ rule -> ValidationError in return ValidationError(field: self.field, errorLabel:self.errorLabel, error: rule.errorMessage()) }.first
}
}

10
Validator.xcodeproj/project.pbxproj
View File

@ -12,7 +12,7 @@
62D1AE221A1E6D4400E4DFF8 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 62D1AE201A1E6D4400E4DFF8 /* Main.storyboard */; };
62D1AE241A1E6D4400E4DFF8 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 62D1AE231A1E6D4400E4DFF8 /* Images.xcassets */; };
62D1AE271A1E6D4400E4DFF8 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 62D1AE251A1E6D4400E4DFF8 /* LaunchScreen.xib */; };
62D9B2561C7C0B2A00BAFCE3 /* ValidationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62D9B2551C7C0B2A00BAFCE3 /* ValidationDelegate.swift */; settings = {ASSET_TAGS = (); }; };
62D9B2561C7C0B2A00BAFCE3 /* ValidationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62D9B2551C7C0B2A00BAFCE3 /* ValidationDelegate.swift */; };
7CC1E4CF1C636B4500AF013C /* AlphaRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CC1E4CE1C636B4500AF013C /* AlphaRule.swift */; };
7CC1E4D11C637A7700AF013C /* AlphaNumericRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CC1E4D01C637A7700AF013C /* AlphaNumericRule.swift */; };
7CC1E4D31C637ABC00AF013C /* CharacterSetRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CC1E4D21C637ABC00AF013C /* CharacterSetRule.swift */; };
@ -40,6 +40,8 @@
FB465CFF1B9889EA00398388 /* ZipCodeRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB465CEF1B9889EA00398388 /* ZipCodeRule.swift */; };
FB465D001B9889EA00398388 /* ValidationError.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB465CF11B9889EA00398388 /* ValidationError.swift */; };
FB465D011B9889EA00398388 /* Validator.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB465CF21B9889EA00398388 /* Validator.swift */; };
FB51E5B01CD208B8004DE696 /* Validatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB51E5AF1CD208B8004DE696 /* Validatable.swift */; };
FBA963631CDA10130071F03E /* ValidatorDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = FBA963621CDA10130071F03E /* ValidatorDictionary.swift */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -126,6 +128,8 @@
FB465CEF1B9889EA00398388 /* ZipCodeRule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZipCodeRule.swift; sourceTree = "<group>"; };
FB465CF11B9889EA00398388 /* ValidationError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ValidationError.swift; sourceTree = "<group>"; };
FB465CF21B9889EA00398388 /* Validator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Validator.swift; sourceTree = "<group>"; };
FB51E5AF1CD208B8004DE696 /* Validatable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Validatable.swift; sourceTree = "<group>"; };
FBA963621CDA10130071F03E /* ValidatorDictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ValidatorDictionary.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -290,6 +294,8 @@
62D9B2551C7C0B2A00BAFCE3 /* ValidationDelegate.swift */,
FB465CF11B9889EA00398388 /* ValidationError.swift */,
FB465CF21B9889EA00398388 /* Validator.swift */,
FB51E5AF1CD208B8004DE696 /* Validatable.swift */,
FBA963621CDA10130071F03E /* ValidatorDictionary.swift */,
);
path = Core;
sourceTree = "<group>";
@ -487,6 +493,7 @@
files = (
FB465CF41B9889EA00398388 /* EmailRule.swift in Sources */,
FB465CF61B9889EA00398388 /* FullNameRule.swift in Sources */,
FBA963631CDA10130071F03E /* ValidatorDictionary.swift in Sources */,
FB465CFF1B9889EA00398388 /* ZipCodeRule.swift in Sources */,
FB465CF91B9889EA00398388 /* PasswordRule.swift in Sources */,
7CC1E4D11C637A7700AF013C /* AlphaNumericRule.swift in Sources */,
@ -498,6 +505,7 @@
FB465D011B9889EA00398388 /* Validator.swift in Sources */,
FB465CFE1B9889EA00398388 /* ValidationRule.swift in Sources */,
FB465CF31B9889EA00398388 /* ConfirmRule.swift in Sources */,
FB51E5B01CD208B8004DE696 /* Validatable.swift in Sources */,
7CC1E4D51C637C8500AF013C /* IPV4Rule.swift in Sources */,
7CC1E4D71C637F6E00AF013C /* ISBNRule.swift in Sources */,
FB465D001B9889EA00398388 /* ValidationError.swift in Sources */,

30
Validator/ViewController.swift
View File

@ -35,18 +35,22 @@ class ViewController: UIViewController , ValidationDelegate, UITextFieldDelegate
validator.styleTransformers(success:{ (validationRule) -> Void in
print("here")
// clear error label
validationRule.errorLabel?.hidden = true
validationRule.errorLabel?.text = ""
validationRule.textField.layer.borderColor = UIColor.greenColor().CGColor
validationRule.textField.layer.borderWidth = 0.5
}, error:{ (validationError) -> Void in
print("error")
validationError.errorLabel?.hidden = false
validationError.errorLabel?.text = validationError.errorMessage
validationError.textField.layer.borderColor = UIColor.redColor().CGColor
validationError.textField.layer.borderWidth = 1.0
// clear error label
validationRule.errorLabel?.hidden = true
validationRule.errorLabel?.text = ""
if let textField = validationRule.field as? UITextField {
textField.layer.borderColor = UIColor.greenColor().CGColor
textField.layer.borderWidth = 0.5
}
}, error:{ (validationError) -> Void in
print("error")
validationError.errorLabel?.hidden = false
validationError.errorLabel?.text = validationError.errorMessage
if let textField = validationError.field as? UITextField {
textField.layer.borderColor = UIColor.redColor().CGColor
textField.layer.borderWidth = 1.0
}
})
validator.registerField(fullNameTextField, errorLabel: fullNameErrorLabel , rules: [RequiredRule(), FullNameRule()])
@ -71,7 +75,7 @@ class ViewController: UIViewController , ValidationDelegate, UITextFieldDelegate
self.presentViewController(alert, animated: true, completion: nil)
}
func validationFailed(errors:[UITextField:ValidationError]) {
func validationFailed(errors:[(Validatable, ValidationError)]) {
print("Validation FAILED!")
}