Merge pull request #13 from dtop/feature/RC1.0

feature/rc1.0

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Version History
 
+### Version 1.0.0
+
+- cleaned the code a little
+
 ### Version 0.0.9
 
 - fixed bugs within the generic iterators (thanks @jpaas)

SwiftValidate.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "SwiftValidate"
-  s.version      = "0.0.9"
+  s.version      = "1.0.0"
   s.summary      = "A highly customizable validation library for swift"
   s.homepage     = "http://github.com/dtop/SwiftValidate"
   s.license      = "MIT"

validate/Validators/ValidatorBetween.swift

@@ -44,8 +44,7 @@ public class ValidatorBetween<TYPE: SignedNumberType>: ValidatorProtocol, Valida
 
     // MARK: comparision closures
 
-    private let compareExclusive = { (alpha: TYPE, bravo: TYPE ) -> Bool in return alpha > bravo }
-    private let compareInclusive = { (alpha: TYPE, bravo: TYPE ) -> Bool in return alpha >= bravo }
+    private let comparator = { (alpha: TYPE, bravo: TYPE, comp: (TYPE, TYPE) -> Bool) -> Bool in return comp(alpha, bravo) }
 
     // MARK: methods
 
@@ -90,8 +89,8 @@ public class ValidatorBetween<TYPE: SignedNumberType>: ValidatorProtocol, Valida
 
         if let myNum: TYPE = value as? TYPE {
 
-            let leftOk = (self.minInclusive) ? self.compareInclusive(myNum, self.minValue) : self.compareExclusive(myNum, self.minValue)
-            let rightOk = (self.maxInclusive) ? self.compareInclusive(self.maxValue, myNum) : self.compareExclusive(self.maxValue, myNum)
+            let leftOk = (self.minInclusive) ? self.comparator(myNum, self.minValue, >=) : self.comparator(myNum, self.minValue, >)
+            let rightOk = (self.maxInclusive) ? self.comparator(myNum, self.maxValue, <=) : self.comparator(myNum, self.maxValue, <)
 
             if leftOk && rightOk {
                 return true

validate/Validators/ValidatorGreaterThan.swift

@@ -35,8 +35,7 @@ public class ValidatorGreaterThan<TYPE: SignedNumberType>: ValidatorProtocol, Va
 
     //MARK: comparision functions
 
-    private let compareExclusive = { (alpha: TYPE, bravo: TYPE ) -> Bool in return alpha > bravo }
-    private let compareInclusive = { (alpha: TYPE, bravo: TYPE ) -> Bool in return alpha >= bravo }
+    private let comparator = { (alpha: TYPE, bravo: TYPE, comp: (TYPE, TYPE) -> Bool) -> Bool in return comp(alpha, bravo) }
 
     //MARK: methods
 
@@ -116,7 +115,8 @@ public class ValidatorGreaterThan<TYPE: SignedNumberType>: ValidatorProtocol, Va
      */
     private func compareAsNumber(value: TYPE) -> Bool {
 
-        let result = (self.inclusive) ? self.compareInclusive(value, self.min) : self.compareExclusive(value, self.min)
+        let result = (self.inclusive) ? self.comparator(value, self.min, >=) : self.comparator(value, self.min, >)
+
         if !result {
 
             self._err.append(String(format: self.errorMessageNotGreaterThan, String(self.min)))

validate/Validators/ValidatorSmallerThan.swift

@@ -35,8 +35,7 @@ public class ValidatorSmallerThan<TYPE: SignedNumberType>: ValidatorProtocol, Va
 
     //MARK: comparision functions
 
-    private let compareExclusive = { (alpha: TYPE, bravo: TYPE ) -> Bool in return alpha > bravo }
-    private let compareInclusive = { (alpha: TYPE, bravo: TYPE ) -> Bool in return alpha >= bravo }
+    private let comparator = { (alpha: TYPE, bravo: TYPE, comp: (TYPE, TYPE) -> Bool) -> Bool in return comp(alpha, bravo) }
 
     //MARK: methods
 
@@ -116,7 +115,8 @@ public class ValidatorSmallerThan<TYPE: SignedNumberType>: ValidatorProtocol, Va
      */
     private func compareAsNumber(value: TYPE) -> Bool {
 
-        let result = (self.inclusive) ? self.compareInclusive(self.max, value) : self.compareExclusive(self.max, value)
+        let result = (self.inclusive) ? self.comparator(value, self.max, <=) : self.comparator(value, self.max, <)
+
         if !result {
 
             self._err.append(String(format: self.errorMessageNotSmallerThan, String(self.max)))