Merge pull request #9 from longbai/input_check

longbai · longbai · commit d5b022fa785b · 2014-10-17T22:39:09.000+08:00
Input check
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 #Changelog
 
-## 7.0.3
+## 7.0.4 (2014-10-17)
+
+### 增加
+* 输入参数检查
+
+### 废除
+* 不使用undefined key
+
+## 7.0.3 (2014-10-15)
 
 ### 增加
 * 实现crc32的检查
diff --git a/Qiniu.podspec b/Qiniu.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Qiniu'
-  s.version      = '7.0.3'
+  s.version      = '7.0.4'
   s.summary      = 'Qiniu Resource Storage SDK for iOS and Mac'
   s.homepage     = 'https://github.com/qiniu/objc-sdk'
   s.social_media_url = 'http://weibo.com/qiniutek'
diff --git a/QiniuSDK.xcodeproj/project.pbxproj b/QiniuSDK.xcodeproj/project.pbxproj
@@ -60,6 +60,11 @@
 		DF3C504819DD7BA6000F548F /* QNFormUploadTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DF3C504619DD7BA6000F548F /* QNFormUploadTest.m */; };
 		DF3C504A19DD7D9F000F548F /* QNResumeUploadTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DF3C504919DD7D9F000F548F /* QNResumeUploadTest.m */; };
 		DF3C504B19DD7D9F000F548F /* QNResumeUploadTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DF3C504919DD7D9F000F548F /* QNResumeUploadTest.m */; };
+		DFA39AA419F1272800A1A158 /* QNAsyncRun.h in Headers */ = {isa = PBXBuildFile; fileRef = DFA39AA219F1272800A1A158 /* QNAsyncRun.h */; };
+		DFA39AA519F1272800A1A158 /* QNAsyncRun.m in Sources */ = {isa = PBXBuildFile; fileRef = DFA39AA319F1272800A1A158 /* QNAsyncRun.m */; };
+		DFA39AA619F1272800A1A158 /* QNAsyncRun.m in Sources */ = {isa = PBXBuildFile; fileRef = DFA39AA319F1272800A1A158 /* QNAsyncRun.m */; };
+		DFA39AA719F1272800A1A158 /* QNAsyncRun.m in Sources */ = {isa = PBXBuildFile; fileRef = DFA39AA319F1272800A1A158 /* QNAsyncRun.m */; };
+		DFA39AA819F1272800A1A158 /* QNAsyncRun.m in Sources */ = {isa = PBXBuildFile; fileRef = DFA39AA319F1272800A1A158 /* QNAsyncRun.m */; };
 		DFA9B63B19DF904000A15FD1 /* QNEtag.h in Headers */ = {isa = PBXBuildFile; fileRef = DFA9B63919DF904000A15FD1 /* QNEtag.h */; };
 		DFA9B63C19DF904000A15FD1 /* QNEtag.m in Sources */ = {isa = PBXBuildFile; fileRef = DFA9B63A19DF904000A15FD1 /* QNEtag.m */; };
 		DFA9B63D19DF904000A15FD1 /* QNEtag.m in Sources */ = {isa = PBXBuildFile; fileRef = DFA9B63A19DF904000A15FD1 /* QNEtag.m */; };
@@ -143,6 +148,8 @@
 		DF2CDE7019DAE90300CE01FB /* QNBase64Test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNBase64Test.m; sourceTree = "<group>"; };
 		DF3C504619DD7BA6000F548F /* QNFormUploadTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNFormUploadTest.m; sourceTree = "<group>"; };
 		DF3C504919DD7D9F000F548F /* QNResumeUploadTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNResumeUploadTest.m; sourceTree = "<group>"; };
+		DFA39AA219F1272800A1A158 /* QNAsyncRun.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QNAsyncRun.h; sourceTree = "<group>"; };
+		DFA39AA319F1272800A1A158 /* QNAsyncRun.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNAsyncRun.m; sourceTree = "<group>"; };
 		DFA9B63919DF904000A15FD1 /* QNEtag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QNEtag.h; sourceTree = "<group>"; };
 		DFA9B63A19DF904000A15FD1 /* QNEtag.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNEtag.m; sourceTree = "<group>"; };
 		DFA9B63E19DFD8C900A15FD1 /* QNEtagTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNEtagTest.m; sourceTree = "<group>"; };
@@ -278,6 +285,8 @@
 		DF2CDE4E19DAC6A400CE01FB /* Common */ = {
 			isa = PBXGroup;
 			children = (
+				DFA39AA219F1272800A1A158 /* QNAsyncRun.h */,
+				DFA39AA319F1272800A1A158 /* QNAsyncRun.m */,
 				DF2CDE4F19DAC6A400CE01FB /* QNUrlSafeBase64.h */,
 				DF2CDE5019DAC6A400CE01FB /* QNUrlSafeBase64.m */,
 				DF2CDE5119DAC6A400CE01FB /* QNConfig.h */,
@@ -353,6 +362,7 @@
 				DF2CDE6919DAC6A400CE01FB /* QNUploadManager.h in Headers */,
 				DF2CDE5F19DAC6A400CE01FB /* QNConfig.h in Headers */,
 				DF293CA919DC0AF000799011 /* QNResumeUpload.h in Headers */,
+				DFA39AA419F1272800A1A158 /* QNAsyncRun.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -632,6 +642,7 @@
 				DF2CDE6119DAC6A400CE01FB /* QNCrc32.m in Sources */,
 				DF293CA619DC05B800799011 /* QNHttpManager.m in Sources */,
 				DF293CAB19DC0E5300799011 /* QNResumeUpload.m in Sources */,
+				DFA39AA519F1272800A1A158 /* QNAsyncRun.m in Sources */,
 				DFA9B64A19E0018800A15FD1 /* QNUploadOption.m in Sources */,
 				DF2CDE6A19DAC6A400CE01FB /* QNUploadManager.m in Sources */,
 			);
@@ -650,6 +661,7 @@
 				DF0D23D219DCF02C00D6B68F /* QNResponseInfo.m in Sources */,
 				DFBC622519DE459800458C4B /* QNHttpTest.m in Sources */,
 				DF0D23C919DCC5B800D6B68F /* QNUserAgent.m in Sources */,
+				DFA39AA619F1272800A1A158 /* QNAsyncRun.m in Sources */,
 				DF0D23C819DCC5B200D6B68F /* QNHttpManager.m in Sources */,
 				DF0D23C719DCC58000D6B68F /* QNResumeUpload.m in Sources */,
 				DF2CDE8019DAF67F00CE01FB /* QNUrlSafeBase64.m in Sources */,
@@ -676,6 +688,7 @@
 				DF2CDE6219DAC6A400CE01FB /* QNCrc32.m in Sources */,
 				DF293CA719DC05B800799011 /* QNHttpManager.m in Sources */,
 				DF293CAC19DC0E5300799011 /* QNResumeUpload.m in Sources */,
+				DFA39AA719F1272800A1A158 /* QNAsyncRun.m in Sources */,
 				DFA9B64B19E0018800A15FD1 /* QNUploadOption.m in Sources */,
 				DF2CDE6B19DAC6A400CE01FB /* QNUploadManager.m in Sources */,
 			);
@@ -694,6 +707,7 @@
 				DF0D23D119DCF02400D6B68F /* QNResponseInfo.m in Sources */,
 				DFBC622619DE459800458C4B /* QNHttpTest.m in Sources */,
 				DF0D23CB19DCC5D300D6B68F /* QNHttpManager.m in Sources */,
+				DFA39AA819F1272800A1A158 /* QNAsyncRun.m in Sources */,
 				DF0D23CA19DCC5CF00D6B68F /* QNUserAgent.m in Sources */,
 				DF0D23C619DCC57500D6B68F /* QNResumeUpload.m in Sources */,
 				DF2CDE7419DAF65800CE01FB /* QNUrlSafeBase64.m in Sources */,
diff --git a/QiniuSDK/Common/QNAsyncRun.h b/QiniuSDK/Common/QNAsyncRun.h
@@ -0,0 +1,11 @@
+//
+//  QNAsyncRun.h
+//  QiniuSDK
+//
+//  Created by bailong on 14/10/17.
+//  Copyright (c) 2014年 Qiniu. All rights reserved.
+//
+
+typedef void (^QNRun)(void);
+
+void QNAsyncRun(QNRun run);
diff --git a/QiniuSDK/Common/QNAsyncRun.m b/QiniuSDK/Common/QNAsyncRun.m
@@ -0,0 +1,16 @@
+//
+//  QNAsyncRun.m
+//  QiniuSDK
+//
+//  Created by bailong on 14/10/17.
+//  Copyright (c) 2014年 Qiniu. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "QNAsyncRun.h"
+
+void QNAsyncRun(QNRun run) {
+	dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(void) {
+	    run();
+	});
+}
diff --git a/QiniuSDK/Common/QNConfig.h b/QiniuSDK/Common/QNConfig.h
@@ -8,14 +8,14 @@
 
 #import <Foundation/Foundation.h>
 
-extern NSString *const kQNUndefinedKey;
 extern NSString *const kQNUpHost;
+
 extern NSString *const kQNUpHostBackup;
+
 extern const UInt32 kQNChunkSize;
+
 extern const UInt32 kQNBlockSize;
-extern const UInt32 kQNRetryMax;
-extern const UInt32 kQNPutThreshold;
 
-@interface QNConfig : NSObject
+extern const UInt32 kQNRetryMax;
 
-@end
+extern const UInt32 kQNPutThreshold;
diff --git a/QiniuSDK/Common/QNConfig.m b/QiniuSDK/Common/QNConfig.m
@@ -8,15 +8,10 @@
 
 #import "QNConfig.h"
 
-NSString *const kQNUndefinedKey = @"?";
 NSString *const kQNUpHost = @"upload.qiniu.com";
 NSString *const kQNUpHostBackup = @"up.qiniu.com";
 const UInt32 kQNChunkSize = 256 * 1024;
 const UInt32 kQNBlockSize = 4 * 1024 * 1024;
 const UInt32 kQNPutThreshold = 512 * 1024;
 
 const UInt32 kQNRetryMax = 3;
-
-@implementation QNConfig
-
-@end
diff --git a/QiniuSDK/Common/QNUrlSafeBase64.h b/QiniuSDK/Common/QNUrlSafeBase64.h
@@ -10,5 +10,7 @@
 @interface QNUrlSafeBase64 : NSObject
 
 + (NSString *)encodeString:(NSString *)source;
+
 + (NSString *)encodeData:(NSData *)source;
+
 @end
diff --git a/QiniuSDK/Common/QNVersion.h b/QiniuSDK/Common/QNVersion.h
@@ -8,4 +8,4 @@
 
 #import <Foundation/Foundation.h>
 
-static const NSString *kQiniuVersion = @"7.0.3";
+static const NSString *kQiniuVersion = @"7.0.4";
diff --git a/QiniuSDK/Http/QNHttpManager.m b/QiniuSDK/Http/QNHttpManager.m
@@ -39,7 +39,7 @@ + (QNResponseInfo *)buildResponseInfo:(AFHTTPRequestOperation *)operation
 		info = [[QNResponseInfo alloc] init:status withReqId:reqId withXLog:xlog withBody:responseObject];
 	}
 	else {
-		info = [[QNResponseInfo alloc] initWithError:error];
+		info = [QNResponseInfo responseInfoWithNetError:error];
 	}
 	return info;
 }
diff --git a/QiniuSDK/Http/QNResponseInfo.h b/QiniuSDK/Http/QNResponseInfo.h
@@ -10,6 +10,8 @@
 
 extern const int kQNRequestCancelled;
 extern const int kQNNetworkError;
+extern const int kQNInvalidArgument;
+extern const int kQNFileError;
 
 @interface QNResponseInfo : NSObject
 
@@ -24,9 +26,11 @@ extern const int kQNNetworkError;
 
 + (instancetype)cancel;
 
-- (instancetype)initWithError:(NSError *)error;
++ (instancetype)responseInfoWithInvalidArgument:(NSString *)desc;
 
-- (instancetype)initWithCancelled;
++ (instancetype)responseInfoWithNetError:(NSError *)error;
+
++ (instancetype)responseInfoWithFileError:(NSError *)error;
 
 - (instancetype)init:(int)status
            withReqId:(NSString *)reqId
diff --git a/QiniuSDK/Http/QNResponseInfo.m b/QiniuSDK/Http/QNResponseInfo.m
@@ -9,6 +9,9 @@
 
 #import "QNResponseInfo.h"
 
+
+const int kQNFileError = -4;
+const int kQNInvalidArgument = -3;
 const int kQNRequestCancelled = -2;
 const int kQNNetworkError = -1;
 
@@ -20,36 +23,35 @@ + (instancetype)cancel {
 	return [[QNResponseInfo alloc] initWithCancelled];
 }
 
-- (instancetype)initWithError:(NSError *)error {
-	if (self = [super init]) {
-		_statusCode = kQNNetworkError;
-		_error = [error copy];
-	}
-	return self;
++ (instancetype)responseInfoWithInvalidArgument:(NSString *)text {
+	return [[QNResponseInfo alloc] initWithStatus:kQNInvalidArgument errorDescription:text];
 }
 
-- (instancetype)initWithCancelled {
-	if (self = [super init]) {
-		_statusCode = kQNRequestCancelled;
-		_error = [[NSError alloc] initWithDomain:@"qiniu" code:_statusCode userInfo:@{ @"error":@"cancelled by user" }];
-	}
-	return self;
++ (instancetype)responseInfoWithNetError:(NSError *)error {
+	return [[QNResponseInfo alloc] initWithStatus:kQNNetworkError error:error];
 }
 
-- (BOOL)isCancelled {
-	return _statusCode == kQNRequestCancelled;
++ (instancetype)responseInfoWithFileError:(NSError *)error {
+	return [[QNResponseInfo alloc] initWithStatus:kQNFileError error:error];
 }
 
-- (BOOL)isOK {
-	return _statusCode == 200;
+- (instancetype)initWithCancelled {
+	return [self initWithStatus:kQNRequestCancelled errorDescription:@"cancelled by user"];
 }
 
-- (BOOL)isConnectionBroken {
-	return _statusCode == kQNNetworkError;
+- (instancetype)initWithStatus:(int)status
+                         error:(NSError *)error {
+	if (self = [super init]) {
+		_statusCode = status;
+		_error = error;
+	}
+	return self;
 }
 
-- (BOOL)couldRetry {
-	return (_statusCode >= 500 && _statusCode < 600 && _statusCode != 579) || _statusCode == kQNNetworkError || _statusCode == 996 || _statusCode == 406;
+- (instancetype)initWithStatus:(int)status
+              errorDescription:(NSString *)text {
+	NSError *error = [[NSError alloc] initWithDomain:@"qiniu" code:status userInfo:@{ @"error":text }];
+	return [self initWithStatus:status error:error];
 }
 
 - (instancetype)init:(int)status
@@ -81,4 +83,20 @@ - (NSString *)description {
 	return [NSString stringWithFormat:@"<%@: %p, status: %d, requestId: %@, xlog: %@, error: %@>", NSStringFromClass([self class]), self, _statusCode, _reqId, _xlog, _error];
 }
 
+- (BOOL)isCancelled {
+	return _statusCode == kQNRequestCancelled;
+}
+
+- (BOOL)isOK {
+	return _statusCode == 200;
+}
+
+- (BOOL)isConnectionBroken {
+	return _statusCode == kQNNetworkError;
+}
+
+- (BOOL)couldRetry {
+	return (_statusCode >= 500 && _statusCode < 600 && _statusCode != 579) || _statusCode == kQNNetworkError || _statusCode == 996 || _statusCode == 406;
+}
+
 @end
diff --git a/QiniuSDK/Storage/QNUploadManager.m b/QiniuSDK/Storage/QNUploadManager.m
diff --git a/QiniuSDK/Storage/QNUploadOption.m b/QiniuSDK/Storage/QNUploadOption.m
diff --git a/QiniuSDKTests/QNFormUploadTest.m b/QiniuSDKTests/QNFormUploadTest.m
diff --git a/QiniuSDKTests/QNResumeUploadTest.m b/QiniuSDKTests/QNResumeUploadTest.m

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,4 @@`
`8`	`8`
`9`	`9`	`#import <Foundation/Foundation.h>`
`10`	`10`
`11`		`-static const NSString *kQiniuVersion = @"7.0.3";`
	`11`	`+static const NSString *kQiniuVersion = @"7.0.4";`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ + (QNResponseInfo )buildResponseInfo:(AFHTTPRequestOperation )operation`
`39`	`39`	`info = [[QNResponseInfo alloc] init:status withReqId:reqId withXLog:xlog withBody:responseObject];`
`40`	`40`	`}`
`41`	`41`	`else {`
`42`		`- info = [[QNResponseInfo alloc] initWithError:error];`
	`42`	`+ info = [QNResponseInfo responseInfoWithNetError:error];`
`43`	`43`	`}`
`44`	`44`	`return info;`
`45`	`45`	`}`