Merge branch 'jozsef-vesza-include-cbz'

Zip/Zip.swift

@@ -66,7 +66,7 @@ public class Zip {
         guard let path = zipFilePath.path where destination.path != nil else {
             throw ZipError.FileNotFound
         }
-        if fileManager.fileExistsAtPath(path) == false || zipFilePath.pathExtension != "zip" {
+        if fileManager.fileExistsAtPath(path) == false || fileExtensionIsInvalid(zipFilePath.pathExtension) {
             throw ZipError.FileNotFound
         }
         
@@ -303,6 +303,18 @@ public class Zip {
         progressTracker.completedUnitCount = Int64(totalSize)
     }
     
+    /**
+     Check if file extension is invalid.
+     
+     - parameter fileExtension: A file extension.
+     
+     - returns: false if the extension is "zip" or "cbz", otherwise true.
+     */
+    internal class func fileExtensionIsInvalid(fileExtension: String?) -> Bool {
+        
+        guard let fileExtension = fileExtension else { return true }
         
+        return !["zip", "cbz"].contains(fileExtension)
+    }
     
 }
\ No newline at end of file

ZipTests/ZipTests.swift

@@ -209,5 +209,15 @@ class ZipTests: XCTestCase {
         }
     }
 
+    func testFileExtensionIsInvalidForValidUrl() {
+        let fileUrl = NSURL(string: "file.cbz")
+        let result = Zip.fileExtensionIsInvalid(fileUrl?.pathExtension)
+        XCTAssertFalse(result)
+    }
     
+    func testFileExtensionIsInvalidForInvalidUrl() {
+        let fileUrl = NSURL(string: "file.xyz")
+        let result = Zip.fileExtensionIsInvalid(fileUrl?.pathExtension)
+        XCTAssertTrue(result)
+    }
 }