Merge pull request #8 from gwjakewelton/fix-unzipping-sub-dir

Fix unzipping files within sub directory

Zip/Zip.swift

@@ -134,7 +134,8 @@ public class Zip {
                     try fileManager.createDirectoryAtPath(fullPath, withIntermediateDirectories: true, attributes: directoryAttributes)
                 }
                 else {
-                    try fileManager.createDirectoryAtPath(destinationPath, withIntermediateDirectories: true, attributes: directoryAttributes)
+                    let parentDirectory = (fullPath as NSString).stringByDeletingLastPathComponent
+                    try fileManager.createDirectoryAtPath(parentDirectory, withIntermediateDirectories: true, attributes: directoryAttributes)
                 }
             } catch {}
             if fileManager.fileExistsAtPath(fullPath) && !isDirectory && !overwrite {

ZipTests/ZipTests.swift

@@ -147,6 +147,23 @@ class ZipTests: XCTestCase {
             XCTFail()
         }
     }
+    
+    func testQuickUnzipSubDir() {
+        do {
+            let bookURL = NSBundle(forClass: ZipTests.self).URLForResource("bb8", withExtension: "zip")!
+            let unzipDestination = try Zip.quickUnzipFile(bookURL)
+            let fileManager = NSFileManager.defaultManager()
+            
+            let subDir = unzipDestination.URLByAppendingPathComponent("subDir")
+            let imageURL = subDir.URLByAppendingPathComponent("r2W9yu9").URLByAppendingPathExtension("gif")
+            
+            XCTAssertTrue(fileManager.fileExistsAtPath(unzipDestination.path!))
+            XCTAssertTrue(fileManager.fileExistsAtPath(subDir.path!))
+            XCTAssertTrue(fileManager.fileExistsAtPath(imageURL.path!))
+        } catch {
+            XCTFail()
+        }
+    }
 
 
 }