From 00e8db0ce286b6127583285b3544dc22ae7272c1 Mon Sep 17 00:00:00 2001
From: Jeff Potter <jeff.potter6@gmail.com>
Date: Mon, 30 Mar 2015 15:59:40 -0600
Subject: [PATCH] refactoring validate methods for regex rules

---
 Validator/EmailRule.swift    | 8 ++------
 Validator/PasswordRule.swift | 6 +-----
 Validator/ZipCodeRule.swift  | 7 ++-----
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/Validator/EmailRule.swift b/Validator/EmailRule.swift
index 0fe027b..1d7f1bd 100644
--- a/Validator/EmailRule.swift
+++ b/Validator/EmailRule.swift
@@ -10,7 +10,7 @@ import Foundation
 
 class EmailRule: Rule {
     
-    var REGEX : String
+    private let REGEX: String
     
     init(){
         self.REGEX = "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,6}"
@@ -21,11 +21,7 @@ class EmailRule: Rule {
     }
     
     func validate(value: String) -> Bool {
-        let test = NSPredicate(format: "SELF MATCHES \(self.REGEX)")
-        if test.evaluateWithObject(value) {
-            return true
-        }
-        return false
+        return NSPredicate(format: "SELF MATCHES %@", self.REGEX).evaluateWithObject(value)
     }
     
     func errorMessage() -> String {
diff --git a/Validator/PasswordRule.swift b/Validator/PasswordRule.swift
index a237660..122860d 100644
--- a/Validator/PasswordRule.swift
+++ b/Validator/PasswordRule.swift
@@ -31,11 +31,7 @@ class PasswordRule : Rule {
     }
     
     func validate(value: String) -> Bool {
-        let test = NSPredicate(format: "SELF MATCHES \(self.REGEX)")
-        if test.evaluateWithObject(value) {
-            return true
-        }
-        return false
+        return NSPredicate(format: "SELF MATCHES %@", self.REGEX).evaluateWithObject(value)
     }
     
     func errorMessage() -> String {
diff --git a/Validator/ZipCodeRule.swift b/Validator/ZipCodeRule.swift
index 672c8e9..618d3cd 100644
--- a/Validator/ZipCodeRule.swift
+++ b/Validator/ZipCodeRule.swift
@@ -9,6 +9,7 @@
 import Foundation
 
 class ZipCodeRule: Rule {
+    
     private let REGEX: String
     
     init(){
@@ -19,11 +20,7 @@ class ZipCodeRule: Rule {
     }
     
     func validate(value: String) -> Bool {
-        let test = NSPredicate(format: "SELF MATCHES \(self.REGEX)")
-        if test.evaluateWithObject(value) {
-            return true
-        }
-        return false
+        return NSPredicate(format: "SELF MATCHES %@", self.REGEX).evaluateWithObject(value)
     }
     
     func errorMessage() -> String {