Error fields auto-set error messages if given, can specify a different text field border color, can have the validator add the colored border to errored text fields

Author: cameronmccord2

Validator/Validator.swift

@@ -18,6 +18,8 @@ public class Validator {
     // dictionary to handle complex view hierarchies like dynamic tableview cells
     public var errors:[UITextField:ValidationError] = [:]
     public var validations:[UITextField:ValidationRule] = [:]
+    public var markTextFieldsInError:Bool = false
+    public var textFieldErrorColor:UIColor = UIColor.redColor()
 
     public init(){}
 
@@ -36,17 +38,28 @@ public class Validator {
         errors.removeValueForKey(textField)
     }
 
+    private func markTextFieldAsInError(field:UITextField) {
+        field.layer.borderColor = self.textFieldErrorColor.CGColor
+        field.layer.borderWidth = 1.0
+    }
+    
     public func validate(delegate:ValidationDelegate) {
 
         for field in validations.keys {
             if let currentRule: ValidationRule = validations[field] {
                 if var error: ValidationError = currentRule.validateField() {
-                    if currentRule.errorLabel != nil {
-                        error.errorLabel = currentRule.errorLabel
+                    if let errorLabel = currentRule.errorLabel {
+                        errorLabel.text = error.errorMessage
+                    }
+                    if markTextFieldsInError {
+                        self.markTextFieldAsInError(field)
                     }
                     errors[field] = error
                 } else {
                     errors.removeValueForKey(field)
+                    if let errorLabel = currentRule.errorLabel {
+                        errorLabel.text = nil
+                    }
                 }
             }
         }
@@ -63,9 +76,18 @@ public class Validator {
         for field in validations.keys {
             if let currentRule:ValidationRule = validations[field] {
                 if var error:ValidationError = currentRule.validateField() {
+                    if let errorLabel = currentRule.errorLabel {
+                        errorLabel.text = error.errorMessage
+                    }
+                    if markTextFieldsInError {
+                        self.markTextFieldAsInError(field)
+                    }
                     errors[field] = error
                 } else {
                     errors.removeValueForKey(field)
+                    if let errorLabel = currentRule.errorLabel {
+                        errorLabel.text = nil
+                    }
                 }
             }
         }

ValidatorTests/ValidatorTests.swift

@@ -42,6 +42,8 @@ class ValidatorTests: XCTestCase {
     let UNREGISTER_ERRORS_TXT_FIELD = UITextField()
     let UNREGISTER_ERRORS_VALIDATOR = Validator()
 
+    let ERROR_LABEL = UILabel()
+    
     override func setUp() {
         super.setUp()
         // Put setup code here. This method is called before the invocation of each test method in the class.
@@ -193,4 +195,47 @@ class ValidatorTests: XCTestCase {
             XCTAssert(errors.count == 1, "Should come back with 1 error")
         }
     }
+    
+    // MARK: Validate error field gets it's text set to the error, if supplied
+    
+    func testNoErrorMessageSet() {
+        REGISTER_VALIDATOR.registerField(REGISTER_TXT_FIELD, errorLabel: ERROR_LABEL, rules: [EmailRule()])
+        REGISTER_TXT_FIELD.text = VALID_EMAIL
+        REGISTER_VALIDATOR.validate { (errors) -> Void in
+            XCTAssert(errors.count == 0, "Should not come back with errors")
+            XCTAssert(self.ERROR_LABEL.text == nil, "Shouldn't have an error message on the label")
+        }
+    }
+    
+    func testErrorMessageSet() {
+        REGISTER_VALIDATOR.registerField(REGISTER_TXT_FIELD, errorLabel: ERROR_LABEL, rules: [EmailRule()])
+        REGISTER_TXT_FIELD.text = INVALID_EMAIL
+        REGISTER_VALIDATOR.validate { (errors) -> Void in
+            XCTAssert(errors.count == 1, "Should come back with errors")
+            if let errorText = self.ERROR_LABEL.text {
+                XCTAssert(errorText == errors[self.REGISTER_TXT_FIELD]!.errorMessage, "Shouldn't have an error message on the label, got: \(self.ERROR_LABEL.text!), expected: \(errors[self.REGISTER_TXT_FIELD]!.errorMessage)")
+            }else{
+                XCTAssert(false, "Error label should have text, not nil")
+            }
+        }
+    }
+    
+    func testErrorMessageSetAndThenUnset() {
+        REGISTER_VALIDATOR.registerField(REGISTER_TXT_FIELD, errorLabel: ERROR_LABEL, rules: [EmailRule()])
+        REGISTER_TXT_FIELD.text = INVALID_EMAIL
+        REGISTER_VALIDATOR.validate { (errors) -> Void in
+            XCTAssert(errors.count == 1, "Should come back with errors")
+            if let errorText = self.ERROR_LABEL.text {
+                XCTAssert(errorText == errors[self.REGISTER_TXT_FIELD]!.errorMessage, "Shouldn't have an error message on the label, got: \(self.ERROR_LABEL.text!), expected: \(errors[self.REGISTER_TXT_FIELD]!.errorMessage)")
+                
+                self.REGISTER_TXT_FIELD.text = self.VALID_EMAIL
+                self.REGISTER_VALIDATOR.validate { (errors) -> Void in
+                    XCTAssert(errors.count == 0, "Should not come back with errors")
+                    XCTAssert(self.ERROR_LABEL.text == nil, "Shouldn't have an error message on the label")
+                }
+            }else{
+                XCTAssert(false, "Error label should have text, not nil")
+            }
+        }
+    }
 }