Merge pull request #40 from KVTaniguchi/refactorValidationRule

apply rules with map and filter
SwiftValidatorCommunity · Jul 21, 2015 · ca65096 · ca65096
2 parents dc9224c + b959029
commit ca65096
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/Validator/ValidationRule.swift b/Validator/ValidationRule.swift
@@ -21,11 +21,7 @@ public class ValidationRule {
     }
 
     public func validateField() -> ValidationError? {
-        for rule in rules {
-            if !rule.validate(textField.text) {
-                return ValidationError(textField: self.textField, errorLabel:self.errorLabel, error: rule.errorMessage())
-            }
-        }
-        return nil
+        return rules.filter{ !$0.validate(self.textField.text) }
+                    .map{ rule -> ValidationError in return ValidationError(textField: self.textField, errorLabel:self.errorLabel, error: rule.errorMessage()) }.first
     }
 }