Merge pull request #10 from asotog/master

Cocoapods and swift 1.1 support

Author: jpotts18

Validator.podspec Swift-Validator.podspecValidator.podspec renamed to Swift-Validator.podspec

@@ -8,7 +8,6 @@ Pod::Spec.new do |s|
   s.author             = { "Jeff" => "jeff.potter6@gmail.com" }
   s.social_media_url   = "http://twitter.com/jpotts18"
   s.platform     = :ios
-  s.ios.deployment_target = '8.0'
   s.source       = { :git => "https://github.com/jpotts18/swift-validator.git", :tag => "2.0.1" }
   s.source_files  = "Validator/*.swift"
 end

Validator/EmailRule.swift

@@ -21,9 +21,10 @@ class EmailRule: Rule {
     }
 
     func validate(value: String) -> Bool {
-        let test = NSPredicate(format: "SELF MATCHES %@", self.REGEX)
-        if test.evaluateWithObject(value) {
-            return true
+        if let test = NSPredicate(format: "SELF MATCHES %@", self.REGEX) {
+            if test.evaluateWithObject(value) {
+                return true
+            }
         }
         return false
     }

Validator/MinLengthRule.swift

@@ -22,7 +22,7 @@ class MinLengthRule : Rule {
     }
 
     func validate(value: String) -> Bool {
-        if count(value) < DEFAULT_MIN_LENGTH {
+        if countElements(value) < DEFAULT_MIN_LENGTH {
             return false
         }
         return true

Validator/PasswordRule.swift

@@ -31,9 +31,10 @@ class PasswordRule : Rule {
     }
 
     func validate(value: String) -> Bool {
-        let test = NSPredicate(format: "SELF MATCHES %@", self.REGEX)
-        if test.evaluateWithObject(value) {
-            return true
+        if let test = NSPredicate(format: "SELF MATCHES %@", self.REGEX) {
+            if test.evaluateWithObject(value) {
+                return true
+            }
         }
         return false
     }

Validator/ZipCodeRule.swift

@@ -19,9 +19,10 @@ class ZipCodeRule: Rule {
     }
 
     func validate(value: String) -> Bool {
-        let test = NSPredicate(format: "SELF MATCHES %@", self.REGEX)
-        if test.evaluateWithObject(value) {
-            return true
+        if let test = NSPredicate(format: "SELF MATCHES %@", self.REGEX) {
+            if test.evaluateWithObject(value) {
+                return true
+            }
         }
         return false
     }