Support for default resolution added.

Default resolution is determined by CCFileUtil's searchResolutionsOrder array and is mapped to a sprite builder resolution.
CCPackageManager now offers a simple method to download a package only by providing a name.
CCPackage can now be initialized with a name only.
Some tests added for these cases, although CCPackageHelper tests are disabled at the moment due to a bug in CCFileUtils and handling of searchResolutionsOrder.

Author: NickyWeber

UnitTests/CCPackageHelperTests.m

@@ -0,0 +1,50 @@
+//
+//  CCPackageHelperTests.m
+//  cocos2d-tests-ios
+//
+//  Created by Nicky Weber on 29.09.14.
+//  Copyright (c) 2014 Cocos2d. All rights reserved.
+//
+
+#import <XCTest/XCTest.h>
+#import "CCFileUtils.h"
+#import "CCPackageHelper.h"
+#import "CCUnitTestAssertions.h"
+
+@interface CCPackageHelperTests : XCTestCase
+
+@property (nonatomic, strong) NSMutableArray *searchResolutionsOrderBackup;
+
+@end
+
+
+@implementation CCPackageHelperTests
+
+/*
+- (void)testDefaultResolution
+{
+    // Standard test
+    [CCFileUtils sharedFileUtils].searchResolutionsOrder = @[CCFileUtilsSuffixiPhoneHD, CCFileUtilsSuffixiPadHD];
+    NSString *mappedResolution = [CCPackageHelper ccFileUtilsSuffixToResolution:CCFileUtilsSuffixiPhoneHD];
+    NSString *defaultResolution = [CCPackageHelper defaultResolution];
+    CCAssertEqualStrings(defaultResolution, mappedResolution);
+
+    // Ignore non mappable entriy and pick next
+    [CCFileUtils sharedFileUtils].searchResolutionsOrder = @[@"weird_nonsense", CCFileUtilsSuffixiPadHD];
+    NSString *mappedResolution2 = [CCPackageHelper ccFileUtilsSuffixToResolution:CCFileUtilsSuffixiPadHD];
+    NSString *defaultResolution2 = [CCPackageHelper defaultResolution];
+    CCAssertEqualStrings(defaultResolution2, mappedResolution2);
+
+    // Return default since nothing can be mapped
+    [CCFileUtils sharedFileUtils].searchResolutionsOrder = @[@"nothing_to_be_mapped"];
+    NSString *defaultResolution3 = [CCPackageHelper defaultResolution];
+    CCAssertEqualStrings(defaultResolution3, @"phonehd");
+
+    // Empty array
+    [CCFileUtils sharedFileUtils].searchResolutionsOrder = @[];
+    NSString *defaultResolution4 = [CCPackageHelper defaultResolution];
+    CCAssertEqualStrings(defaultResolution4, @"phonehd");
+}
+*/
+
+@end

UnitTests/CCPackageManagerTests.m

@@ -7,28 +7,41 @@
 //
 
 #import <XCTest/XCTest.h>
+#import "CCPackageManager.h"
+#import "CCPackage.h"
+#import "CCFileUtils.h"
 
 @interface CCPackageManagerTests : XCTestCase
 
+@property (nonatomic, strong) CCPackageManager *packageManager;
+
 @end
 
 @implementation CCPackageManagerTests
 
 - (void)setUp
 {
     [super setUp];
-    // Put setup code here. This method is called before the invocation of each test method in the class.
+    self.packageManager = [[CCPackageManager alloc] init];
 }
 
-- (void)tearDown
+- (void)testPackageWithName
 {
-    // Put teardown code here. This method is called after the invocation of each test method in the class.
-    [super tearDown];
-}
+    // NOTE: This will kill many other tests due to a bug in CCFileUtils
+    // So we assume until the bug's fixed that phonehd is the default resolution
+    // [CCFileUtils sharedFileUtils].searchResolutionsOrder = @[CCFileUtilsSuffixiPadHD];
 
-- (void)testExample
-{
-    XCTFail(@"No implementation for \"%s\"", __PRETTY_FUNCTION__);
+    CCPackage *aPackage = [[CCPackage alloc] initWithName:@"foo"
+                                               // resolution:@"tablethd" // See note above
+                                               resolution:@"phonehd"
+                                                       os:@"iOS"
+                                                remoteURL:[NSURL URLWithString:@"http://foo.fake"]];
+
+    [_packageManager addPackage:aPackage];
+
+    CCPackage *result = [_packageManager packageWithName:@"foo"];
+
+    XCTAssertEqual(aPackage, result);
 }
 
 @end

cocos2d-tests-ios.xcodeproj/project.pbxproj

@@ -143,6 +143,7 @@
 		D4AFE94D1977100000261299 /* west_england-64.png in Resources */ = {isa = PBXBuildFile; fileRef = D4AFE9121977100000261299 /* west_england-64.png */; };
 		E525F033EECC363CA8EAF2A6 /* CCPackageDownloadManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F2B770C5914D0810E4C2 /* CCPackageDownloadManagerTests.m */; };
 		E525F23949076BAB5337F7AD /* CCPackage+InstallDataTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F935C2ECADF41CA1B1F2 /* CCPackage+InstallDataTests.m */; };
+		E525F4D0568A8A4176684936 /* CCPackageHelperTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F99055258F35DFF00ECD /* CCPackageHelperTests.m */; };
 		E525F5DB1E3086DDE0296CEC /* CCPackageDownloadTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F5FACFF098F0ACBA6419 /* CCPackageDownloadTests.m */; };
 		E525F7C977339D17470FC149 /* CCPackageInstallerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FBF58DFECF27272F5D6F /* CCPackageInstallerTests.m */; };
 		E525F7FD04A53FA8700B4890 /* CCPackageInstallDataTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FA40B9446D6820F622B4 /* CCPackageInstallDataTests.m */; };
@@ -363,6 +364,7 @@
 		E525F771C583AAF68EB42E15 /* CCPackageTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCPackageTests.m; sourceTree = "<group>"; };
 		E525F832B569117922DA339E /* CCUnitTestAssertions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCUnitTestAssertions.h; sourceTree = "<group>"; };
 		E525F935C2ECADF41CA1B1F2 /* CCPackage+InstallDataTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CCPackage+InstallDataTests.m"; sourceTree = "<group>"; };
+		E525F99055258F35DFF00ECD /* CCPackageHelperTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCPackageHelperTests.m; sourceTree = "<group>"; };
 		E525FA40B9446D6820F622B4 /* CCPackageInstallDataTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCPackageInstallDataTests.m; sourceTree = "<group>"; };
 		E525FB8A3CC89D071A8377B1 /* CCPackageCocos2dEnablerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCPackageCocos2dEnablerTests.m; sourceTree = "<group>"; };
 		E525FBF58DFECF27272F5D6F /* CCPackageInstallerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCPackageInstallerTests.m; sourceTree = "<group>"; };
@@ -763,6 +765,7 @@
 				E525F544D63123C8E948AA05 /* Unzip */,
 				E525F771C583AAF68EB42E15 /* CCPackageTests.m */,
 				E525F395FE85323D86232416 /* CCPackageManagerTests.m */,
+				E525F99055258F35DFF00ECD /* CCPackageHelperTests.m */,
 			);
 			name = Packages;
 			sourceTree = "<group>";
@@ -1009,6 +1012,7 @@
 				E525FF2E8351476CDD7DEAC4 /* CCPackageManagerTests.m in Sources */,
 				E525F033EECC363CA8EAF2A6 /* CCPackageDownloadManagerTests.m in Sources */,
 				E525F7FD04A53FA8700B4890 /* CCPackageInstallDataTests.m in Sources */,
+				E525F4D0568A8A4176684936 /* CCPackageHelperTests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

cocos2d/CCPackage.h

@@ -35,9 +35,21 @@
  */
 @property (nonatomic, readonly) CCPackageStatus status;
 
+/**
+ *  Creates a new instance of a package.
+ *  OS and resolution are determined implicitly. Resolution is derived from CCFileUtils' searchResolutionsOrder first entry.
+ *
+ *  @param name Name of the package
+ *  @param remoteURL Remote URL of the package
+ *
+ *  @return New instance of CCPackage
+ */
+- (instancetype)initWithName:(NSString *)name
+                   remoteURL:(NSURL *)remoteURL;
 
 /**
  *  Creates a new instance of a package.
+ *  OS is determined implicitly.
  *
  *  @param name Name of the package
  *  @param resolution Resolution of the package

cocos2d/CCPackage.m

@@ -1,3 +1,4 @@
+#import <MacTypes.h>
 #import "CCPackage.h"
 #import "CCPackageHelper.h"
 
@@ -54,6 +55,14 @@ - (instancetype)initWithName:(NSString *)name resolution:(NSString *)resolution
                                  remoteURL:remoteURL];
 }
 
+- (instancetype)initWithName:(NSString *)name remoteURL:(NSURL *)remoteURL
+{
+    return [[CCPackage alloc] initWithName:name
+                                resolution:[CCPackageHelper defaultResolution]
+                                        os:[CCPackageHelper currentOS]
+                                 remoteURL:remoteURL];
+}
+
 - (instancetype)initWithDictionary:(NSDictionary *)dictionary
 {
     CCPackage *package = [[CCPackage alloc] initWithName:dictionary[PACKAGE_SERIALIZATION_KEY_NAME]

cocos2d/CCPackageHelper.h

@@ -3,6 +3,23 @@
 
 @interface CCPackageHelper : NSObject
 
+/**
+ * Returns the current OS, possible values: iOS, Android and Mac
+ */
 + (NSString *)currentOS;
 
+/**
+ * Returns a spritebuilder resolution(phone, phonehd, tablet, tablethd) for a CCFileUtil's device/resolution suffix like CCFileUtilsSuffixiPadHD
+ * If none given or not found it'll return nil.
+ *
+ * @param suffix
+ */
++ (NSString *)ccFileUtilsSuffixToResolution:(NSString *)suffix;
+
+/**
+ * Returns the preferred Sprite Builder resolution(phone, phonehd, tablet, tablethd) for the current cocos2d setup by looking at the entries
+ * in CCFileUtils searchResolutionsOrder array. If none can be found or mapped phonehd will be returned as default.
+ */
++ (NSString *)defaultResolution;
+
 @end

cocos2d/CCPackageHelper.m

@@ -1,4 +1,6 @@
+#import <MacTypes.h>
 #import "CCPackageHelper.h"
+#import "CCFileUtils.h"
 
 
 @implementation CCPackageHelper
@@ -18,4 +20,48 @@ + (NSString *)currentOS
     return @"iOS";
 }
 
++ (NSString *)ccFileUtilsSuffixToResolution:(NSString *)suffix
+{
+    if ([suffix isEqualToString:CCFileUtilsSuffixiPhone5HD]
+        || [suffix isEqualToString:CCFileUtilsSuffixiPhone5]
+        || [suffix isEqualToString:CCFileUtilsSuffixiPhoneHD]
+        || [suffix isEqualToString:CCFileUtilsSuffixDefault])
+    {
+        return @"phonehd";
+    }
+
+    if ([suffix isEqualToString:CCFileUtilsSuffixiPhone])
+    {
+        return @"phone";
+    }
+
+    if ([suffix isEqualToString:CCFileUtilsSuffixiPadHD]
+        || [suffix isEqualToString:CCFileUtilsSuffixMacHD])
+    {
+        return @"tablethd";
+    }
+
+    if ([suffix isEqualToString:CCFileUtilsSuffixMac]
+        || [suffix isEqualToString:CCFileUtilsSuffixiPad])
+    {
+        return @"tablet";
+    }
+
+    return nil;
+}
+
++ (NSString *)defaultResolution
+{
+    for (NSString *resolution in [CCFileUtils sharedFileUtils].searchResolutionsOrder)
+    {
+        NSString *result = [CCPackageHelper ccFileUtilsSuffixToResolution:resolution];
+        if (result)
+        {
+            return result;
+        }
+    }
+
+    return @"phonehd";
+}
+
 @end

cocos2d/CCPackageManager.h

@@ -55,10 +55,17 @@
  */
 - (void)savePackages;
 
+/**
+ *  Returns a package identified by name. Resolution and OS are determined implicitly.
+ *
+ *  @param name Name of the package
+ */
+- (CCPackage *)packageWithName:(NSString *)name;
 
 /**
  * The all inclsuive method to add a package to your app.
  * Returns a new package immediately which will be downloaded, unzipped and installed asynchronously to the Packages folder in /Library/Caches (default)
+ * OS and resolution are determined implicitly. Resolution is derived from CCFileUtils' searchResolutionsOrder first entry.
  *
  * If a package with the same name and resolution already exists it won't be rescheduled for downloading.
  * If you need to update a package by re-downloading it you will have to delete it first.
@@ -67,14 +74,35 @@
  * The URL is determined by the baseURL property and the standard identifier created by the name, os and resolution.
  * Example: base is http://foo, name: DLC, os: iOS (determined by manager), resolution: phonehd => http://foo/DLC-iOS-phonehd.zip
  *
+ * @param name Name of the package
+  * @param enableAfterDownload If the package should be enabled in cocos2d after download. You can enable it with the enablePackage: method later on.
+ */
+- (CCPackage *)downloadPackageWithName:(NSString *)name enableAfterDownload:(BOOL)enableAfterDownload;
+
+/**
+ * Like the method above. Instead of using the baseURL, name and resolution you can provide the URL directly.
+ * Returns a new package immediately which will be downloaded, unzipped and installed asynchronously to the Packages folder in /Library/Caches (default)
+ * OS is determined implicitly.
+ *
  * @param name Name of the package
  * @param resolution Resolution of the package, e.g. phonehd, tablethd etc.
  * @param enableAfterDownload If the package should be enabled in cocos2d after download. You can enable it with the enablePackage: method later on.
  */
 - (CCPackage *)downloadPackageWithName:(NSString *)name resolution:(NSString *)resolution enableAfterDownload:(BOOL)enableAfterDownload;
 
+/**
+ * Like the method above. Instead of using the baseURL and name  you can provide the URL directly.
+ * OS and resolution are determined implicitly. Resolution is derived from CCFileUtils' searchResolutionsOrder first entry.
+ *
+ * @param name Name of the package
+ * @param remoteURL URL of the package to be downloaded
+ * @param enableAfterDownload If the package should be enabled in cocos2d after download. You can enable it with the enablePackage: method later on.
+ */
+- (CCPackage *)downloadPackageWithName:(NSString *)name remoteURL:(NSURL *)remoteURL enableAfterDownload:(BOOL)enableAfterDownload;
+
 /**
  * Like the method above. Instead of using the baseURL, name and resolution you can provide the URL directly.
+ * OS is determined implicitly.
  *
  * @param name Name of the package
  * @param resolution Resolution of the package, e.g. phonehd, tablethd etc.

cocos2d/CCPackageManager.m

@@ -219,6 +219,13 @@ - (void)setUnzippingQueue:(dispatch_queue_t)unzippingQueue
 
 #pragma mark - download
 
+- (CCPackage *)downloadPackageWithName:(NSString *)name enableAfterDownload:(BOOL)enableAfterDownload
+{
+    return [self downloadPackageWithName:name
+                              resolution:[CCPackageHelper defaultResolution]
+                     enableAfterDownload:enableAfterDownload];
+}
+
 - (CCPackage *)downloadPackageWithName:(NSString *)name resolution:(NSString *)resolution enableAfterDownload:(BOOL)enableAfterDownload
 {
     NSAssert(_baseURL != nil, @"baseURL must not be nil");
@@ -260,6 +267,14 @@ - (BOOL)downloadPackage:(CCPackage *)package enableAfterDownload:(BOOL)enableAft
     return YES;
 }
 
+- (CCPackage *)downloadPackageWithName:(NSString *)name remoteURL:(NSURL *)remoteURL enableAfterDownload:(BOOL)enableAfterDownload
+{
+    return [self downloadPackageWithName:name
+                              resolution:[CCPackageHelper defaultResolution]
+                               remoteURL:remoteURL
+                     enableAfterDownload:enableAfterDownload];
+}
+
 - (CCPackage *)downloadPackageWithName:(NSString *)name resolution:(NSString *)resolution remoteURL:(NSURL *)remoteURL enableAfterDownload:(BOOL)enableAfterDownload
 {
     CCPackage *aPackage = [self packageWithName:name resolution:resolution];
@@ -287,6 +302,13 @@ - (void)attachNewInstallDataToPackage:(CCPackage *)package enableAfterDownload:(
     [package setInstallData:installData];
 }
 
+- (CCPackage *)packageWithName:(NSString *)name
+{
+    NSString *resolution = [CCPackageHelper defaultResolution];
+
+    return [self packageWithName:name resolution:resolution];
+}
+
 - (CCPackage *)packageWithName:(NSString *)name resolution:(NSString *)resolution
 {
     for (CCPackage *aPackage in _packages)