Changed to passing in transform functions for your text fields

cameronmccord2 · cameronmccord2 · commit cc0089d90171 · 2015-05-06T11:31:49.000-06:00
diff --git a/Validator/ValidationError.swift b/Validator/ValidationError.swift
@@ -18,4 +18,10 @@ public class ValidationError {
         self.textField = textField
         self.errorMessage = error
     }
+    
+    public init(textField:UITextField, errorLabel:UILabel?, error:String){
+        self.textField = textField
+        self.errorLabel = errorLabel
+        self.errorMessage = error
+    }
 }
diff --git a/Validator/ValidationRule.swift b/Validator/ValidationRule.swift
@@ -23,7 +23,7 @@ public class ValidationRule {
     public func validateField() -> ValidationError? {
         for rule in rules {
             if !rule.validate(textField.text) {
-                return ValidationError(textField: self.textField, error: rule.errorMessage())
+                return ValidationError(textField: self.textField, errorLabel:self.errorLabel, error: rule.errorMessage())
             }
         }
         return nil
diff --git a/Validator/Validator.swift b/Validator/Validator.swift
@@ -18,12 +18,46 @@ 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 shouldMarkTextFieldsInError:Bool = false
+    private var successStyleTransform:((validationRule:ValidationRule)->Void)?
+    private var errorStyleTransform:((validationError:ValidationError)->Void)?
     
     public init(){}
     
+    // MARK: Private functions
+    
+    private func clearErrors() {
+        self.errors = [:]
+    }
+    
+    private func validateAllFields() {
+        
+        for field in validations.keys {
+            if let currentRule: ValidationRule = validations[field] {
+                if var error: ValidationError = currentRule.validateField() {
+                    errors[field] = error
+                    
+                    // let the user transform the field if they want
+                    if let transform = self.errorStyleTransform {
+                        transform(validationError: error)
+                    }
+                } else {
+                    // No error
+                    // let the user transform the field if they want
+                    if let transform = self.successStyleTransform {
+                        transform(validationRule: currentRule)
+                    }
+                }
+            }
+        }
+    }
+    
     // MARK: Using Keys
     
+    public func styleTransformers(#success:((validationRule:ValidationRule)->Void)?, #error:((validationError:ValidationError)->Void)?) {
+        self.successStyleTransform = success
+        self.errorStyleTransform = error
+    }
+    
     public func registerField(textField:UITextField, rules:[Rule]) {
         validations[textField] = ValidationRule(textField: textField, rules: rules, errorLabel: nil)
     }
@@ -37,39 +71,11 @@ public class Validator {
         errors.removeValueForKey(textField)
     }
     
-    private func markTextFieldAsInError(field:UITextField) {
-        field.layer.borderColor = UIColor.redColor().CGColor
-        field.layer.borderWidth = 1.0
-    }
-    
-    private func unmarkTextFieldAsInError(field:UITextField) {
-        field.layer.borderColor = UIColor.clearColor().CGColor
-        field.layer.borderWidth = 0.0
-    }
-    
     public func validate(delegate:ValidationDelegate) {
         
-        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 shouldMarkTextFieldsInError {
-                        self.markTextFieldAsInError(field)
-                    }
-                    errors[field] = error
-                } else {
-                    errors.removeValueForKey(field)
-                    if let errorLabel = currentRule.errorLabel {
-                        errorLabel.text = nil
-                    }
-                    if shouldMarkTextFieldsInError {
-                        self.unmarkTextFieldAsInError(field)
-                    }
-                }
-            }
-        }
+        self.clearErrors()
+        
+        self.validateAllFields()
         
         if errors.isEmpty {
             delegate.validationSuccessful()
@@ -80,32 +86,8 @@ public class Validator {
     
     public func validate(callback:(errors:[UITextField:ValidationError])->Void) -> Void {
         
-        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 shouldMarkTextFieldsInError {
-                        self.markTextFieldAsInError(field)
-                    }
-                    errors[field] = error
-                } else {
-                    errors.removeValueForKey(field)
-                    if let errorLabel = currentRule.errorLabel {
-                        errorLabel.text = nil
-                    }
-                    if shouldMarkTextFieldsInError {
-                        self.unmarkTextFieldAsInError(field)
-                    }
-                }
-            }
-        }
+        self.validateAllFields()
         
         callback(errors: errors)
     }
-    
-    func clearErrors() {
-        self.errors = [:]
-    }
 }
diff --git a/Validator/ViewController.swift b/Validator/ViewController.swift
@@ -33,6 +33,21 @@ class ViewController: UIViewController , ValidationDelegate, UITextFieldDelegate
         
         self.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: "hideKeyboard"))
         
+        validator.styleTransformers(success:{ (validationRule) -> Void in
+            println("here")
+                // clear error label
+                validationRule.errorLabel?.hidden = true
+                validationRule.textField.layer.borderColor = UIColor.clearColor().CGColor
+                validationRule.textField.layer.borderWidth = 0.0
+            
+            }, error:{ (validationError) -> Void in
+                println("error")
+                validationError.errorLabel?.hidden = false
+                validationError.errorLabel?.text = validationError.errorMessage
+                validationError.textField.layer.borderColor = UIColor.redColor().CGColor
+                validationError.textField.layer.borderWidth = 1.0
+        })
+        
         validator.registerField(fullNameTextField, errorLabel: fullNameErrorLabel , rules: [RequiredRule(), FullNameRule()])
         validator.registerField(emailTextField, errorLabel: emailErrorLabel, rules: [RequiredRule(), EmailRule()])
         validator.registerField(emailConfirmTextField, errorLabel: emailConfirmErrorLabel, rules: [RequiredRule(), ConfirmationRule(confirmField: emailTextField)])
@@ -42,7 +57,7 @@ class ViewController: UIViewController , ValidationDelegate, UITextFieldDelegate
 
     @IBAction func submitTapped(sender: AnyObject) {
         println("Validating...")
-        self.clearErrors()
+//        self.clearErrors()
         validator.validate(self)
     }
 
@@ -58,38 +73,38 @@ class ViewController: UIViewController , ValidationDelegate, UITextFieldDelegate
     }
     func validationFailed(errors:[UITextField:ValidationError]) {
         println("Validation FAILED!")
-        self.setErrors()
+//        self.setErrors()
     }
     
     // MARK: Error Styling
     
-    func removeError(label:UILabel, textField:UITextField) {
-        label.hidden = true
-        textField.layer.borderWidth = 0.0
-    }
+//    func removeError(label:UILabel, textField:UITextField) {
+//        label.hidden = true
+//        textField.layer.borderWidth = 0.0
+//    }
     
-    func removeAllErrors(){
-        removeError(fullNameErrorLabel, textField: fullNameTextField)
-        removeError(emailErrorLabel, textField: emailTextField)
-        removeError(phoneNumberErrorLabel, textField: phoneNumberTextField)
-        removeError(zipcodeErrorLabel, textField: zipcodeTextField)
-    }
+//    func removeAllErrors(){
+//        removeError(fullNameErrorLabel, textField: fullNameTextField)
+//        removeError(emailErrorLabel, textField: emailTextField)
+//        removeError(phoneNumberErrorLabel, textField: phoneNumberTextField)
+//        removeError(zipcodeErrorLabel, textField: zipcodeTextField)
+//    }
     
-    private func setErrors(){
-        for (field, error) in validator.errors {
-            field.layer.borderColor = UIColor.redColor().CGColor
-            field.layer.borderWidth = 1.0
-            error.errorLabel?.text = error.errorMessage
-            error.errorLabel?.hidden = false
-        }
-    }
+//    private func setErrors(){
+//        for (field, error) in validator.errors {
+//            field.layer.borderColor = UIColor.redColor().CGColor
+//            field.layer.borderWidth = 1.0
+//            error.errorLabel?.text = error.errorMessage
+//            error.errorLabel?.hidden = false
+//        }
+//    }
     
-    private func clearErrors(){
-        for (field, error) in validator.errors {
-            field.layer.borderWidth = 0.0
-            error.errorLabel?.hidden = true
-        }
-    }
+//    private func clearErrors(){
+//        for (field, error) in validator.errors {
+//            field.layer.borderWidth = 0.0
+//            error.errorLabel?.hidden = true
+//        }
+//    }
     
     func hideKeyboard(){
         self.view.endEditing(true)
diff --git a/ValidatorTests/ValidatorTests.swift b/ValidatorTests/ValidatorTests.swift
@@ -253,21 +253,21 @@ class ValidatorTests: XCTestCase {
         }
     }
     
-    func testTextFieldBorderColorSet() {
-        REGISTER_VALIDATOR.registerField(REGISTER_TXT_FIELD, errorLabel: ERROR_LABEL, rules: [EmailRule()])
-        REGISTER_TXT_FIELD.text = INVALID_EMAIL
-        REGISTER_VALIDATOR.shouldMarkTextFieldsInError = true
-        REGISTER_VALIDATOR.validate { (errors) -> Void in
-            XCTAssert(errors.count == 1, "Should come back with errors")
-            XCTAssert(CGColorEqualToColor(self.REGISTER_TXT_FIELD.layer.borderColor, UIColor.redColor().CGColor), "Color should be what it was set as")
-            
-            self.REGISTER_TXT_FIELD.text = self.VALID_EMAIL
-            self.REGISTER_VALIDATOR.validate { (errors) -> Void in
-                XCTAssert(errors.count == 0, "Should come back without errors")
-                XCTAssert(!CGColorEqualToColor(self.REGISTER_TXT_FIELD.layer.borderColor, UIColor.redColor().CGColor), "Color should be what it was set as")
-            }
-        }
-    }
+//    func testTextFieldBorderColorSet() {
+//        REGISTER_VALIDATOR.registerField(REGISTER_TXT_FIELD, errorLabel: ERROR_LABEL, rules: [EmailRule()])
+//        REGISTER_TXT_FIELD.text = INVALID_EMAIL
+//        REGISTER_VALIDATOR.shouldMarkTextFieldsInError = true
+//        REGISTER_VALIDATOR.validate { (errors) -> Void in
+//            XCTAssert(errors.count == 1, "Should come back with errors")
+//            XCTAssert(CGColorEqualToColor(self.REGISTER_TXT_FIELD.layer.borderColor, UIColor.redColor().CGColor), "Color should be what it was set as")
+//            
+//            self.REGISTER_TXT_FIELD.text = self.VALID_EMAIL
+//            self.REGISTER_VALIDATOR.validate { (errors) -> Void in
+//                XCTAssert(errors.count == 0, "Should come back without errors")
+//                XCTAssert(!CGColorEqualToColor(self.REGISTER_TXT_FIELD.layer.borderColor, UIColor.redColor().CGColor), "Color should be what it was set as")
+//            }
+//        }
+//    }
     
     func testTextFieldBorderColorNotSet() {
         REGISTER_VALIDATOR.registerField(REGISTER_TXT_FIELD, errorLabel: ERROR_LABEL, rules: [EmailRule()])

Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,10 @@ public class ValidationError {`
`18`	`18`	`self.textField = textField`
`19`	`19`	`self.errorMessage = error`
`20`	`20`	`}`
	`21`	`+`
	`22`	`+ public init(textField:UITextField, errorLabel:UILabel?, error:String){`
	`23`	`+ self.textField = textField`
	`24`	`+ self.errorLabel = errorLabel`
	`25`	`+ self.errorMessage = error`
	`26`	`+ }`
`21`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class ValidationRule {`
`23`	`23`	`public func validateField() -> ValidationError? {`
`24`	`24`	`for rule in rules {`
`25`	`25`	`if !rule.validate(textField.text) {`
`26`		`- return ValidationError(textField: self.textField, error: rule.errorMessage())`
	`26`	`+ return ValidationError(textField: self.textField, errorLabel:self.errorLabel, error: rule.errorMessage())`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`return nil`