From 1f625585b99c34faca880567560aeed2acf76804 Mon Sep 17 00:00:00 2001 From: Giuseppe Nucifora Date: Fri, 12 Jan 2018 15:59:30 +0100 Subject: [PATCH] - upgrade libraries - add + (instancetype _Nonnull) formDataFromFilepath:(NSString * _Nonnull) filePath name:(NSString * _Nonnull) name fileName:(NSString * _Nonnull) fileName mimeType:(NSString * _Nonnull) mimeType; - add + (instancetype _Nonnull) formDataFromFileUrl:(NSURL * _Nonnull) fileUrl name:(NSString * _Nonnull) name fileName:(NSString * _Nonnull) fileName mimeType:(NSString * _Nonnull) mimeType; --- Example/Podfile.lock | 4 ++-- Example/Pods/Local Podspecs/PNObject.podspec.json | 4 ++-- Example/Pods/Manifest.lock | 4 ++-- PNObject.podspec | 2 +- PNObject/Classes/PNObjectFormData.h | 3 +++ PNObject/Classes/PNObjectFormData.m | 15 +++++++++++++++ 6 files changed, 25 insertions(+), 7 deletions(-) diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 85bf467..60888ec 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -38,7 +38,7 @@ PODS: - NSString-Helper (1.0.5) - nv-ios-http-status (0.0.1) - PEAR-FileManager-iOS (1.3.1) - - PNObject (1.3.3): + - PNObject (1.3.4): - AFNetworking - CodFis-Helper - DDDKeychainWrapper @@ -85,7 +85,7 @@ SPEC CHECKSUMS: NSString-Helper: 459e1b6a62b3bf7db10f01b0d102548608e945c4 nv-ios-http-status: b6c2b5fc8656cc19e0d3000dadce2080b99d0e2f PEAR-FileManager-iOS: 3bc403f68a53483f5629aa822f4649e40275c4d3 - PNObject: 3ad5828da3dae309a09b73da59ae4b56d4b8458e + PNObject: 8dc560680a7a48060ed309b019ca4fc41505cc07 PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd RZDataBinding: 6981e90ddaae2f5e02028323b1043f8c31013109 Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 diff --git a/Example/Pods/Local Podspecs/PNObject.podspec.json b/Example/Pods/Local Podspecs/PNObject.podspec.json index 1e24ba7..3e2114a 100644 --- a/Example/Pods/Local Podspecs/PNObject.podspec.json +++ b/Example/Pods/Local Podspecs/PNObject.podspec.json @@ -1,6 +1,6 @@ { "name": "PNObject", - "version": "1.3.3", + "version": "1.3.4", "summary": "PNObject is a simple replica of the more complex ParseObject", "homepage": "https://github.com/giuseppenucifora/PNObject", "license": { @@ -12,7 +12,7 @@ }, "source": { "git": "https://github.com/giuseppenucifora/PNObject.git", - "tag": "1.3.3" + "tag": "1.3.4" }, "platforms": { "ios": "8.0" diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index 85bf467..60888ec 100644 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -38,7 +38,7 @@ PODS: - NSString-Helper (1.0.5) - nv-ios-http-status (0.0.1) - PEAR-FileManager-iOS (1.3.1) - - PNObject (1.3.3): + - PNObject (1.3.4): - AFNetworking - CodFis-Helper - DDDKeychainWrapper @@ -85,7 +85,7 @@ SPEC CHECKSUMS: NSString-Helper: 459e1b6a62b3bf7db10f01b0d102548608e945c4 nv-ios-http-status: b6c2b5fc8656cc19e0d3000dadce2080b99d0e2f PEAR-FileManager-iOS: 3bc403f68a53483f5629aa822f4649e40275c4d3 - PNObject: 3ad5828da3dae309a09b73da59ae4b56d4b8458e + PNObject: 8dc560680a7a48060ed309b019ca4fc41505cc07 PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd RZDataBinding: 6981e90ddaae2f5e02028323b1043f8c31013109 Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 diff --git a/PNObject.podspec b/PNObject.podspec index 2ebf83f..422e3d8 100644 --- a/PNObject.podspec +++ b/PNObject.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'PNObject' -s.version = '1.3.3' +s.version = '1.3.4' s.summary = 'PNObject is a simple replica of the more complex ParseObject' diff --git a/PNObject/Classes/PNObjectFormData.h b/PNObject/Classes/PNObjectFormData.h index 03ea836..94cf96e 100644 --- a/PNObject/Classes/PNObjectFormData.h +++ b/PNObject/Classes/PNObjectFormData.h @@ -50,5 +50,8 @@ */ + (instancetype _Nonnull) formDataFromUIImage:(UIImage * _Nonnull) image compression:(CGFloat) compression name:(NSString * _Nonnull) name fileName:(NSString * _Nonnull) fileName mimeType:(NSString * _Nonnull) mimeType; ++ (instancetype _Nonnull) formDataFromFilepath:(NSString * _Nonnull) filePath name:(NSString * _Nonnull) name fileName:(NSString * _Nonnull) fileName mimeType:(NSString * _Nonnull) mimeType; + ++ (instancetype _Nonnull) formDataFromFileUrl:(NSURL * _Nonnull) fileUrl name:(NSString * _Nonnull) name fileName:(NSString * _Nonnull) fileName mimeType:(NSString * _Nonnull) mimeType; @end diff --git a/PNObject/Classes/PNObjectFormData.m b/PNObject/Classes/PNObjectFormData.m index 5df198a..34af62c 100644 --- a/PNObject/Classes/PNObjectFormData.m +++ b/PNObject/Classes/PNObjectFormData.m @@ -36,5 +36,20 @@ return responseData; } ++ (instancetype _Nonnull) formDataFromFilepath:(NSString * _Nonnull) filePath name:(NSString * _Nonnull) name fileName:(NSString * _Nonnull) fileName mimeType:(NSString * _Nonnull) mimeType { + return [self formDataFromFileUrl:[NSURL URLWithString:filePath] name:name fileName:fileName mimeType:mimeType]; +} + ++ (instancetype _Nonnull) formDataFromFileUrl:(NSURL * _Nonnull) fileUrl name:(NSString * _Nonnull) name fileName:(NSString * _Nonnull) fileName mimeType:(NSString * _Nonnull) mimeType { + PNObjectFormData * responseData = [PNObjectFormData new]; + + [responseData setFormData:[NSData dataWithContentsOfURL:fileUrl]]; + [responseData setName:name]; + [responseData setFileName:fileName]; + [responseData setMimeType:mimeType]; + + return responseData; +} + @end