CCPackage with install data now.

Author: NickyWeber

UnitTests/CCPackageTests.m

@@ -8,7 +8,9 @@
 
 #import <XCTest/XCTest.h>
 #import "CCPackage.h"
+#import "CCPackage_private.h"
 #import "CCUnitTestAssertions.h"
+#import "CCPackage+InstallData.h"
 
 @interface CCPackageTests : XCTestCase
 
@@ -53,6 +55,10 @@ - (void)testInitWithDictionary
         @"remoteURL" : @"http://foo.fake",
         @"installURL" : @"/Library/Caches/Packages",
         @"status" : @(CCPackageStatusInstalledDisabled),
+        @"localDownloadURL" : @"/downloadfolder/baa.zip",
+        @"localUnzipURL" : @"/unzupfolder/foo",
+        @"folderName" : @"somename",
+        @"enableOnDownload" : @(YES)
     };
 
     CCPackage *package = [[CCPackage alloc] initWithDictionary:dictionary];
@@ -63,6 +69,10 @@ - (void)testInitWithDictionary
     XCTAssertEqualObjects(package.remoteURL, [NSURL URLWithString:@"http://foo.fake"]);
     XCTAssertEqualObjects(package.installURL, [NSURL fileURLWithPath:@"/Library/Caches/Packages"]);
     XCTAssertEqual(package.status, CCPackageStatusInstalledDisabled);
+    XCTAssertEqualObjects(package.localDownloadURL, [NSURL fileURLWithPath:@"/downloadfolder/baa.zip"]);
+    XCTAssertEqualObjects(package.unzipURL, [NSURL fileURLWithPath:@"/unzupfolder/foo"]);
+    CCAssertEqualStrings(package.folderName, @"somename");
+    XCTAssertTrue(package.enableOnDownload);
 }
 
 - (void)testToDictionary
@@ -72,8 +82,12 @@ - (void)testToDictionary
                                                       os:@"iOS"
                                                remoteURL:[NSURL URLWithString:@"http://foo.fake"]];
 
-    [package setValue:@(CCPackageStatusInstalledDisabled) forKey:@"status"];
-    [package setValue:[NSURL fileURLWithPath:@"/Library/Caches/Packages"] forKey:@"installURL"];
+    package.status = CCPackageStatusInstalledDisabled;
+    package.installURL = [NSURL fileURLWithPath:@"/Library/Caches/Packages"];
+    package.unzipURL = [NSURL fileURLWithPath:@"/unzupfolder/foo"];
+    package.folderName = @"somename";
+    package.localDownloadURL = [NSURL fileURLWithPath:@"/downloadfolder/baa.zip"];
+    package.enableOnDownload = NO;
 
     NSDictionary *dictionary = [package toDictionary];
 
@@ -83,6 +97,10 @@ - (void)testToDictionary
     CCAssertEqualStrings(dictionary[@"remoteURL"], @"http://foo.fake");
     CCAssertEqualStrings(dictionary[@"installURL"], @"/Library/Caches/Packages");
     XCTAssertEqual([dictionary[@"status"] integerValue], CCPackageStatusInstalledDisabled);
+    CCAssertEqualStrings(dictionary[@"localDownloadURL"], @"/downloadfolder/baa.zip");
+    CCAssertEqualStrings(dictionary[@"localUnzipURL"], @"/unzupfolder/foo");
+    CCAssertEqualStrings(dictionary[@"folderName"], @"somename");
+    XCTAssertFalse([dictionary[@"enableOnDownload"] boolValue]);
 }
 
 @end

cocos2d/CCPackage.m

@@ -65,6 +65,26 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary
     package.installURL = [NSURL fileURLWithPath:dictionary[PACKAGE_SERIALIZATION_KEY_INSTALL_URL]];
     package.status = (CCPackageStatus) [dictionary[PACKAGE_SERIALIZATION_KEY_STATUS] unsignedIntegerValue];
 
+    if (dictionary[PACKAGE_SERIALIZATION_KEY_LOCAL_DOWNLOAD_URL])
+    {
+        package.localDownloadURL = [NSURL fileURLWithPath:dictionary[PACKAGE_SERIALIZATION_KEY_LOCAL_DOWNLOAD_URL]];
+    }
+
+    if (dictionary[PACKAGE_SERIALIZATION_KEY_LOCAL_UNZIP_URL])
+    {
+        package.unzipURL = [NSURL fileURLWithPath:dictionary[PACKAGE_SERIALIZATION_KEY_LOCAL_UNZIP_URL]];
+    }
+
+    if (dictionary[PACKAGE_SERIALIZATION_KEY_FOLDER_NAME])
+    {
+        package.folderName = dictionary[PACKAGE_SERIALIZATION_KEY_FOLDER_NAME];
+    }
+
+    if (dictionary[PACKAGE_SERIALIZATION_KEY_FOLDER_NAME])
+    {
+        package.enableOnDownload = [dictionary[PACKAGE_SERIALIZATION_KEY_ENABLE_ON_DOWNLOAD] boolValue];
+    }
+
     return package;
 }
 
@@ -88,6 +108,23 @@ - (NSDictionary *)toDictionary
         dictionary[PACKAGE_SERIALIZATION_KEY_INSTALL_URL] = [_installURL path];
     }
 
+    if (_localDownloadURL)
+    {
+        dictionary[PACKAGE_SERIALIZATION_KEY_LOCAL_DOWNLOAD_URL] = [_localDownloadURL path];
+    }
+
+    if (_unzipURL)
+    {
+        dictionary[PACKAGE_SERIALIZATION_KEY_LOCAL_UNZIP_URL] = [_unzipURL path];
+    }
+
+    if (_folderName)
+    {
+        dictionary[PACKAGE_SERIALIZATION_KEY_FOLDER_NAME] = _folderName;
+    }
+
+    dictionary[PACKAGE_SERIALIZATION_KEY_ENABLE_ON_DOWNLOAD] = @(_enableOnDownload);
+
     return dictionary;
 }