Version 0.3.0

Update readme
Restructure project and move to XCTest
2013-09-07 08:52:49 -07:00 · 2013-09-07 08:38:55 -07:00 · 2013-09-07 08:33:47 -07:00 · 2013-09-07 08:22:56 -07:00 · 2013-07-16 10:20:46 -04:00 · 2013-07-12 15:34:05 -07:00
39 changed files with 1474 additions and 823 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 *.perspectivev3
 *.xcworkspace
 xcuserdata
+DerivedData
--- a/Changelog.markdown
+++ b/Changelog.markdown
@@ -1,36 +0,0 @@
-# SSZipArchive Changelog
-
-### Version 0.2.1
-
-[Released May 9, 2012](https://github.com/samsoffes/sskeychain/tree/0.2.1)
-
-* Support for symbolic links — [@jparishy](http://github.com/jparishy)
-* Fix several warnings
-
-### Version 0.2.0
-
-[Released May 7, 2012](https://github.com/samsoffes/sskeychain/tree/0.2.0)
-
-* Add unzipping delegate — [@uppfinnarn](http://github.com/uppfinnarn)
-* Fix unzipping with passwords
-* Fix modified at dates — [@brantsears](http://github.com/brantsears)
-* Fix truncated files. Ignore the zip headers and unzip until there is no more file. — [@jparishy](http://github.com/jparishy)
-
-### Version 0.1.2
-
-[Released December 26, 2011](https://github.com/samsoffes/sskeychain/tree/0.1.2)
-
-* Add creation support. Thanks Johnnie Walker ([@randomsequence](https://github.com/randomsequence))!
-
-### Version 0.1.1
-
-[Released October 31, 2011](https://github.com/samsoffes/sskeychain/tree/0.1.1)
-
-* Added basic tests
-* Upgraded minizip to 1.1 to support zip64
-
-### Version 0.1.0
-
-[Released September 18, 2011](https://github.com/samsoffes/sskeychain/tree/0.1.0)
-
-* Initial release
--- a/Example/Classes/SSAppDelegate.h
+++ b/Example/Classes/SSAppDelegate.h
@@ -0,0 +1,13 @@
+//
+//  SSAppDelegate.h
+//  SSZipArchive
+//
+//  Created by Sam Soffes on 9/7/13.
+//  Copyright (c) 2013 Sam Soffes. All rights reserved.
+//
+
+@interface SSAppDelegate : UIResponder <UIApplicationDelegate>
+
+@property (strong, nonatomic) UIWindow *window;
+
+@end
--- a/Example/Classes/SSAppDelegate.m
+++ b/Example/Classes/SSAppDelegate.m
@@ -0,0 +1,22 @@
+//
+//  SSAppDelegate.m
+//  SSZipArchive
+//
+//  Created by Sam Soffes on 9/7/13.
+//  Copyright (c) 2013 Sam Soffes. All rights reserved.
+//
+
+#import "SSAppDelegate.h"
+
+@implementation SSAppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+    self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+
+	// Nothing to see here yet.
+
+    [self.window makeKeyAndVisible];
+    return YES;
+}
+
+@end
--- a/Sources/SSZipArchive-Prefix.pch
+++ b/Sources/SSZipArchive-Prefix.pch
@@ -0,0 +1,16 @@
+//
+//  Prefix header
+//
+//  The contents of this file are implicitly included at the beginning of every source file.
+//
+
+#import <Availability.h>
+
+#ifndef __IPHONE_3_0
+#warning "This project uses features only available in iOS SDK 3.0 and later."
+#endif
+
+#ifdef __OBJC__
+	#import <UIKit/UIKit.h>
+	#import <Foundation/Foundation.h>
+#endif
--- a/Sources/main.m
+++ b/Sources/main.m
@@ -0,0 +1,15 @@
+//
+//  main.m
+//  SSZipArchive
+//
+//  Created by Sam Soffes on 9/7/13.
+//  Copyright (c) 2013 Sam Soffes. All rights reserved.
+//
+
+#import "SSAppDelegate.h"
+
+int main(int argc, char * argv[]) {
+	@autoreleasepool {
+		return UIApplicationMain(argc, argv, nil, NSStringFromClass([SSAppDelegate class]));
+	}
+}
--- a/Example/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/Example/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,53 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Example/Resources/Images.xcassets/LaunchImage.launchimage/Contents.json
+++ b/Example/Resources/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -0,0 +1,51 @@
+{
+  "images" : [
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Example/Resources/SSZipArchive-Info.plist
+++ b/Example/Resources/SSZipArchive-Info.plist
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.samsoffes.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012 Sam Soffes
+Copyright (c) 2010-2013 Sam Soffes, http://soff.es

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/Readme.markdown
+++ b/Readme.markdown
@@ -8,14 +8,13 @@ SSZipArchive is a simple utility class for zipping and unzipping files. Features
 * Appending to zip files
 * Zipping files
 * Zipping NSData with a filename
-* Works in ARC and non-ARC projects

 ## Adding to your project

-1. Add `SSZipArchive.h`, `SSZipArchive.m`, and `minizip` to your project.
+1. Add the `SSZipArchive` folder to your project.
 2. Add the `libz` library to your target

-You don't need to do anything regarding ARC. SSZipArchive will detect if you're not using ARC and add the required memory management code.
+SSZipArchive requires ARC.

 ## Usage

@@ -34,6 +33,10 @@ NSArray *inputPaths = [NSArray arrayWithObjects:
 [SSZipArchive createZipFileAtPath:zippedPath withFilesAtPaths:inputPaths];
 ```

+## Tests
+
+Simply, open the Xcode 5 or higher project in the Tests directory and press Command-U to run the tests.
+
 ## License

 SSZipArchive is licensed under the [MIT license](https://github.com/samsoffes/ssziparchive/raw/master/LICENSE).  A slightly modified version of [Minizip](http://www.winimage.com/zLibDll/minizip.html) 1.1 is also included and is licensed under the [Zlib license](http://www.zlib.net/zlib_license.html).
--- a/SSZipArchive.m
+++ b/SSZipArchive.m
@@ -1,421 +0,0 @@
-//
-//  SSZipArchive.m
-//  SSZipArchive
-//
-//  Created by Sam Soffes on 7/21/10.
-//  Copyright (c) Sam Soffes 2010-2011. All rights reserved.
-//
-
-#import "SSZipArchive.h"
-#include "minizip/zip.h"
-#import "zlib.h"
-#import "zconf.h"
-
-#include <sys/stat.h>
-
-#define CHUNK 16384
-
-@interface SSZipArchive ()
-+ (NSDate *)_dateWithMSDOSFormat:(UInt32)msdosDateTime;
-@end
-
-
-@implementation SSZipArchive {
-	NSString *_path;
-	NSString *_filename;
-    zipFile _zip;
-}
-
-
-#pragma mark - Unzipping
-
-+ (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination {
-	return [self unzipFileAtPath:path toDestination:destination delegate:nil];
-}
-
-
-+ (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination overwrite:(BOOL)overwrite password:(NSString *)password error:(NSError **)error {
-	return [self unzipFileAtPath:path toDestination:destination overwrite:overwrite password:password error:error delegate:nil];
-}
-
-
-+ (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination delegate:(id<SSZipArchiveDelegate>)delegate {
-	return [self unzipFileAtPath:path toDestination:destination overwrite:YES password:nil error:nil delegate:delegate];
-}
-
-
-+ (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination overwrite:(BOOL)overwrite password:(NSString *)password error:(NSError **)error delegate:(id<SSZipArchiveDelegate>)delegate {
-	// Begin opening
-	zipFile zip = unzOpen((const char*)[path UTF8String]);	
-	if (zip == NULL) {
-		NSDictionary *userInfo = [NSDictionary dictionaryWithObject:@"failed to open zip file" forKey:NSLocalizedDescriptionKey];
-		if (error) {
-			*error = [NSError errorWithDomain:@"SSZipArchiveErrorDomain" code:-1 userInfo:userInfo];
-		}
-		return NO;
-	}
-	
-	unz_global_info  globalInfo = {0ul, 0ul};
-	unzGetGlobalInfo(zip, &globalInfo);
-	
-	// Begin unzipping
-	if (unzGoToFirstFile(zip) != UNZ_OK) {
-		NSDictionary *userInfo = [NSDictionary dictionaryWithObject:@"failed to open first file in zip file" forKey:NSLocalizedDescriptionKey];
-		if (error) {
-			*error = [NSError errorWithDomain:@"SSZipArchiveErrorDomain" code:-2 userInfo:userInfo];
-		}
-		return NO;
-	}
-	
-	BOOL success = YES;
-	int ret = 0;
-	unsigned char buffer[4096] = {0};
-	NSFileManager *fileManager = [NSFileManager defaultManager];
-	NSMutableSet *directoriesModificationDates = [[NSMutableSet alloc] init];
-	
-	// Message delegate
-	if ([delegate respondsToSelector:@selector(zipArchiveWillUnzipArchiveAtPath:zipInfo:)]) {
-		[delegate zipArchiveWillUnzipArchiveAtPath:path zipInfo:globalInfo];
-	}
-	
-	NSInteger currentFileNumber = 0;
-	do {
-		if ([password length] == 0) {
-			ret = unzOpenCurrentFile(zip);
-		} else {
-			ret = unzOpenCurrentFilePassword(zip, [password cStringUsingEncoding:NSASCIIStringEncoding]);
-		}
-		
-		if (ret != UNZ_OK) {
-			success = NO;
-			break;
-		}
-		
-		// Reading data and write to file
-		unz_file_info fileInfo;
-		memset(&fileInfo, 0, sizeof(unz_file_info));
-		
-		ret = unzGetCurrentFileInfo(zip, &fileInfo, NULL, 0, NULL, 0, NULL, 0);
-		if (ret != UNZ_OK) {
-			success = NO;
-			unzCloseCurrentFile(zip);
-			break;
-		}
-		
-		// Message delegate
-		if ([delegate respondsToSelector:@selector(zipArchiveWillUnzipFileAtIndex:totalFiles:archivePath:fileInfo:)]) {
-			[delegate zipArchiveWillUnzipFileAtIndex:currentFileNumber totalFiles:(NSInteger)globalInfo.number_entry
-										 archivePath:path fileInfo:fileInfo];
-		}
-        
-		char *filename = (char *)malloc(fileInfo.size_filename + 1);
-		unzGetCurrentFileInfo(zip, &fileInfo, filename, fileInfo.size_filename + 1, NULL, 0, NULL, 0);
-		filename[fileInfo.size_filename] = '\0';
-        
-        //
-        // NOTE
-        // I used the ZIP spec from here:
-        // http://www.pkware.com/documents/casestudies/APPNOTE.TXT
-        //
-        // ...to deduce this method of detecting whether the file in the ZIP is a symbolic link.
-        // If it is, it is listed as a directory but has a data size greater than zero (real 
-        // directories have it equal to 0) and the included, uncompressed data is the symbolic link path.
-        //
-        // ZIP files did not originally include support for symbolic links so the specification
-        // doesn't include anything in them that isn't part of a unix extension that isn't being used
-        // by the archivers we're testing. Most of this is figured out through trial and error and
-        // reading ZIP headers in hex editors. This seems to do the trick though.
-        //
-        
-        const uLong ZipCompressionMethodStore = 0;
-        
-        BOOL fileIsSymbolicLink = NO;
-        
-        if((fileInfo.compression_method == ZipCompressionMethodStore) && // Is it compressed?
-           (S_ISDIR(fileInfo.external_fa)) && // Is it marked as a directory
-           (fileInfo.compressed_size > 0)) // Is there any data?
-        {
-            fileIsSymbolicLink = YES;
-        }
-        
-		// Check if it contains directory
-		NSString *strPath = [NSString stringWithCString:filename encoding:NSUTF8StringEncoding];
-		BOOL isDirectory = NO;
-		if (filename[fileInfo.size_filename-1] == '/' || filename[fileInfo.size_filename-1] == '\\') {
-			isDirectory = YES;
-		}
-		free(filename);
-		
-		// Contains a path
-		if ([strPath rangeOfCharacterFromSet:[NSCharacterSet characterSetWithCharactersInString:@"/\\"]].location != NSNotFound) {
-			strPath = [strPath stringByReplacingOccurrencesOfString:@"\\" withString:@"/"];
-		}
-		
-		NSString *fullPath = [destination stringByAppendingPathComponent:strPath];
-		NSError *err = nil;
-        NSDate *modDate = [[self class] _dateWithMSDOSFormat:(UInt32)fileInfo.dosDate];
-        NSDictionary *directoryAttr = [NSDictionary dictionaryWithObjectsAndKeys:modDate, NSFileCreationDate, modDate, NSFileModificationDate, nil];
-		
-		if (isDirectory) {
-			[fileManager createDirectoryAtPath:fullPath withIntermediateDirectories:YES attributes:directoryAttr  error:&err];
-		} else {
-			[fileManager createDirectoryAtPath:[fullPath stringByDeletingLastPathComponent] withIntermediateDirectories:YES attributes:directoryAttr error:&err];
-		}
-        if (nil != err) {
-            NSLog(@"[SSZipArchive] Error: %@", err.localizedDescription);
-        }
-
-        if(!fileIsSymbolicLink)
-            [directoriesModificationDates addObject: [NSDictionary dictionaryWithObjectsAndKeys:fullPath, @"path", modDate, @"modDate", nil]];
-
-        if ([fileManager fileExistsAtPath:fullPath] && !isDirectory && !overwrite) {
-			unzCloseCurrentFile(zip);
-			ret = unzGoToNextFile(zip);
-			continue;
-		}
-        
-		if(!fileIsSymbolicLink)
-        {
-            FILE *fp = fopen((const char*)[fullPath UTF8String], "wb");
-            while (fp) {
-                int readBytes = unzReadCurrentFile(zip, buffer, 4096);
-
-                if (readBytes > 0) {
-                    fwrite(buffer, readBytes, 1, fp );
-                } else {
-                    break;
-                }
-            }
-            
-            if (fp) {
-                fclose(fp);
-                
-                // Set the original datetime property
-                if (fileInfo.dosDate != 0) {
-                    NSDate *orgDate = [[self class] _dateWithMSDOSFormat:(UInt32)fileInfo.dosDate];
-                    NSDictionary *attr = [NSDictionary dictionaryWithObject:orgDate forKey:NSFileModificationDate];
-                    
-                    if (attr) {
-                        if ([fileManager setAttributes:attr ofItemAtPath:fullPath error:nil] == NO) {
-                            // Can't set attributes 
-                            NSLog(@"[SSZipArchive] Failed to set attributes");
-                        }
-                    }
-                }
-            }
-        }
-        else
-        {
-            // Get the path for the symbolic link
-            
-            NSURL* symlinkURL = [NSURL fileURLWithPath:fullPath];
-            NSMutableString* destinationPath = [NSMutableString string];
-            
-            int bytesRead = 0;
-            while((bytesRead = unzReadCurrentFile(zip, buffer, 4096)) > 0)
-            {
-                buffer[bytesRead] = 0;
-                [destinationPath appendString:[NSString stringWithUTF8String:(const char*)buffer]];
-            }
-            
-            //NSLog(@"Symlinking to: %@", destinationPath);
-            
-            NSURL* destinationURL = [NSURL fileURLWithPath:destinationPath];
-            
-            // Create the symbolic link
-            NSError* symlinkError = nil;
-            [fileManager createSymbolicLinkAtURL:symlinkURL withDestinationURL:destinationURL error:&symlinkError];
-            
-            if(symlinkError != nil)
-            {
-                NSLog(@"Failed to create symbolic link at \"%@\" to \"%@\". Error: %@", symlinkURL.absoluteString, destinationURL.absoluteString, symlinkError.localizedDescription);
-            }
-        }
-		
-		unzCloseCurrentFile( zip );
-		ret = unzGoToNextFile( zip );
-		
-		// Message delegate
-		if ([delegate respondsToSelector:@selector(zipArchiveDidUnzipFileAtIndex:totalFiles:archivePath:fileInfo:)]) {
-			[delegate zipArchiveDidUnzipFileAtIndex:currentFileNumber totalFiles:(NSInteger)globalInfo.number_entry
-										 archivePath:path fileInfo:fileInfo];
-		}
-		
-		currentFileNumber++;
-	} while(ret == UNZ_OK && UNZ_OK != UNZ_END_OF_LIST_OF_FILE);
-	
-	// Close
-	unzClose(zip);
-	
-	// The process of decompressing the .zip archive causes the modification times on the folders
-    // to be set to the present time. So, when we are done, they need to be explicitly set.
-    // set the modification date on all of the directories.
-    NSError * err = nil;
-    for (NSDictionary * d in directoriesModificationDates) {
-        if (![[NSFileManager defaultManager] setAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[d objectForKey:@"modDate"], NSFileModificationDate, nil] ofItemAtPath:[d objectForKey:@"path"] error:&err]) {
-            NSLog(@"[SSZipArchive] Set attributes failed for directory: %@.", [d objectForKey:@"path"]);
-        }
-        if (err) {
-            NSLog(@"[SSZipArchive] Error setting directory file modification date attribute: %@",err.localizedDescription);
-        }
-    }
-	
-#if !__has_feature(objc_arc)
-	[directoriesModificationDates release];
-#endif
-	
-	// Message delegate
-	if (success && [delegate respondsToSelector:@selector(zipArchiveDidUnzipArchiveAtPath:zipInfo:unzippedPath:)]) {
-		[delegate zipArchiveDidUnzipArchiveAtPath:path zipInfo:globalInfo unzippedPath:destination];
-	}
-	
-	return success;
-}
-
-
-#pragma mark - Zipping
-
-+ (BOOL)createZipFileAtPath:(NSString *)path withFilesAtPaths:(NSArray *)paths {
-	BOOL success = NO;
-	SSZipArchive *zipArchive = [[SSZipArchive alloc] initWithPath:path];
-	if ([zipArchive open]) {
-		for (NSString *path in paths) {
-			[zipArchive writeFile:path];
-		}
-		success = [zipArchive close];        
-	}
-	
-#if !__has_feature(objc_arc)
-	[zipArchive release];
-#endif
-
-	return success;
-}
-
-
- (id)initWithPath:(NSString *)path {
-	if ((self = [super init])) {
-		_path = [path copy];
-	}
-	return self;
-}
-
-
-#if !__has_feature(objc_arc)
- (void)dealloc {
-    [_path release];
-	[super dealloc];
-}
-#endif
-
-
- (BOOL)open {    
-	NSAssert((_zip == NULL), @"Attempting open an archive which is already open");
-	_zip = zipOpen([_path UTF8String], APPEND_STATUS_CREATE);
-	return (NULL != _zip);
-}
-
-
- (void)zipInfo:(zip_fileinfo*)zipInfo setDate:(NSDate*)date {
-    NSCalendar *currentCalendar = [NSCalendar currentCalendar];
-    uint flags = NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit;
-    NSDateComponents *components = [currentCalendar components:flags fromDate:date];
-    zipInfo->tmz_date.tm_sec = (unsigned int)components.second;
-    zipInfo->tmz_date.tm_min = (unsigned int)components.minute;
-    zipInfo->tmz_date.tm_hour = (unsigned int)components.hour;
-    zipInfo->tmz_date.tm_mday = (unsigned int)components.day;
-    zipInfo->tmz_date.tm_mon = (unsigned int)components.month - 1;
-    zipInfo->tmz_date.tm_year = (unsigned int)components.year;
-}
-
-
- (BOOL)writeFile:(NSString *)path {
-	NSAssert((_zip != NULL), @"Attempting to write to an archive which was never opened");
-
-	FILE *input = fopen([path UTF8String], "r");
-	if (NULL == input) {
-		return NO;
-	}
-
-	zipOpenNewFileInZip(_zip, [[path lastPathComponent] UTF8String], NULL, NULL, 0, NULL, 0, NULL, Z_DEFLATED,
-						Z_DEFAULT_COMPRESSION);
-
-	void *buffer = malloc(CHUNK);
-	unsigned int len = 0;
-	while (!feof(input)) {
-		len = (unsigned int) fread(buffer, 1, CHUNK, input);
-		zipWriteInFileInZip(_zip, buffer, len);
-	}
-
-	zipCloseFileInZip(_zip);
-	free(buffer);
-	return YES;
-}
-
-
- (BOOL)writeData:(NSData *)data filename:(NSString *)filename {
-    if (!_zip) {
-		return NO;
-    }
-    if (!data) {
-		return NO;
-    }
-    zip_fileinfo zipInfo = {{0,0,0,0,0,0},0,0,0};
-    [self zipInfo:&zipInfo setDate:[NSDate date]];
-
-	zipOpenNewFileInZip(_zip, [filename UTF8String], &zipInfo, NULL, 0, NULL, 0, NULL, Z_DEFLATED, Z_DEFAULT_COMPRESSION);
-
-    zipWriteInFileInZip(_zip, data.bytes, (unsigned int)data.length);
-
-	zipCloseFileInZip(_zip);
-	return YES;
-}
-
-
- (BOOL)close {    
-	NSAssert((_zip != NULL), @"[SSZipArchive] Attempting to close an archive which was never opened");
-	zipClose(_zip, NULL);
-	return YES;
-}
-
-
-#pragma mark - Private
-
-// Format from http://newsgroups.derkeiler.com/Archive/Comp/comp.os.msdos.programmer/2009-04/msg00060.html
-// Two consecutive words, or a longword, YYYYYYYMMMMDDDDD hhhhhmmmmmmsssss
-// YYYYYYY is years from 1980 = 0
-// sssss is (seconds/2).
-//
-// 3658 = 0011 0110 0101 1000 = 0011011 0010 11000 = 27 2 24 = 2007-02-24
-// 7423 = 0111 0100 0010 0011 - 01110 100001 00011 = 14 33 2 = 14:33:06
-+ (NSDate *)_dateWithMSDOSFormat:(UInt32)msdosDateTime {
-	static const UInt32 kYearMask = 0xFE000000;
-	static const UInt32 kMonthMask = 0x1E00000;
-	static const UInt32 kDayMask = 0x1F0000;
-	static const UInt32 kHourMask = 0xF800;
-	static const UInt32 kMinuteMask = 0x7E0;
-	static const UInt32 kSecondMask = 0x1F;
-	
-	NSCalendar *gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
-    NSDateComponents *components = [[NSDateComponents alloc] init];
-
-    NSAssert(0xFFFFFFFF == (kYearMask | kMonthMask | kDayMask | kHourMask | kMinuteMask | kSecondMask), @"[SSZipArchive] MSDOS date masks don't add up");
-	    
-    [components setYear:1980 + ((msdosDateTime & kYearMask) >> 25)];
-    [components setMonth:(msdosDateTime & kMonthMask) >> 21];
-    [components setDay:(msdosDateTime & kDayMask) >> 16];
-    [components setHour:(msdosDateTime & kHourMask) >> 11];
-    [components setMinute:(msdosDateTime & kMinuteMask) >> 5];
-    [components setSecond:(msdosDateTime & kSecondMask) * 2];
-    
-    NSDate *date = [NSDate dateWithTimeInterval:0 sinceDate:[gregorian dateFromComponents:components]];
-	
-#if !__has_feature(objc_arc)
-	[gregorian release];
-	[components release];
-#endif
-	
-	return date;
-}
-
-@end
--- a/SSZipArchive.podspec
+++ b/SSZipArchive.podspec
@@ -1,18 +1,15 @@
 Pod::Spec.new do |s|
-  s.name            = 'SSZipArchive'
-  s.version         = '0.2.2'
-  s.summary         = 'Utility class for zipping and unzipping files on iOS and Mac.'
-  s.homepage        = 'https://github.com/samsoffes/ssziparchive'
-  s.author          = { 'Sam Soffes' => 'sam@samsoff.es' }
-  s.source          = { :git => 'https://github.com/samsoffes/ssziparchive.git', :tag => '0.2.2' }
-  s.description     = 'SSZipArchive is a simple utility class for zipping and unzipping files on iOS and Mac.'
-  s.source_files    = 'SSZipArchive.*', 'minizip/*.{h,c}'
-  s.library         = 'z'
-  s.preserve_paths  = ['Tests', '.gitignore']
+  s.name         = 'SSZipArchive'
+  s.version      = '0.3.0'
+  s.summary      = 'Utility class for zipping and unzipping files on iOS and Mac.'
+  s.description  = 'SSZipArchive is a simple utility class for zipping and unzipping files on iOS and Mac.'
+  s.homepage     = 'https://github.com/soffes/ssziparchive'
  s.license      = { :type => 'MIT', :file => 'LICENSE' }
-
-  # Maintain the dir structure for headers
-  def s.copy_header_mapping(from)
-    from
-  end
+  s.author       = { 'Sam Soffes' => 'sam@soff.es' }
+  s.source       = { :git => 'https://github.com/soffes/ssziparchive.git', :tag => "v#{s.version}" }
+  s.ios.deployment_target = '4.0'
+  s.osx.deployment_target = '10.6'
+  s.source_files = 'SSZipArchive/SSZipArchive.{h,m}', 'SSZipArchive/minizip/*.{h,c}'
+  s.header_dir = 'SSZipArchive/minizip'
+  s.library      = 'z'
 end
--- a/SSZipArchive.xcodeproj/project.pbxproj
+++ b/SSZipArchive.xcodeproj/project.pbxproj
@@ -0,0 +1,528 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		21CC41A917DB7D1300201DDC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21CC41A817DB7D1300201DDC /* Foundation.framework */; };
+		21CC41AB17DB7D1300201DDC /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21CC41AA17DB7D1300201DDC /* CoreGraphics.framework */; };
+		21CC41AD17DB7D1300201DDC /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21CC41AC17DB7D1300201DDC /* UIKit.framework */; };
+		21CC41C217DB7D1300201DDC /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21CC41C117DB7D1300201DDC /* XCTest.framework */; };
+		21CC41C317DB7D1300201DDC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21CC41A817DB7D1300201DDC /* Foundation.framework */; };
+		21CC41C417DB7D1300201DDC /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21CC41AC17DB7D1300201DDC /* UIKit.framework */; };
+		21CC41E417DB7D2F00201DDC /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41DA17DB7D2F00201DDC /* ioapi.c */; };
+		21CC41E517DB7D2F00201DDC /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41DA17DB7D2F00201DDC /* ioapi.c */; };
+		21CC41E617DB7D2F00201DDC /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41DC17DB7D2F00201DDC /* mztools.c */; };
+		21CC41E717DB7D2F00201DDC /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41DC17DB7D2F00201DDC /* mztools.c */; };
+		21CC41E817DB7D2F00201DDC /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41DE17DB7D2F00201DDC /* unzip.c */; };
+		21CC41E917DB7D2F00201DDC /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41DE17DB7D2F00201DDC /* unzip.c */; };
+		21CC41EA17DB7D2F00201DDC /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41E017DB7D2F00201DDC /* zip.c */; };
+		21CC41EB17DB7D2F00201DDC /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41E017DB7D2F00201DDC /* zip.c */; };
+		21CC41EC17DB7D2F00201DDC /* SSZipArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41E317DB7D2F00201DDC /* SSZipArchive.m */; };
+		21CC41ED17DB7D2F00201DDC /* SSZipArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41E317DB7D2F00201DDC /* SSZipArchive.m */; };
+		21CC41F817DB7D3500201DDC /* IncorrectHeaders.zip in Resources */ = {isa = PBXBuildFile; fileRef = 21CC41F017DB7D3500201DDC /* IncorrectHeaders.zip */; };
+		21CC41F917DB7D3500201DDC /* PermissionsTestApp.app in Resources */ = {isa = PBXBuildFile; fileRef = 21CC41F117DB7D3500201DDC /* PermissionsTestApp.app */; };
+		21CC41FA17DB7D3500201DDC /* SymbolicLink.zip in Resources */ = {isa = PBXBuildFile; fileRef = 21CC41F217DB7D3500201DDC /* SymbolicLink.zip */; };
+		21CC41FB17DB7D3500201DDC /* TestArchive.zip in Resources */ = {isa = PBXBuildFile; fileRef = 21CC41F317DB7D3500201DDC /* TestArchive.zip */; };
+		21CC41FC17DB7D3500201DDC /* TestPasswordArchive.zip in Resources */ = {isa = PBXBuildFile; fileRef = 21CC41F417DB7D3500201DDC /* TestPasswordArchive.zip */; };
+		21CC41FD17DB7D3500201DDC /* Unicode.zip in Resources */ = {isa = PBXBuildFile; fileRef = 21CC41F517DB7D3500201DDC /* Unicode.zip */; };
+		21CC41FF17DB7D3500201DDC /* SSZipArchiveTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 21CC41F717DB7D3500201DDC /* SSZipArchiveTests.m */; };
+		21CC420F17DB7D6F00201DDC /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 21CC420817DB7D6300201DDC /* Images.xcassets */; };
+		21CC421017DB7D7400201DDC /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 21CC420517DB7D6300201DDC /* main.m */; };
+		21CC421117DB7D7900201DDC /* SSAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 21CC420317DB7D6300201DDC /* SSAppDelegate.m */; };
+		21CC421317DB7E0500201DDC /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 21CC421217DB7E0500201DDC /* libz.dylib */; };
+		21CC421417DB7E0900201DDC /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 21CC421217DB7E0500201DDC /* libz.dylib */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		21CC41C517DB7D1300201DDC /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 21CC419D17DB7D1300201DDC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 21CC41A417DB7D1300201DDC;
+			remoteInfo = SSZipArchive;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		21CC41A517DB7D1300201DDC /* SSZipArchive.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SSZipArchive.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		21CC41A817DB7D1300201DDC /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		21CC41AA17DB7D1300201DDC /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+		21CC41AC17DB7D1300201DDC /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
+		21CC41C017DB7D1300201DDC /* SSZipArchiveTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SSZipArchiveTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		21CC41C117DB7D1300201DDC /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
+		21CC41D917DB7D2F00201DDC /* crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypt.h; sourceTree = "<group>"; };
+		21CC41DA17DB7D2F00201DDC /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ioapi.c; sourceTree = "<group>"; };
+		21CC41DB17DB7D2F00201DDC /* ioapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ioapi.h; sourceTree = "<group>"; };
+		21CC41DC17DB7D2F00201DDC /* mztools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mztools.c; sourceTree = "<group>"; };
+		21CC41DD17DB7D2F00201DDC /* mztools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mztools.h; sourceTree = "<group>"; };
+		21CC41DE17DB7D2F00201DDC /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unzip.c; sourceTree = "<group>"; };
+		21CC41DF17DB7D2F00201DDC /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unzip.h; sourceTree = "<group>"; };
+		21CC41E017DB7D2F00201DDC /* zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zip.c; sourceTree = "<group>"; };
+		21CC41E117DB7D2F00201DDC /* zip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zip.h; sourceTree = "<group>"; };
+		21CC41E217DB7D2F00201DDC /* SSZipArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSZipArchive.h; sourceTree = "<group>"; };
+		21CC41E317DB7D2F00201DDC /* SSZipArchive.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSZipArchive.m; sourceTree = "<group>"; };
+		21CC41F017DB7D3500201DDC /* IncorrectHeaders.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = IncorrectHeaders.zip; sourceTree = "<group>"; };
+		21CC41F117DB7D3500201DDC /* PermissionsTestApp.app */ = {isa = PBXFileReference; lastKnownFileType = wrapper.application; path = PermissionsTestApp.app; sourceTree = "<group>"; };
+		21CC41F217DB7D3500201DDC /* SymbolicLink.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = SymbolicLink.zip; sourceTree = "<group>"; };
+		21CC41F317DB7D3500201DDC /* TestArchive.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = TestArchive.zip; sourceTree = "<group>"; };
+		21CC41F417DB7D3500201DDC /* TestPasswordArchive.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = TestPasswordArchive.zip; sourceTree = "<group>"; };
+		21CC41F517DB7D3500201DDC /* Unicode.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = Unicode.zip; sourceTree = "<group>"; };
+		21CC41F617DB7D3500201DDC /* SSZipArchiveTests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SSZipArchiveTests-Info.plist"; sourceTree = "<group>"; };
+		21CC41F717DB7D3500201DDC /* SSZipArchiveTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSZipArchiveTests.m; sourceTree = "<group>"; };
+		21CC420217DB7D6300201DDC /* SSAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSAppDelegate.h; sourceTree = "<group>"; };
+		21CC420317DB7D6300201DDC /* SSAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSAppDelegate.m; sourceTree = "<group>"; };
+		21CC420517DB7D6300201DDC /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		21CC420617DB7D6300201DDC /* SSZipArchive-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SSZipArchive-Prefix.pch"; sourceTree = "<group>"; };
+		21CC420817DB7D6300201DDC /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
+		21CC420917DB7D6300201DDC /* SSZipArchive-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SSZipArchive-Info.plist"; sourceTree = "<group>"; };
+		21CC421217DB7E0500201DDC /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		21CC41A217DB7D1300201DDC /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				21CC421317DB7E0500201DDC /* libz.dylib in Frameworks */,
+				21CC41AB17DB7D1300201DDC /* CoreGraphics.framework in Frameworks */,
+				21CC41AD17DB7D1300201DDC /* UIKit.framework in Frameworks */,
+				21CC41A917DB7D1300201DDC /* Foundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		21CC41BD17DB7D1300201DDC /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				21CC421417DB7E0900201DDC /* libz.dylib in Frameworks */,
+				21CC41C217DB7D1300201DDC /* XCTest.framework in Frameworks */,
+				21CC41C417DB7D1300201DDC /* UIKit.framework in Frameworks */,
+				21CC41C317DB7D1300201DDC /* Foundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		21CC419C17DB7D1300201DDC = {
+			isa = PBXGroup;
+			children = (
+				21CC41D717DB7D2F00201DDC /* SSZipArchive */,
+				21CC420017DB7D6300201DDC /* Example */,
+				21CC41EE17DB7D3500201DDC /* Tests */,
+				21CC41A717DB7D1300201DDC /* Frameworks */,
+				21CC41A617DB7D1300201DDC /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		21CC41A617DB7D1300201DDC /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				21CC41A517DB7D1300201DDC /* SSZipArchive.app */,
+				21CC41C017DB7D1300201DDC /* SSZipArchiveTests.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		21CC41A717DB7D1300201DDC /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				21CC421217DB7E0500201DDC /* libz.dylib */,
+				21CC41A817DB7D1300201DDC /* Foundation.framework */,
+				21CC41AA17DB7D1300201DDC /* CoreGraphics.framework */,
+				21CC41AC17DB7D1300201DDC /* UIKit.framework */,
+				21CC41C117DB7D1300201DDC /* XCTest.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		21CC41D717DB7D2F00201DDC /* SSZipArchive */ = {
+			isa = PBXGroup;
+			children = (
+				21CC41E217DB7D2F00201DDC /* SSZipArchive.h */,
+				21CC41E317DB7D2F00201DDC /* SSZipArchive.m */,
+				21CC41D817DB7D2F00201DDC /* minizip */,
+			);
+			path = SSZipArchive;
+			sourceTree = "<group>";
+		};
+		21CC41D817DB7D2F00201DDC /* minizip */ = {
+			isa = PBXGroup;
+			children = (
+				21CC41D917DB7D2F00201DDC /* crypt.h */,
+				21CC41DA17DB7D2F00201DDC /* ioapi.c */,
+				21CC41DB17DB7D2F00201DDC /* ioapi.h */,
+				21CC41DC17DB7D2F00201DDC /* mztools.c */,
+				21CC41DD17DB7D2F00201DDC /* mztools.h */,
+				21CC41DE17DB7D2F00201DDC /* unzip.c */,
+				21CC41DF17DB7D2F00201DDC /* unzip.h */,
+				21CC41E017DB7D2F00201DDC /* zip.c */,
+				21CC41E117DB7D2F00201DDC /* zip.h */,
+			);
+			path = minizip;
+			sourceTree = "<group>";
+		};
+		21CC41EE17DB7D3500201DDC /* Tests */ = {
+			isa = PBXGroup;
+			children = (
+				21CC41EF17DB7D3500201DDC /* Fixtures */,
+				21CC41F617DB7D3500201DDC /* SSZipArchiveTests-Info.plist */,
+				21CC41F717DB7D3500201DDC /* SSZipArchiveTests.m */,
+			);
+			path = Tests;
+			sourceTree = "<group>";
+		};
+		21CC41EF17DB7D3500201DDC /* Fixtures */ = {
+			isa = PBXGroup;
+			children = (
+				21CC41F017DB7D3500201DDC /* IncorrectHeaders.zip */,
+				21CC41F117DB7D3500201DDC /* PermissionsTestApp.app */,
+				21CC41F217DB7D3500201DDC /* SymbolicLink.zip */,
+				21CC41F317DB7D3500201DDC /* TestArchive.zip */,
+				21CC41F417DB7D3500201DDC /* TestPasswordArchive.zip */,
+				21CC41F517DB7D3500201DDC /* Unicode.zip */,
+			);
+			path = Fixtures;
+			sourceTree = "<group>";
+		};
+		21CC420017DB7D6300201DDC /* Example */ = {
+			isa = PBXGroup;
+			children = (
+				21CC420117DB7D6300201DDC /* Classes */,
+				21CC420417DB7D6300201DDC /* Other Sources */,
+				21CC420717DB7D6300201DDC /* Resources */,
+			);
+			path = Example;
+			sourceTree = "<group>";
+		};
+		21CC420117DB7D6300201DDC /* Classes */ = {
+			isa = PBXGroup;
+			children = (
+				21CC420217DB7D6300201DDC /* SSAppDelegate.h */,
+				21CC420317DB7D6300201DDC /* SSAppDelegate.m */,
+			);
+			path = Classes;
+			sourceTree = "<group>";
+		};
+		21CC420417DB7D6300201DDC /* Other Sources */ = {
+			isa = PBXGroup;
+			children = (
+				21CC420517DB7D6300201DDC /* main.m */,
+				21CC420617DB7D6300201DDC /* SSZipArchive-Prefix.pch */,
+			);
+			path = "Other Sources";
+			sourceTree = "<group>";
+		};
+		21CC420717DB7D6300201DDC /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				21CC420817DB7D6300201DDC /* Images.xcassets */,
+				21CC420917DB7D6300201DDC /* SSZipArchive-Info.plist */,
+			);
+			path = Resources;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		21CC41A417DB7D1300201DDC /* SSZipArchive */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 21CC41D117DB7D1300201DDC /* Build configuration list for PBXNativeTarget "SSZipArchive" */;
+			buildPhases = (
+				21CC41A117DB7D1300201DDC /* Sources */,
+				21CC41A217DB7D1300201DDC /* Frameworks */,
+				21CC41A317DB7D1300201DDC /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = SSZipArchive;
+			productName = SSZipArchive;
+			productReference = 21CC41A517DB7D1300201DDC /* SSZipArchive.app */;
+			productType = "com.apple.product-type.application";
+		};
+		21CC41BF17DB7D1300201DDC /* SSZipArchiveTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 21CC41D417DB7D1300201DDC /* Build configuration list for PBXNativeTarget "SSZipArchiveTests" */;
+			buildPhases = (
+				21CC41BC17DB7D1300201DDC /* Sources */,
+				21CC41BD17DB7D1300201DDC /* Frameworks */,
+				21CC41BE17DB7D1300201DDC /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				21CC41C617DB7D1300201DDC /* PBXTargetDependency */,
+			);
+			name = SSZipArchiveTests;
+			productName = SSZipArchiveTests;
+			productReference = 21CC41C017DB7D1300201DDC /* SSZipArchiveTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		21CC419D17DB7D1300201DDC /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				CLASSPREFIX = SS;
+				LastUpgradeCheck = 0500;
+				ORGANIZATIONNAME = "Sam Soffes";
+				TargetAttributes = {
+					21CC41BF17DB7D1300201DDC = {
+						TestTargetID = 21CC41A417DB7D1300201DDC;
+					};
+				};
+			};
+			buildConfigurationList = 21CC41A017DB7D1300201DDC /* Build configuration list for PBXProject "SSZipArchive" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 21CC419C17DB7D1300201DDC;
+			productRefGroup = 21CC41A617DB7D1300201DDC /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				21CC41A417DB7D1300201DDC /* SSZipArchive */,
+				21CC41BF17DB7D1300201DDC /* SSZipArchiveTests */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		21CC41A317DB7D1300201DDC /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				21CC420F17DB7D6F00201DDC /* Images.xcassets in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		21CC41BE17DB7D1300201DDC /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				21CC41F817DB7D3500201DDC /* IncorrectHeaders.zip in Resources */,
+				21CC41FD17DB7D3500201DDC /* Unicode.zip in Resources */,
+				21CC41FA17DB7D3500201DDC /* SymbolicLink.zip in Resources */,
+				21CC41F917DB7D3500201DDC /* PermissionsTestApp.app in Resources */,
+				21CC41FB17DB7D3500201DDC /* TestArchive.zip in Resources */,
+				21CC41FC17DB7D3500201DDC /* TestPasswordArchive.zip in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		21CC41A117DB7D1300201DDC /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				21CC41E817DB7D2F00201DDC /* unzip.c in Sources */,
+				21CC41EC17DB7D2F00201DDC /* SSZipArchive.m in Sources */,
+				21CC41EA17DB7D2F00201DDC /* zip.c in Sources */,
+				21CC421117DB7D7900201DDC /* SSAppDelegate.m in Sources */,
+				21CC41E617DB7D2F00201DDC /* mztools.c in Sources */,
+				21CC421017DB7D7400201DDC /* main.m in Sources */,
+				21CC41E417DB7D2F00201DDC /* ioapi.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		21CC41BC17DB7D1300201DDC /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				21CC41E517DB7D2F00201DDC /* ioapi.c in Sources */,
+				21CC41FF17DB7D3500201DDC /* SSZipArchiveTests.m in Sources */,
+				21CC41ED17DB7D2F00201DDC /* SSZipArchive.m in Sources */,
+				21CC41E917DB7D2F00201DDC /* unzip.c in Sources */,
+				21CC41EB17DB7D2F00201DDC /* zip.c in Sources */,
+				21CC41E717DB7D2F00201DDC /* mztools.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		21CC41C617DB7D1300201DDC /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 21CC41A417DB7D1300201DDC /* SSZipArchive */;
+			targetProxy = 21CC41C517DB7D1300201DDC /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin XCBuildConfiguration section */
+		21CC41CF17DB7D1300201DDC /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		21CC41D017DB7D1300201DDC /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = YES;
+				ENABLE_NS_ASSERTIONS = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		21CC41D217DB7D1300201DDC /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "Example/Other Sources/SSZipArchive-Prefix.pch";
+				INFOPLIST_FILE = "Example/Resources/SSZipArchive-Info.plist";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				WRAPPER_EXTENSION = app;
+			};
+			name = Debug;
+		};
+		21CC41D317DB7D1300201DDC /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "Example/Other Sources/SSZipArchive-Prefix.pch";
+				INFOPLIST_FILE = "Example/Resources/SSZipArchive-Info.plist";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				WRAPPER_EXTENSION = app;
+			};
+			name = Release;
+		};
+		21CC41D517DB7D1300201DDC /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/SSZipArchive.app/SSZipArchive";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SDKROOT)/Developer/Library/Frameworks",
+					"$(inherited)",
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
+				);
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				INFOPLIST_FILE = "Tests/SSZipArchiveTests-Info.plist";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUNDLE_LOADER)";
+				WRAPPER_EXTENSION = xctest;
+			};
+			name = Debug;
+		};
+		21CC41D617DB7D1300201DDC /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/SSZipArchive.app/SSZipArchive";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SDKROOT)/Developer/Library/Frameworks",
+					"$(inherited)",
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
+				);
+				INFOPLIST_FILE = "Tests/SSZipArchiveTests-Info.plist";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUNDLE_LOADER)";
+				WRAPPER_EXTENSION = xctest;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		21CC41A017DB7D1300201DDC /* Build configuration list for PBXProject "SSZipArchive" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				21CC41CF17DB7D1300201DDC /* Debug */,
+				21CC41D017DB7D1300201DDC /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		21CC41D117DB7D1300201DDC /* Build configuration list for PBXNativeTarget "SSZipArchive" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				21CC41D217DB7D1300201DDC /* Debug */,
+				21CC41D317DB7D1300201DDC /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		21CC41D417DB7D1300201DDC /* Build configuration list for PBXNativeTarget "SSZipArchiveTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				21CC41D517DB7D1300201DDC /* Debug */,
+				21CC41D617DB7D1300201DDC /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 21CC419D17DB7D1300201DDC /* Project object */;
+}
--- a/SSZipArchive/SSZipArchive.h
+++ b/SSZipArchive/SSZipArchive.h
@@ -3,9 +3,12 @@
 //  SSZipArchive
 //
 //  Created by Sam Soffes on 7/21/10.
-//  Copyright (c) Sam Soffes 2010-2011. All rights reserved.
+//  Copyright (c) Sam Soffes 2010-2013. All rights reserved.
 //

+#ifndef _SSZIPARCHIVE_H
+#define _SSZIPARCHIVE_H
+
 #import <Foundation/Foundation.h>
 #include "minizip/unzip.h"

@@ -22,6 +25,7 @@

 // Zip
 + (BOOL)createZipFileAtPath:(NSString *)path withFilesAtPaths:(NSArray *)filenames;
+ (BOOL)createZipFileAtPath:(NSString *)path withContentsOfDirectory:(NSString *)directoryPath;

 - (id)initWithPath:(NSString *)path;
 - (BOOL)open;
@@ -43,3 +47,5 @@
 - (void)zipArchiveDidUnzipFileAtIndex:(NSInteger)fileIndex totalFiles:(NSInteger)totalFiles archivePath:(NSString *)archivePath fileInfo:(unz_file_info)fileInfo;

@end
+
+#endif /* _SSZIPARCHIVE_H */
--- a/SSZipArchive/SSZipArchive.m
+++ b/SSZipArchive/SSZipArchive.m
@@ -0,0 +1,525 @@
+//
+//  SSZipArchive.m
+//  SSZipArchive
+//
+//  Created by Sam Soffes on 7/21/10.
+//  Copyright (c) Sam Soffes 2010-2013. All rights reserved.
+//
+
+#import "SSZipArchive.h"
+#include "minizip/zip.h"
+#import "zlib.h"
+#import "zconf.h"
+
+#include <sys/stat.h>
+
+#define CHUNK 16384
+
+@interface SSZipArchive ()
+ (NSDate *)_dateWithMSDOSFormat:(UInt32)msdosDateTime;
+@end
+
+
+@implementation SSZipArchive {
+	NSString *_path;
+	NSString *_filename;
+    zipFile _zip;
+}
+
+
+#pragma mark - Unzipping
+
+ (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination {
+	return [self unzipFileAtPath:path toDestination:destination delegate:nil];
+}
+
+
+ (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination overwrite:(BOOL)overwrite password:(NSString *)password error:(NSError **)error {
+	return [self unzipFileAtPath:path toDestination:destination overwrite:overwrite password:password error:error delegate:nil];
+}
+
+
+ (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination delegate:(id<SSZipArchiveDelegate>)delegate {
+	return [self unzipFileAtPath:path toDestination:destination overwrite:YES password:nil error:nil delegate:delegate];
+}
+
+
+ (BOOL)unzipFileAtPath:(NSString *)path toDestination:(NSString *)destination overwrite:(BOOL)overwrite password:(NSString *)password error:(NSError **)error delegate:(id<SSZipArchiveDelegate>)delegate {
+	// Begin opening
+	zipFile zip = unzOpen((const char*)[path UTF8String]);	
+	if (zip == NULL) {
+		NSDictionary *userInfo = [NSDictionary dictionaryWithObject:@"failed to open zip file" forKey:NSLocalizedDescriptionKey];
+		if (error) {
+			*error = [NSError errorWithDomain:@"SSZipArchiveErrorDomain" code:-1 userInfo:userInfo];
+		}
+		return NO;
+	}
+	
+	unz_global_info  globalInfo = {0ul, 0ul};
+	unzGetGlobalInfo(zip, &globalInfo);
+	
+	// Begin unzipping
+	if (unzGoToFirstFile(zip) != UNZ_OK) {
+		NSDictionary *userInfo = [NSDictionary dictionaryWithObject:@"failed to open first file in zip file" forKey:NSLocalizedDescriptionKey];
+		if (error) {
+			*error = [NSError errorWithDomain:@"SSZipArchiveErrorDomain" code:-2 userInfo:userInfo];
+		}
+		return NO;
+	}
+	
+	BOOL success = YES;
+	int ret = 0;
+	unsigned char buffer[4096] = {0};
+	NSFileManager *fileManager = [NSFileManager defaultManager];
+	NSMutableSet *directoriesModificationDates = [[NSMutableSet alloc] init];
+	
+	// Message delegate
+	if ([delegate respondsToSelector:@selector(zipArchiveWillUnzipArchiveAtPath:zipInfo:)]) {
+		[delegate zipArchiveWillUnzipArchiveAtPath:path zipInfo:globalInfo];
+	}
+	
+	NSInteger currentFileNumber = 0;
+	do {
+		@autoreleasepool {
+			if ([password length] == 0) {
+				ret = unzOpenCurrentFile(zip);
+			} else {
+				ret = unzOpenCurrentFilePassword(zip, [password cStringUsingEncoding:NSASCIIStringEncoding]);
+			}
+			
+			if (ret != UNZ_OK) {
+				success = NO;
+				break;
+			}
+			
+			// Reading data and write to file
+			unz_file_info fileInfo;
+			memset(&fileInfo, 0, sizeof(unz_file_info));
+			
+			ret = unzGetCurrentFileInfo(zip, &fileInfo, NULL, 0, NULL, 0, NULL, 0);
+			if (ret != UNZ_OK) {
+				success = NO;
+				unzCloseCurrentFile(zip);
+				break;
+			}
+			
+			// Message delegate
+			if ([delegate respondsToSelector:@selector(zipArchiveWillUnzipFileAtIndex:totalFiles:archivePath:fileInfo:)]) {
+				[delegate zipArchiveWillUnzipFileAtIndex:currentFileNumber totalFiles:(NSInteger)globalInfo.number_entry
+											 archivePath:path fileInfo:fileInfo];
+			}
+	        
+			char *filename = (char *)malloc(fileInfo.size_filename + 1);
+			unzGetCurrentFileInfo(zip, &fileInfo, filename, fileInfo.size_filename + 1, NULL, 0, NULL, 0);
+			filename[fileInfo.size_filename] = '\0';
+	        
+	        //
+	        // NOTE
+	        // I used the ZIP spec from here:
+	        // http://www.pkware.com/documents/casestudies/APPNOTE.TXT
+	        //
+	        // ...to deduce this method of detecting whether the file in the ZIP is a symbolic link.
+	        // If it is, it is listed as a directory but has a data size greater than zero (real 
+	        // directories have it equal to 0) and the included, uncompressed data is the symbolic link path.
+	        //
+	        // ZIP files did not originally include support for symbolic links so the specification
+	        // doesn't include anything in them that isn't part of a unix extension that isn't being used
+	        // by the archivers we're testing. Most of this is figured out through trial and error and
+	        // reading ZIP headers in hex editors. This seems to do the trick though.
+	        //
+	        
+	        const uLong ZipCompressionMethodStore = 0;
+	        
+	        BOOL fileIsSymbolicLink = NO;
+	        
+	        if((fileInfo.compression_method == ZipCompressionMethodStore) && // Is it compressed?
+	           (S_ISDIR(fileInfo.external_fa)) && // Is it marked as a directory
+	           (fileInfo.compressed_size > 0)) // Is there any data?
+	        {
+	            fileIsSymbolicLink = YES;
+	        }
+	        
+			// Check if it contains directory
+			NSString *strPath = [NSString stringWithCString:filename encoding:NSUTF8StringEncoding];
+			BOOL isDirectory = NO;
+			if (filename[fileInfo.size_filename-1] == '/' || filename[fileInfo.size_filename-1] == '\\') {
+				isDirectory = YES;
+			}
+			free(filename);
+			
+			// Contains a path
+			if ([strPath rangeOfCharacterFromSet:[NSCharacterSet characterSetWithCharactersInString:@"/\\"]].location != NSNotFound) {
+				strPath = [strPath stringByReplacingOccurrencesOfString:@"\\" withString:@"/"];
+			}
+			
+			NSString *fullPath = [destination stringByAppendingPathComponent:strPath];
+			NSError *err = nil;
+	        NSDate *modDate = [[self class] _dateWithMSDOSFormat:(UInt32)fileInfo.dosDate];
+	        NSDictionary *directoryAttr = [NSDictionary dictionaryWithObjectsAndKeys:modDate, NSFileCreationDate, modDate, NSFileModificationDate, nil];
+			
+			if (isDirectory) {
+				[fileManager createDirectoryAtPath:fullPath withIntermediateDirectories:YES attributes:directoryAttr  error:&err];
+			} else {
+				[fileManager createDirectoryAtPath:[fullPath stringByDeletingLastPathComponent] withIntermediateDirectories:YES attributes:directoryAttr error:&err];
+			}
+	        if (nil != err) {
+	            NSLog(@"[SSZipArchive] Error: %@", err.localizedDescription);
+	        }
+	
+	        if(!fileIsSymbolicLink)
+	            [directoriesModificationDates addObject: [NSDictionary dictionaryWithObjectsAndKeys:fullPath, @"path", modDate, @"modDate", nil]];
+	
+	        if ([fileManager fileExistsAtPath:fullPath] && !isDirectory && !overwrite) {
+				unzCloseCurrentFile(zip);
+				ret = unzGoToNextFile(zip);
+				continue;
+			}
+	        
+			if(!fileIsSymbolicLink)
+	        {
+	            FILE *fp = fopen((const char*)[fullPath UTF8String], "wb");
+	            while (fp) {
+	                int readBytes = unzReadCurrentFile(zip, buffer, 4096);
+	
+	                if (readBytes > 0) {
+	                    fwrite(buffer, readBytes, 1, fp );
+	                } else {
+	                    break;
+	                }
+	            }
+	            
+	            if (fp) {
+	                fclose(fp);
+	                
+	                // Set the original datetime property
+	                if (fileInfo.dosDate != 0) {
+	                    NSDate *orgDate = [[self class] _dateWithMSDOSFormat:(UInt32)fileInfo.dosDate];
+	                    NSDictionary *attr = [NSDictionary dictionaryWithObject:orgDate forKey:NSFileModificationDate];
+	                    
+	                    if (attr) {
+	                        if ([fileManager setAttributes:attr ofItemAtPath:fullPath error:nil] == NO) {
+	                            // Can't set attributes 
+	                            NSLog(@"[SSZipArchive] Failed to set attributes - whilst setting modification date");
+	                        }
+	                    }
+	                }
+                    
+                    // Set the original permissions on the file
+                    uLong permissions = fileInfo.external_fa >> 16;
+                    if (permissions != 0) {
+                        // Store it into a NSNumber
+                        NSNumber *permissionsValue = @(permissions);
+                        
+                        // Retrieve any existing attributes
+                        NSMutableDictionary *attrs = [[NSMutableDictionary alloc] initWithDictionary:[fileManager attributesOfItemAtPath:fullPath error:nil]];
+                        
+                        // Set the value in the attributes dict
+                        attrs[NSFilePosixPermissions] = permissionsValue;
+                        
+                        // Update attributes
+                        if ([fileManager setAttributes:attrs ofItemAtPath:fullPath error:nil] == NO) {
+                            // Unable to set the permissions attribute
+                            NSLog(@"[SSZipArchive] Failed to set attributes - whilst setting permissions");
+                        }
+                    }
+	            }
+	        }
+	        else
+	        {
+	            // Get the path for the symbolic link
+	            
+	            NSURL* symlinkURL = [NSURL fileURLWithPath:fullPath];
+	            NSMutableString* destinationPath = [NSMutableString string];
+	            
+	            int bytesRead = 0;
+	            while((bytesRead = unzReadCurrentFile(zip, buffer, 4096)) > 0)
+	            {
+	                buffer[bytesRead] = 0;
+	                [destinationPath appendString:[NSString stringWithUTF8String:(const char*)buffer]];
+	            }
+	            
+	            //NSLog(@"Symlinking to: %@", destinationPath);
+	            
+	            NSURL* destinationURL = [NSURL fileURLWithPath:destinationPath];
+	            
+	            // Create the symbolic link
+	            NSError* symlinkError = nil;
+	            [fileManager createSymbolicLinkAtURL:symlinkURL withDestinationURL:destinationURL error:&symlinkError];
+	            
+	            if(symlinkError != nil)
+	            {
+	                NSLog(@"Failed to create symbolic link at \"%@\" to \"%@\". Error: %@", symlinkURL.absoluteString, destinationURL.absoluteString, symlinkError.localizedDescription);
+	            }
+	        }
+			
+			unzCloseCurrentFile( zip );
+			ret = unzGoToNextFile( zip );
+			
+			// Message delegate
+			if ([delegate respondsToSelector:@selector(zipArchiveDidUnzipFileAtIndex:totalFiles:archivePath:fileInfo:)]) {
+				[delegate zipArchiveDidUnzipFileAtIndex:currentFileNumber totalFiles:(NSInteger)globalInfo.number_entry
+											 archivePath:path fileInfo:fileInfo];
+			}
+			
+			currentFileNumber++;
+		}
+	} while(ret == UNZ_OK && ret != UNZ_END_OF_LIST_OF_FILE);
+	
+	// Close
+	unzClose(zip);
+	
+	// The process of decompressing the .zip archive causes the modification times on the folders
+    // to be set to the present time. So, when we are done, they need to be explicitly set.
+    // set the modification date on all of the directories.
+    NSError * err = nil;
+    for (NSDictionary * d in directoriesModificationDates) {
+        if (![[NSFileManager defaultManager] setAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[d objectForKey:@"modDate"], NSFileModificationDate, nil] ofItemAtPath:[d objectForKey:@"path"] error:&err]) {
+            NSLog(@"[SSZipArchive] Set attributes failed for directory: %@.", [d objectForKey:@"path"]);
+        }
+        if (err) {
+            NSLog(@"[SSZipArchive] Error setting directory file modification date attribute: %@",err.localizedDescription);
+        }
+    }
+	
+#if !__has_feature(objc_arc)
+	[directoriesModificationDates release];
+#endif
+	
+	// Message delegate
+	if (success && [delegate respondsToSelector:@selector(zipArchiveDidUnzipArchiveAtPath:zipInfo:unzippedPath:)]) {
+		[delegate zipArchiveDidUnzipArchiveAtPath:path zipInfo:globalInfo unzippedPath:destination];
+	}
+	
+	return success;
+}
+
+
+#pragma mark - Zipping
+
+ (BOOL)createZipFileAtPath:(NSString *)path withFilesAtPaths:(NSArray *)paths {
+	BOOL success = NO;
+	SSZipArchive *zipArchive = [[SSZipArchive alloc] initWithPath:path];
+	if ([zipArchive open]) {
+		for (NSString *path in paths) {
+			[zipArchive writeFile:path];
+		}
+		success = [zipArchive close];        
+	}
+	
+#if !__has_feature(objc_arc)
+	[zipArchive release];
+#endif
+
+	return success;
+}
+
+
+ (BOOL)createZipFileAtPath:(NSString *)path withContentsOfDirectory:(NSString *)directoryPath {
+    BOOL success = NO;
+    
+    NSFileManager *fileManager = nil;
+	SSZipArchive *zipArchive = [[SSZipArchive alloc] initWithPath:path];
+    
+	if ([zipArchive open]) {
+        // use a local filemanager (queue/thread compatibility)
+        fileManager = [[NSFileManager alloc] init];
+        NSDirectoryEnumerator *dirEnumerator = [fileManager enumeratorAtPath:directoryPath];
+        
+		NSString *fileName;
+        while ((fileName = [dirEnumerator nextObject])) {
+            BOOL isDir;
+            NSString *fullFilePath = [directoryPath stringByAppendingPathComponent:fileName];
+            [fileManager fileExistsAtPath:fullFilePath isDirectory:&isDir];
+            if (!isDir) {
+                [zipArchive writeFileAtPath:fullFilePath withFileName:fileName];
+            }
+        }
+        success = [zipArchive close];
+	}
+	
+#if !__has_feature(objc_arc)
+    [fileManager release];
+	[zipArchive release];
+#endif
+    
+	return success;
+}
+
+
+- (id)initWithPath:(NSString *)path {
+	if ((self = [super init])) {
+		_path = [path copy];
+	}
+	return self;
+}
+
+
+#if !__has_feature(objc_arc)
+- (void)dealloc {
+    [_path release];
+	[super dealloc];
+}
+#endif
+
+
+- (BOOL)open {    
+	NSAssert((_zip == NULL), @"Attempting open an archive which is already open");
+	_zip = zipOpen([_path UTF8String], APPEND_STATUS_CREATE);
+	return (NULL != _zip);
+}
+
+
+- (void)zipInfo:(zip_fileinfo*)zipInfo setDate:(NSDate*)date {
+    NSCalendar *currentCalendar = [NSCalendar currentCalendar];
+    uint flags = NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit;
+    NSDateComponents *components = [currentCalendar components:flags fromDate:date];
+    zipInfo->tmz_date.tm_sec = (unsigned int)components.second;
+    zipInfo->tmz_date.tm_min = (unsigned int)components.minute;
+    zipInfo->tmz_date.tm_hour = (unsigned int)components.hour;
+    zipInfo->tmz_date.tm_mday = (unsigned int)components.day;
+    zipInfo->tmz_date.tm_mon = (unsigned int)components.month - 1;
+    zipInfo->tmz_date.tm_year = (unsigned int)components.year;
+}
+
+
+- (BOOL)writeFile:(NSString *)path
+{
+    return [self writeFileAtPath:path withFileName:nil];
+}
+
+// supports writing files with logical folder/directory structure
+// *path* is the absolute path of the file that will be compressed
+// *fileName* is the relative name of the file how it is stored within the zip e.g. /folder/subfolder/text1.txt
+- (BOOL)writeFileAtPath:(NSString *)path withFileName:(NSString *)fileName {
+    NSAssert((_zip != NULL), @"Attempting to write to an archive which was never opened");
+    
+	FILE *input = fopen([path UTF8String], "r");
+	if (NULL == input) {
+		return NO;
+	}
+    
+    const char *afileName;
+    if (!fileName) {
+        afileName = [path.lastPathComponent UTF8String];
+    }
+    else {
+        afileName = [fileName UTF8String];
+    }
+    
+    zip_fileinfo zipInfo = {{0}};
+
+    NSDictionary *attr = [[NSFileManager defaultManager] attributesOfItemAtPath:path error: nil];
+    if( attr )
+    {
+        NSDate *fileDate = (NSDate *)[attr objectForKey:NSFileModificationDate];
+        if( fileDate )
+        {
+            [self zipInfo:&zipInfo setDate: fileDate ];
+        }
+        
+        // Write permissions into the external attributes, for details on this see here: http://unix.stackexchange.com/a/14727
+        // Get the permissions value from the files attributes
+        NSNumber *permissionsValue = (NSNumber *)[attr objectForKey:NSFilePosixPermissions];
+        if (permissionsValue) {
+            // Get the short value for the permissions
+            short permissionsShort = permissionsValue.shortValue;
+            
+            // Convert this into an octal by adding 010000, 010000 being the flag for a regular file
+            NSInteger permissionsOctal = 0100000 + permissionsShort;
+            
+            // Convert this into a long value
+            uLong permissionsLong = @(permissionsOctal).unsignedLongValue;
+            
+            // Store this into the external file attributes once it has been shifted 16 places left to form part of the second from last byte
+            zipInfo.external_fa = permissionsLong << 16L;
+        }
+    }
+	
+    zipOpenNewFileInZip(_zip, afileName, &zipInfo, NULL, 0, NULL, 0, NULL, Z_DEFLATED, Z_DEFAULT_COMPRESSION);
+    
+	void *buffer = malloc(CHUNK);
+	unsigned int len = 0;
+	
+    while (!feof(input))
+    {
+		len = (unsigned int) fread(buffer, 1, CHUNK, input);
+		zipWriteInFileInZip(_zip, buffer, len);
+	}
+    
+	zipCloseFileInZip(_zip);
+	free(buffer);
+	fclose(input);
+	return YES;
+}
+
+
+- (BOOL)writeData:(NSData *)data filename:(NSString *)filename {
+    if (!_zip) {
+		return NO;
+    }
+    if (!data) {
+		return NO;
+    }
+    zip_fileinfo zipInfo = {{0,0,0,0,0,0},0,0,0};
+    [self zipInfo:&zipInfo setDate:[NSDate date]];
+
+	zipOpenNewFileInZip(_zip, [filename UTF8String], &zipInfo, NULL, 0, NULL, 0, NULL, Z_DEFLATED, Z_DEFAULT_COMPRESSION);
+
+    zipWriteInFileInZip(_zip, data.bytes, (unsigned int)data.length);
+
+	zipCloseFileInZip(_zip);
+	return YES;
+}
+
+
+- (BOOL)close {    
+	NSAssert((_zip != NULL), @"[SSZipArchive] Attempting to close an archive which was never opened");
+	zipClose(_zip, NULL);
+	return YES;
+}
+
+
+#pragma mark - Private
+
+// Format from http://newsgroups.derkeiler.com/Archive/Comp/comp.os.msdos.programmer/2009-04/msg00060.html
+// Two consecutive words, or a longword, YYYYYYYMMMMDDDDD hhhhhmmmmmmsssss
+// YYYYYYY is years from 1980 = 0
+// sssss is (seconds/2).
+//
+// 3658 = 0011 0110 0101 1000 = 0011011 0010 11000 = 27 2 24 = 2007-02-24
+// 7423 = 0111 0100 0010 0011 - 01110 100001 00011 = 14 33 2 = 14:33:06
+ (NSDate *)_dateWithMSDOSFormat:(UInt32)msdosDateTime {
+	static const UInt32 kYearMask = 0xFE000000;
+	static const UInt32 kMonthMask = 0x1E00000;
+	static const UInt32 kDayMask = 0x1F0000;
+	static const UInt32 kHourMask = 0xF800;
+	static const UInt32 kMinuteMask = 0x7E0;
+	static const UInt32 kSecondMask = 0x1F;
+	
+	static NSCalendar *gregorian;
+	static dispatch_once_t onceToken;
+	dispatch_once(&onceToken, ^{
+		gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+	});
+    
+    NSDateComponents *components = [[NSDateComponents alloc] init];
+
+    NSAssert(0xFFFFFFFF == (kYearMask | kMonthMask | kDayMask | kHourMask | kMinuteMask | kSecondMask), @"[SSZipArchive] MSDOS date masks don't add up");
+	    
+    [components setYear:1980 + ((msdosDateTime & kYearMask) >> 25)];
+    [components setMonth:(msdosDateTime & kMonthMask) >> 21];
+    [components setDay:(msdosDateTime & kDayMask) >> 16];
+    [components setHour:(msdosDateTime & kHourMask) >> 11];
+    [components setMinute:(msdosDateTime & kMinuteMask) >> 5];
+    [components setSecond:(msdosDateTime & kSecondMask) * 2];
+    
+    NSDate *date = [NSDate dateWithTimeInterval:0 sinceDate:[gregorian dateFromComponents:components]];
+	
+#if !__has_feature(objc_arc)
+	[components release];
+#endif
+	
+	return date;
+}
+
+@end
--- a/SSZipArchive/minizip/crypt.h
+++ b/SSZipArchive/minizip/crypt.h
--- a/SSZipArchive/minizip/ioapi.c
+++ b/SSZipArchive/minizip/ioapi.c
--- a/SSZipArchive/minizip/ioapi.h
+++ b/SSZipArchive/minizip/ioapi.h
--- a/SSZipArchive/minizip/mztools.c
+++ b/SSZipArchive/minizip/mztools.c
--- a/SSZipArchive/minizip/mztools.h
+++ b/SSZipArchive/minizip/mztools.h
--- a/SSZipArchive/minizip/unzip.c
+++ b/SSZipArchive/minizip/unzip.c
--- a/SSZipArchive/minizip/unzip.h
+++ b/SSZipArchive/minizip/unzip.h
--- a/SSZipArchive/minizip/zip.c
+++ b/SSZipArchive/minizip/zip.c
--- a/SSZipArchive/minizip/zip.h
+++ b/SSZipArchive/minizip/zip.h
--- a/Tests/Fixtures/IncorrectHeaders.zip
+++ b/Tests/Fixtures/IncorrectHeaders.zip
--- a/Tests/Fixtures/PermissionsTestApp.app/Contents/Info.plist
+++ b/Tests/Fixtures/PermissionsTestApp.app/Contents/Info.plist
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>13A476u</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>TestProject</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.squaredtiki.TestProject</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>TestProject</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>5A11314m</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>13A476n</string>
+	<key>DTSDKName</key>
+	<string>macosx10.9</string>
+	<key>DTXcode</key>
+	<string>0500</string>
+	<key>DTXcodeBuild</key>
+	<string>5A11314m</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.9</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2013 TestBench. All rights reserved.</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
--- a/Tests/Fixtures/PermissionsTestApp.app/Contents/MacOS/TestProject
+++ b/Tests/Fixtures/PermissionsTestApp.app/Contents/MacOS/TestProject
--- a/Tests/Fixtures/PermissionsTestApp.app/Contents/PkgInfo
+++ b/Tests/Fixtures/PermissionsTestApp.app/Contents/PkgInfo
@@ -0,0 +1 @@
+APPL????
--- a/Tests/Fixtures/PermissionsTestApp.app/Contents/Resources/Assets.car
+++ b/Tests/Fixtures/PermissionsTestApp.app/Contents/Resources/Assets.car
--- a/Tests/Fixtures/PermissionsTestApp.app/Contents/Resources/Base.lproj/MainMenu.nib
+++ b/Tests/Fixtures/PermissionsTestApp.app/Contents/Resources/Base.lproj/MainMenu.nib
--- a/Tests/Fixtures/PermissionsTestApp.app/Contents/Resources/en.lproj/Credits.rtf
+++ b/Tests/Fixtures/PermissionsTestApp.app/Contents/Resources/en.lproj/Credits.rtf
@@ -0,0 +1,29 @@
+{\rtf0\ansi{\fonttbl\f0\fswiss Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\paperw9840\paperh8400
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs24 \cf0 Engineering:
+\b0 \
+	Some people\
+\
+
+\b Human Interface Design:
+\b0 \
+	Some other people\
+\
+
+\b Testing:
+\b0 \
+	Hopefully not nobody\
+\
+
+\b Documentation:
+\b0 \
+	Whoever\
+\
+
+\b With special thanks to:
+\b0 \
+	Mom\
+}
--- a/Tests/Fixtures/PermissionsTestApp.app/Contents/Resources/en.lproj/InfoPlist.strings
+++ b/Tests/Fixtures/PermissionsTestApp.app/Contents/Resources/en.lproj/InfoPlist.strings
--- a/Tests/Fixtures/SymbolicLink.zip
+++ b/Tests/Fixtures/SymbolicLink.zip
--- a/Tests/Fixtures/TestArchive.zip
+++ b/Tests/Fixtures/TestArchive.zip
--- a/Tests/Fixtures/TestPasswordArchive.zip
+++ b/Tests/Fixtures/TestPasswordArchive.zip
--- a/Tests/Fixtures/Unicode.zip
+++ b/Tests/Fixtures/Unicode.zip
--- a/Tests/SSZipArchive.xcodeproj/project.pbxproj
+++ b/Tests/SSZipArchive.xcodeproj/project.pbxproj
@@ -1,322 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		B215FB32143AD3C7003AC546 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B215FB31143AD3C7003AC546 /* SenTestingKit.framework */; };
-		B215FB63143AD514003AC546 /* SSZipArchiveTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B215FB61143AD514003AC546 /* SSZipArchiveTests.m */; };
-		B215FB65143AD527003AC546 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B215FB64143AD527003AC546 /* libz.dylib */; };
-		B215FB66143AD52D003AC546 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B215FB18143AD3C7003AC546 /* Foundation.framework */; };
-		B215FB67143AD56D003AC546 /* SSZipArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = B215FB58143AD460003AC546 /* SSZipArchive.m */; };
-		B215FB68143AD576003AC546 /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = B215FB4F143AD460003AC546 /* ioapi.c */; };
-		B215FB69143AD576003AC546 /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = B215FB51143AD460003AC546 /* mztools.c */; };
-		B215FB6A143AD576003AC546 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = B215FB53143AD460003AC546 /* unzip.c */; };
-		B215FB6B143AD576003AC546 /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = B215FB55143AD460003AC546 /* zip.c */; };
-		B215FB6D143AD6FF003AC546 /* TestArchive.zip in Resources */ = {isa = PBXBuildFile; fileRef = B215FB6C143AD6FF003AC546 /* TestArchive.zip */; };
-		B2283D5D155AD80F00F9395A /* Unicode.zip in Resources */ = {isa = PBXBuildFile; fileRef = B2283D5C155AD80F00F9395A /* Unicode.zip */; };
-		B23FCC7F1558F1B70026375C /* TestPasswordArchive.zip in Resources */ = {isa = PBXBuildFile; fileRef = B23FCC7E1558F1B70026375C /* TestPasswordArchive.zip */; };
-		C5AE4E64155A12760045F3ED /* IncorrectHeaders.zip in Resources */ = {isa = PBXBuildFile; fileRef = C5AE4E63155A12760045F3ED /* IncorrectHeaders.zip */; };
-		C5AE4E6D155A8B010045F3ED /* SymbolicLink.zip in Resources */ = {isa = PBXBuildFile; fileRef = C5AE4E6C155A8B010045F3ED /* SymbolicLink.zip */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
-		B215FB18143AD3C7003AC546 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		B215FB30143AD3C7003AC546 /* SSZipArchiveTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SSZipArchiveTests.octest; sourceTree = BUILT_PRODUCTS_DIR; };
-		B215FB31143AD3C7003AC546 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
-		B215FB4E143AD460003AC546 /* crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypt.h; sourceTree = "<group>"; };
-		B215FB4F143AD460003AC546 /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ioapi.c; sourceTree = "<group>"; };
-		B215FB50143AD460003AC546 /* ioapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ioapi.h; sourceTree = "<group>"; };
-		B215FB51143AD460003AC546 /* mztools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mztools.c; sourceTree = "<group>"; };
-		B215FB52143AD460003AC546 /* mztools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mztools.h; sourceTree = "<group>"; };
-		B215FB53143AD460003AC546 /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unzip.c; sourceTree = "<group>"; };
-		B215FB54143AD460003AC546 /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unzip.h; sourceTree = "<group>"; };
-		B215FB55143AD460003AC546 /* zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zip.c; sourceTree = "<group>"; };
-		B215FB56143AD460003AC546 /* zip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zip.h; sourceTree = "<group>"; };
-		B215FB57143AD460003AC546 /* SSZipArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SSZipArchive.h; path = ../SSZipArchive.h; sourceTree = "<group>"; };
-		B215FB58143AD460003AC546 /* SSZipArchive.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SSZipArchive.m; path = ../SSZipArchive.m; sourceTree = "<group>"; };
-		B215FB5F143AD514003AC546 /* SSZipArchiveTests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SSZipArchiveTests-Info.plist"; sourceTree = "<group>"; };
-		B215FB61143AD514003AC546 /* SSZipArchiveTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSZipArchiveTests.m; sourceTree = "<group>"; };
-		B215FB64143AD527003AC546 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
-		B215FB6C143AD6FF003AC546 /* TestArchive.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = TestArchive.zip; sourceTree = "<group>"; };
-		B2283D5C155AD80F00F9395A /* Unicode.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = Unicode.zip; sourceTree = "<group>"; };
-		B23FCC7E1558F1B70026375C /* TestPasswordArchive.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = TestPasswordArchive.zip; sourceTree = "<group>"; };
-		C5AE4E63155A12760045F3ED /* IncorrectHeaders.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = IncorrectHeaders.zip; sourceTree = "<group>"; };
-		C5AE4E6C155A8B010045F3ED /* SymbolicLink.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = SymbolicLink.zip; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		B215FB2C143AD3C7003AC546 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				B215FB65143AD527003AC546 /* libz.dylib in Frameworks */,
-				B215FB66143AD52D003AC546 /* Foundation.framework in Frameworks */,
-				B215FB32143AD3C7003AC546 /* SenTestingKit.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		B215FB04143AD3C7003AC546 = {
-			isa = PBXGroup;
-			children = (
-				B215FB4B143AD449003AC546 /* SSZipArchive */,
-				B215FB5E143AD505003AC546 /* SSZipArchiveTests */,
-				B215FB12143AD3C7003AC546 /* Frameworks */,
-				B215FB10143AD3C7003AC546 /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		B215FB10143AD3C7003AC546 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				B215FB30143AD3C7003AC546 /* SSZipArchiveTests.octest */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		B215FB12143AD3C7003AC546 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				B215FB64143AD527003AC546 /* libz.dylib */,
-				B215FB31143AD3C7003AC546 /* SenTestingKit.framework */,
-				B215FB18143AD3C7003AC546 /* Foundation.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		B215FB4B143AD449003AC546 /* SSZipArchive */ = {
-			isa = PBXGroup;
-			children = (
-				B215FB57143AD460003AC546 /* SSZipArchive.h */,
-				B215FB58143AD460003AC546 /* SSZipArchive.m */,
-				B215FB4D143AD460003AC546 /* minizip */,
-			);
-			name = SSZipArchive;
-			sourceTree = "<group>";
-		};
-		B215FB4D143AD460003AC546 /* minizip */ = {
-			isa = PBXGroup;
-			children = (
-				B215FB4E143AD460003AC546 /* crypt.h */,
-				B215FB4F143AD460003AC546 /* ioapi.c */,
-				B215FB50143AD460003AC546 /* ioapi.h */,
-				B215FB51143AD460003AC546 /* mztools.c */,
-				B215FB52143AD460003AC546 /* mztools.h */,
-				B215FB53143AD460003AC546 /* unzip.c */,
-				B215FB54143AD460003AC546 /* unzip.h */,
-				B215FB55143AD460003AC546 /* zip.c */,
-				B215FB56143AD460003AC546 /* zip.h */,
-			);
-			name = minizip;
-			path = ../minizip;
-			sourceTree = "<group>";
-		};
-		B215FB5E143AD505003AC546 /* SSZipArchiveTests */ = {
-			isa = PBXGroup;
-			children = (
-				B2283D5C155AD80F00F9395A /* Unicode.zip */,
-				B215FB61143AD514003AC546 /* SSZipArchiveTests.m */,
-				B215FB5F143AD514003AC546 /* SSZipArchiveTests-Info.plist */,
-				C5AE4E63155A12760045F3ED /* IncorrectHeaders.zip */,
-				B215FB6C143AD6FF003AC546 /* TestArchive.zip */,
-				B23FCC7E1558F1B70026375C /* TestPasswordArchive.zip */,
-				C5AE4E6C155A8B010045F3ED /* SymbolicLink.zip */,
-			);
-			name = SSZipArchiveTests;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		B215FB2F143AD3C7003AC546 /* SSZipArchiveTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = B215FB44143AD3C7003AC546 /* Build configuration list for PBXNativeTarget "SSZipArchiveTests" */;
-			buildPhases = (
-				B215FB2B143AD3C7003AC546 /* Sources */,
-				B215FB2C143AD3C7003AC546 /* Frameworks */,
-				B215FB2D143AD3C7003AC546 /* Resources */,
-				B215FB2E143AD3C7003AC546 /* ShellScript */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = SSZipArchiveTests;
-			productName = SSZipArchiveTests;
-			productReference = B215FB30143AD3C7003AC546 /* SSZipArchiveTests.octest */;
-			productType = "com.apple.product-type.bundle";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		B215FB06143AD3C7003AC546 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0440;
-				ORGANIZATIONNAME = "Sam Soffes";
-			};
-			buildConfigurationList = B215FB09143AD3C7003AC546 /* Build configuration list for PBXProject "SSZipArchive" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-			);
-			mainGroup = B215FB04143AD3C7003AC546;
-			productRefGroup = B215FB10143AD3C7003AC546 /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				B215FB2F143AD3C7003AC546 /* SSZipArchiveTests */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		B215FB2D143AD3C7003AC546 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				B215FB6D143AD6FF003AC546 /* TestArchive.zip in Resources */,
-				B23FCC7F1558F1B70026375C /* TestPasswordArchive.zip in Resources */,
-				C5AE4E64155A12760045F3ED /* IncorrectHeaders.zip in Resources */,
-				C5AE4E6D155A8B010045F3ED /* SymbolicLink.zip in Resources */,
-				B2283D5D155AD80F00F9395A /* Unicode.zip in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		B215FB2E143AD3C7003AC546 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		B215FB2B143AD3C7003AC546 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				B215FB63143AD514003AC546 /* SSZipArchiveTests.m in Sources */,
-				B215FB67143AD56D003AC546 /* SSZipArchive.m in Sources */,
-				B215FB68143AD576003AC546 /* ioapi.c in Sources */,
-				B215FB69143AD576003AC546 /* mztools.c in Sources */,
-				B215FB6A143AD576003AC546 /* unzip.c in Sources */,
-				B215FB6B143AD576003AC546 /* zip.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-		B215FB3F143AD3C7003AC546 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = macosx;
-			};
-			name = Debug;
-		};
-		B215FB40143AD3C7003AC546 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				SDKROOT = macosx;
-			};
-			name = Release;
-		};
-		B215FB45143AD3C7003AC546 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
-				INFOPLIST_FILE = "SSZipArchiveTests-Info.plist";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TEST_HOST = "$(BUNDLE_LOADER)";
-				WRAPPER_EXTENSION = octest;
-			};
-			name = Debug;
-		};
-		B215FB46143AD3C7003AC546 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
-				INFOPLIST_FILE = "SSZipArchiveTests-Info.plist";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TEST_HOST = "$(BUNDLE_LOADER)";
-				WRAPPER_EXTENSION = octest;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		B215FB09143AD3C7003AC546 /* Build configuration list for PBXProject "SSZipArchive" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				B215FB3F143AD3C7003AC546 /* Debug */,
-				B215FB40143AD3C7003AC546 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		B215FB44143AD3C7003AC546 /* Build configuration list for PBXNativeTarget "SSZipArchiveTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				B215FB45143AD3C7003AC546 /* Debug */,
-				B215FB46143AD3C7003AC546 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = B215FB06143AD3C7003AC546 /* Project object */;
-}
--- a/Tests/SSZipArchiveTests.m
+++ b/Tests/SSZipArchiveTests.m
@@ -7,35 +7,47 @@
 //

 #import "SSZipArchive.h"
-#import <SenTestingKit/SenTestingKit.h>
+#import <XCTest/XCTest.h>
 #import <CommonCrypto/CommonDigest.h>

-@interface SSZipArchiveTests : SenTestCase <SSZipArchiveDelegate>
-
- (NSString *)_cachesPath:(NSString *)directory;
-
- (NSString *)_calculateMD5Digest:(NSData *)data;
-
+@interface SSZipArchiveTests : XCTestCase <SSZipArchiveDelegate>
@end

@implementation SSZipArchiveTests

-//- (void)setUp {
-//	[[NSFileManager defaultManager] removeItemAtPath:[self _cachesPath:nil] error:nil];
-//}
+- (void)tearDown {
+	[super tearDown];
+	[[NSFileManager defaultManager] removeItemAtPath:[self _cachesPath:nil] error:nil];
+}


 - (void)testZipping {
-	NSString *outputPath = [self _cachesPath:@"Zipped"];
+    // use extracted files from [-testUnzipping]
+	NSString *inputPath = [self _cachesPath:@"Regular"];
 	NSArray *inputPaths = [NSArray arrayWithObjects:
-						   [outputPath stringByAppendingPathComponent:@"Readme.markdown"],
-						   [outputPath stringByAppendingPathComponent:@"LICENSE"],
+						   [inputPath stringByAppendingPathComponent:@"Readme.markdown"],
+						   [inputPath stringByAppendingPathComponent:@"LICENSE"],
 	nil];
+    
+    NSString *outputPath = [self _cachesPath:@"Zipped"];
+    
 	NSString *archivePath = [outputPath stringByAppendingPathComponent:@"CreatedArchive.zip"];
 	[SSZipArchive createZipFileAtPath:archivePath withFilesAtPaths:inputPaths];

 	// TODO: Make sure the files are actually unzipped. They are, but the test should be better.
-	STAssertTrue([[NSFileManager defaultManager] fileExistsAtPath:archivePath], @"Archive created");
+	XCTAssertTrue([[NSFileManager defaultManager] fileExistsAtPath:archivePath], @"Archive created");
+}
+
+
+- (void)testDirectoryZipping {
+    // use Unicode as folder (has a file in root and a file in subfolder)
+    NSString *inputPath = [self _cachesPath:@"Unicode"];
+    
+    NSString *outputPath = [self _cachesPath:@"FolderZipped"];
+    NSString *archivePath = [outputPath stringByAppendingPathComponent:@"ArchiveWithFolders.zip"];
+    
+    [SSZipArchive createZipFileAtPath:archivePath withContentsOfDirectory:inputPath];
+    XCTAssertTrue([[NSFileManager defaultManager] fileExistsAtPath:archivePath], @"Folder Archive created");
 }


@@ -47,10 +59,10 @@
 	
 	NSFileManager *fileManager = [NSFileManager defaultManager];
 	NSString *testPath = [outputPath stringByAppendingPathComponent:@"Readme.markdown"];
-	STAssertTrue([fileManager fileExistsAtPath:testPath], @"Readme unzipped");
+	XCTAssertTrue([fileManager fileExistsAtPath:testPath], @"Readme unzipped");
 	
 	testPath = [outputPath stringByAppendingPathComponent:@"LICENSE"];
-	STAssertTrue([fileManager fileExistsAtPath:testPath], @"LICENSE unzipped");
+	XCTAssertTrue([fileManager fileExistsAtPath:testPath], @"LICENSE unzipped");
 }


@@ -63,12 +75,13 @@
 	
 	NSFileManager *fileManager = [NSFileManager defaultManager];
 	NSString *testPath = [outputPath stringByAppendingPathComponent:@"Readme.markdown"];
-	STAssertTrue([fileManager fileExistsAtPath:testPath], @"Readme unzipped");
+	XCTAssertTrue([fileManager fileExistsAtPath:testPath], @"Readme unzipped");
 	
 	testPath = [outputPath stringByAppendingPathComponent:@"LICENSE"];
-	STAssertTrue([fileManager fileExistsAtPath:testPath], @"LICENSE unzipped");
+	XCTAssertTrue([fileManager fileExistsAtPath:testPath], @"LICENSE unzipped");
 }

+
 - (void)testUnzippingTruncatedFileFix {
    NSString* zipPath = [[NSBundle bundleForClass:[self class]] pathForResource:@"IncorrectHeaders" ofType:@"zip"];
    NSString* outputPath = [self _cachesPath:@"IncorrectHeaders"];
@@ -81,9 +94,10 @@
    NSData* data = [NSData dataWithContentsOfFile:filePath];
    
    NSString* actualReadmeTxtMD5 = [self _calculateMD5Digest:data];
-    STAssertTrue([actualReadmeTxtMD5 isEqualToString:intendedReadmeTxtMD5], @"Readme.txt MD5 digest should match original.");
+    XCTAssertTrue([actualReadmeTxtMD5 isEqualToString:intendedReadmeTxtMD5], @"Readme.txt MD5 digest should match original.");
 }

+
 - (void)testUnzippingWithSymlinkedFileInside {
    
    NSString* zipPath = [[NSBundle bundleForClass:[self class]] pathForResource:@"SymbolicLink" ofType:@"zip"];
@@ -103,9 +117,10 @@
    NSString *symlinkFilePath = [[NSFileManager defaultManager] destinationOfSymbolicLinkAtPath:testSymlinkFile error:&error];
    bool symbolicLinkToFilePersists = ((symlinkFilePath != nil) && [symlinkFilePath isEqualToString:@"/Applications/GitHub.app/Contents/Resources/AppIcon.icns"]) && (error == nil);
    
-    STAssertTrue(symbolicLinkToFilePersists && symbolicLinkToFolderPersists, @"Symbolic links should persist from the original archive to the outputted files.");
+    XCTAssertTrue(symbolicLinkToFilePersists && symbolicLinkToFolderPersists, @"Symbolic links should persist from the original archive to the outputted files.");
 }

+
 - (void)testUnzippingWithUnicodeFilenameInside {
    
    NSString* zipPath = [[NSBundle bundleForClass:[self class]] pathForResource:@"Unicode" ofType:@"zip"];
@@ -117,8 +132,70 @@
    
    bool unicodeFolderWasExtracted = [[NSFileManager defaultManager] fileExistsAtPath:[outputPath stringByAppendingPathComponent:@"Fólder/Nothing.txt"]];
    
-    STAssertTrue(unicodeFilenameWasExtracted, @"Files with filenames in unicode should be extracted properly.");
-    STAssertTrue(unicodeFolderWasExtracted, @"Folders with names in unicode should be extracted propertly.");
+    XCTAssertTrue(unicodeFilenameWasExtracted, @"Files with filenames in unicode should be extracted properly.");
+    XCTAssertTrue(unicodeFolderWasExtracted, @"Folders with names in unicode should be extracted propertly.");
+}
+
+
+- (void)testZippingAndUnzippingForDate {
+
+	NSString *inputPath = [self _cachesPath:@"Regular"];
+	NSArray *inputPaths = [NSArray arrayWithObjects:
+						   [inputPath stringByAppendingPathComponent:@"Readme.markdown"],
+						   nil];
+    
+	NSDictionary *originalFileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:[inputPath stringByAppendingPathComponent:@"Readme.markdown"] error:nil];
+
+    NSString *outputPath = [self _cachesPath:@"ZippedDate"];
+	NSString *archivePath = [outputPath stringByAppendingPathComponent:@"CreatedArchive.zip"];
+	
+	[SSZipArchive createZipFileAtPath:archivePath withFilesAtPaths:inputPaths];
+	[SSZipArchive unzipFileAtPath:archivePath toDestination:outputPath delegate:self];
+	
+	NSDictionary *createdFileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:[outputPath stringByAppendingPathComponent:@"Readme.markdown"] error:nil];
+
+	XCTAssertEqualObjects(originalFileAttributes[NSFileCreationDate], createdFileAttributes[@"NSFileCreationDate"], @"Orginal file creationDate should match created one");
+}
+
+
+- (void)testZippingAndUnzippingForPermissions {
+    // File we're going to test permissions on before and after zipping
+    NSString *targetFile = @"/Contents/MacOS/TestProject";
+    
+    
+    /********** Zipping ********/
+    
+    // The .app file we're going to zip up
+    NSString *inputFile = [[NSBundle mainBundle] pathForResource:@"PermissionsTestApp" ofType:@"app"];
+
+    // The path to the target file in the app before zipping
+    NSString *targetFilePreZipPath = [inputFile stringByAppendingPathComponent:targetFile];
+    
+    // Atribtues for the target file before zipping
+    NSDictionary *preZipAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:targetFilePreZipPath error:nil];
+    
+    // Directory to output our created zip file
+    NSString *outputDir = [self _cachesPath:@"PermissionsTest"];
+    // The path to where the archive shall be created
+    NSString *archivePath = [outputDir stringByAppendingPathComponent:@"TestAppArchive.zip"];
+    
+    // Create the zip file using the contents of the .app file as the input
+    [SSZipArchive createZipFileAtPath:archivePath withContentsOfDirectory:inputFile];
+    
+    
+    /********** Un-zipping *******/
+    
+    // Using this newly created zip file, unzip it
+    [SSZipArchive unzipFileAtPath:archivePath toDestination:outputDir];
+    
+    // Get the path to the target file after unzipping
+    NSString *targetFilePath = [outputDir stringByAppendingPathComponent:@"/Contents/MacOS/TestProject"];
+    
+    // Get the file attributes of the target file following the unzipping
+    NSDictionary *fileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:targetFilePath error:nil];
+    
+    // Compare the value of the permissions attribute to assert equality
+    XCTAssertEqual(fileAttributes[NSFilePosixPermissions], preZipAttributes[NSFilePosixPermissions], @"File permissions should be retained during compression and de-compression");
 }

 // Commented out to avoid checking in several gig file into the repository. Simply add a file named
@@ -145,12 +222,12 @@


 - (void)zipArchiveWillUnzipFileAtIndex:(NSInteger)fileIndex totalFiles:(NSInteger)totalFiles archivePath:(NSString *)archivePath fileInfo:(unz_file_info)fileInfo {
-	NSLog(@"*** zipArchiveWillUnzipFileAtIndex: `%ld` totalFiles: `%ld` archivePath: `%@` fileInfo:", fileIndex, totalFiles, archivePath);
+	NSLog(@"*** zipArchiveWillUnzipFileAtIndex: `%d` totalFiles: `%d` archivePath: `%@` fileInfo:", fileIndex, totalFiles, archivePath);
 }


 - (void)zipArchiveDidUnzipFileAtIndex:(NSInteger)fileIndex totalFiles:(NSInteger)totalFiles archivePath:(NSString *)archivePath fileInfo:(unz_file_info)fileInfo {
-	NSLog(@"*** zipArchiveDidUnzipFileAtIndex: `%ld` totalFiles: `%ld` archivePath: `%@` fileInfo:", fileIndex, totalFiles, archivePath);
+	NSLog(@"*** zipArchiveDidUnzipFileAtIndex: `%d` totalFiles: `%d` archivePath: `%@` fileInfo:", fileIndex, totalFiles, archivePath);
 }
Author	SHA1	Message	Date
Sam Soffes	6ca6e0c28f	Version 0.3.0	2013-09-07 08:52:49 -07:00
Sam Soffes	07cfb62107	Update readme	2013-09-07 08:38:55 -07:00
Sam Soffes	364be2ed4f	Restructure project and move to XCTest	2013-09-07 08:33:47 -07:00
Sam Soffes	524ca1abae	Add missing `fclose`. Thanks @aceisScope!	2013-09-07 08:22:56 -07:00
Sam Soffes	c81002605b	Version 0.2.5	2013-07-16 10:20:46 -04:00
Sam Soffes	5227bb251b	Merge pull request #68 from marcelofabri/master Fixing compilation error (missing ";")	2013-07-12 15:34:05 -07:00
Marcelo Fabri	3bb7fe8d26	Adding missing ";". Fixes syntax error.	2013-07-12 19:31:18 -03:00
Sam Soffes	21c3694d0c	Merge pull request #67 from ChristopherRogers/master NSCalendar caching	2013-07-12 08:27:07 -07:00
Rogers, Christopher	84c8171151	Caching Gregorian NSCalendar for performance. This was taking about 30% of the time unzipping on an iPhone 5.	2013-07-12 17:28:18 +09:00
Sam Soffes	f9136dd744	Merge pull request #65 from nibroc/master Added check to ensure permissions are not explicitly set if they do not exist in the zip	2013-07-10 17:50:20 -07:00
Sam Soffes	d7ac059a8a	Version 0.2.4	2013-07-03 08:58:01 -07:00
Corbin Hughes	adfc3cae92	Added a check to make sure 0 permissions are not set	2013-07-01 04:55:42 -05:00
Joshua Garnham	9d322d173f	Added tests for compressing and uncompressing files with permissions	2013-06-26 12:16:29 +01:00
Joshua Garnham	c91865d01b	Adds support for maintaining file permissions when compressing and decompressing	2013-06-25 17:11:08 +01:00
frytaz	548b3acbba	Fix for file creation date + tests	2013-06-25 13:45:30 +02:00
djskinner	7627a1b4fc	wrapped main loop in @autorelease pool Massively reduces the memory overhead whilst unzipping	2013-06-17 15:33:44 +02:00
Sam Soffes	481ddf2096	Merge pull request #53 from randomsequence/master Fix NSFileManager leak when building without ARC	2013-05-03 06:15:24 -07:00
Johnnie Walker	b078433f2e	Fix warning with -Widiomatic-parentheses enabled	2013-05-01 12:38:44 +01:00
Johnnie Walker	ceae6ae819	Fix warning with -Wmissing-braces enabled	2013-05-01 12:36:32 +01:00
Johnnie Walker	d7c7955cdc	Fix NSFileManager leak when building without ARC	2013-05-01 12:03:48 +01:00
Sam Soffes	ffbacdb288	Merge pull request #51 from carlj/master Notice file date when save file	2013-04-23 02:03:25 -07:00
Carl Jahn	4ac78e3121	fixed bug: writeFileAtPath now notice the file date	2013-04-19 15:05:54 +02:00
Sam Soffes	b4fa2e4739	Merge pull request #44 from iggycoder/master zipping folders	2013-03-09 09:40:39 -08:00
Ingmar	7aea62f0dd	- add folder zipping functionality - fixed zipping test case [testZipping] (zipped an empty archive)	2013-03-09 05:36:20 -08:00
Sam Soffes	798a317bdc	Merge pull request #40 from Keithbsmiley/master Podspec fix	2013-03-03 10:55:22 -08:00
Sam Soffes	ec5de8e02b	Merge pull request #43 from levigroker/master #define added to the .h which allows conditional compilation for third parties wishing to conditionally add functionality based on the presence of SSZipArchive.	2013-03-03 10:53:15 -08:00
Levi Brown	a15c76e057	Fixed podspec. Signed-off-by: Levi Brown <levi@grokers.net>	2013-03-01 17:17:35 -07:00
Levi Brown	f7266f6b4d	Adding #define of SSZipArchive header inclusion to allow for conditional compilation of libraries which can add functionality conditionally, if SSZipArchive is present. Signed-off-by: Levi Brown <levi@grokers.net>	2013-03-01 14:40:28 -07:00
Sam Soffes	d6f5b1c7a3	Update readme	2013-02-25 16:09:47 -08:00
Sam Soffes	2f05d42988	Add Travis CI	2013-02-25 06:46:56 -05:00
Sam Soffes	d630ae5f5e	Merge pull request #41 from xenosoz/master This fixes a small typo.	2013-02-24 16:11:58 -08:00
Xenosoz Hwang	04605b7967	Fix bad loop end condition for unzip.	2013-02-24 10:40:21 -08:00
Keith Smiley	294cd2992b	Fixed podspec	2013-02-07 11:45:12 -05:00
Sam Soffes	a311e60107	Version 0.2.3 * Update podspec * Fix remote * Bump year * Release changes since last release	2013-01-29 01:54:19 -05:00
Sam Soffes	69fb8f4a4c	Merge pull request #34 from cvisprogrammer/master added fclose to writeFile	2013-01-18 08:14:24 -08:00
Farooq Ahmad	1d163e4db5	Added fclose to writeFile need fclose to avoid running out of file handles	2012-11-28 09:16:10 -08:00