Add option to define content type when uploading.

Thanks to @locandy for this feature.

Merge remote-tracking branch 'locandy/master' into develop

Conflicts:
	README.md

Author: toto

README.md

@@ -188,6 +188,31 @@ NSURLRequest *sigendRequest = [theRequest signedURLRequest];
 // Invoke the request with you preferd method
 </pre>
 
+#### Fully Parametrized File Upload
+
+<pre>
+// Get fileSize
+NSDictionary *fileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:uploadFile.localDataFilePath error:nil];
+NSNumber *fileSize = [fileAttributes valueForKey:NSFileSize];
+
+// Create a stream wrapper for the upload file
+NXOAuth2FileStreamWrapper* w =[NXOAuth2FileStreamWrapper
+    wrapperWithStream:[NSInputStream inputStreamWithFileAtPath:uploadFile.localDataFilePath]
+        contentLength:[fileSize unsignedLongLongValue]
+             fileName:uploadFile.remoteFilename];
+
+if([uploadFile.remoteFilename hasSuffix:@".json"])
+    w.contentType = @"application/json";
+else
+    if([uploadFile.remoteFilename hasSuffix:@".jpg"])
+        w.contentType = @"image/jpeg";
+
+// POST Content-Disposition: form-data; name="file"; filename=uploadFile.remoteFilename
+[NXOAuth2Request performMethod:@"POST" onResource:uploadFile.uploadURL usingParameters:@{@"file": w} withAccount:account
+           sendProgressHandler:... responseHandler: ...];
+</pre>
+
+
 ## Contributing & Pull Requests
 
 Patches and pull requests are welcome! We are sorry if it takes a while to review them, but sooner or later we will get to yours.

Sources/OAuth2Client/NXOAuth2FileStreamWrapper.h

@@ -18,10 +18,12 @@
     NSInputStream        *stream;
     unsigned long long    contentLength;
     NSString            *fileName;
+    NSString            *contentType;
 }
 @property (nonatomic, strong, readonly) NSInputStream *stream;
 @property (nonatomic, assign, readonly) unsigned long long contentLength;
 @property (nonatomic, copy, readonly) NSString *fileName;
+@property (nonatomic, copy) NSString *contentType; // optional DEFAULT: "application/octettstream"
 
 + (id)wrapperWithStream:(NSInputStream *)stream contentLength:(unsigned long long)contentLength DEPRECATED_ATTRIBUTE;
 - (id)initWithStream:(NSInputStream *)stream contentLength:(unsigned long long)contentLength DEPRECATED_ATTRIBUTE;

Sources/OAuth2Client/NXOAuth2FileStreamWrapper.m

@@ -51,14 +51,15 @@ - (id)initWithStream:(NSInputStream *)aStream contentLength:(unsigned long long)
         stream = aStream;
         contentLength = aContentLength;
         fileName = [aFileName copy];
+        contentType = @"application/octet-stream"; // DEFAULT if not assigned by property
     }
     return self;
 }
 
 
 #pragma mark Accessors
 
-@synthesize stream, contentLength, fileName;
+@synthesize stream, contentLength, fileName, contentType;
 
 
 @end

Sources/OAuth2Client/NXOAuth2PostBodyPart.m

@@ -43,7 +43,7 @@ - (id)initWithName:(NSString *)name content:(id)content;
     } else if ([content isKindOfClass:[NSData class]]) {
         return [self initWithName:name dataContent:content];
     } else if ([content isKindOfClass:[NXOAuth2FileStreamWrapper class]]) {
-        return [self initWithName:name streamContent:[content stream] streamLength:[content contentLength] fileName:[content fileName]];
+        return [self initWithName:name streamContent:[content stream] streamLength:[content contentLength] fileName:[content fileName] contentType:[content contentType]];
     } else {
         NSAssert1(NO, @"NXOAuth2PostBodyPart with illegal type:\n%@", [content class]);
         return nil;
@@ -60,6 +60,16 @@ - (id)initWithName:(NSString *)name streamContent:(NSInputStream *)stream stream
     return [self initWithHeaders:headers streamContent:stream length:streamLength];
 }
 
+- (id)initWithName:(NSString *)name streamContent:(NSInputStream *)stream streamLength:(unsigned long long)streamLength fileName:(NSString *)fileName contentType:(NSString *)contentType;
+{
+    NSMutableString *headers = [NSMutableString string];
+    [headers appendFormat:@"Content-Disposition: form-data; name=\"%@\"; filename=\"%@\"\r\n", name, fileName];
+    [headers appendString:@"Content-Transfer-Encoding: binary\r\n"];
+    [headers appendFormat:@"Content-Type: %@\r\n", contentType];
+    [headers appendString:@"\r\n"];
+    return [self initWithHeaders:headers streamContent:stream length:streamLength];
+}
+
 - (id)initWithName:(NSString *)name dataContent:(NSData *)data;
 {
     NSMutableString *headers = [NSMutableString string];