WIP commit for iOS:

- failure handler gets called if an exception occurs in native code
- rename "raw" serializer to "utf8"
- extract serializer into separate file

Author: Sefa Ilkimen

plugin.xml

@@ -24,6 +24,7 @@
     </config-file>
     <header-file src="src/ios/CordovaHttpPlugin.h"/>
     <header-file src="src/ios/TextResponseSerializer.h"/>
+    <header-file src="src/ios/TextRequestSerializer.h"/>
     <header-file src="src/ios/AFNetworking/AFHTTPSessionManager.h"/>
     <header-file src="src/ios/AFNetworking/AFNetworking.h"/>
     <header-file src="src/ios/AFNetworking/AFNetworkReachabilityManager.h"/>
@@ -33,6 +34,7 @@
     <header-file src="src/ios/AFNetworking/AFURLSessionManager.h"/>
     <source-file src="src/ios/CordovaHttpPlugin.m"/>
     <source-file src="src/ios/TextResponseSerializer.m"/>
+    <source-file src="src/ios/TextRequestSerializer.m"/>
     <source-file src="src/ios/AFNetworking/AFHTTPSessionManager.m"/>
     <source-file src="src/ios/AFNetworking/AFNetworkReachabilityManager.m"/>
     <source-file src="src/ios/AFNetworking/AFSecurityPolicy.m"/>
@@ -64,4 +66,4 @@
     <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpPatch.java" target-dir="src/com/synconset/cordovahttp"/>
     <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpUpload.java" target-dir="src/com/synconset/cordovahttp"/>
   </platform>
-</plugin>
+</plugin>

src/android/com/synconset/cordovahttp/CordovaHttp.java

@@ -144,8 +144,7 @@ protected HttpRequest setupDataSerializer(HttpRequest request) throws JSONExcept
       if (new String("json").equals(this.getSerializerName())) {
           request.contentType(request.CONTENT_TYPE_JSON, request.CHARSET_UTF8);
           request.send(this.getParamsObject().toString());
-      } else  if (new String("raw").equals(this.getSerializerName())) {
-        //   request.contentType(request.CONTENT_TYPE_JSON, request.CHARSET_UTF8);
+      } else if (new String("utf8").equals(this.getSerializerName())) {
           request.send(this.getParamsObject().toString());
       } else
       {

src/ios/AFNetworking/AFURLRequestSerialization.h

@@ -375,19 +375,6 @@ forHTTPHeaderField:(NSString *)field;
 
 @end
 
-
-#pragma mark -
-
-/**
- `AFRAWRequestSerializer` is a subclass of `AFHTTPRequestSerializer`
- */
-@interface AFRAWRequestSerializer : AFHTTPRequestSerializer
-
-
-+ (instancetype)serializer;
-
-@end
-
 #pragma mark -
 
 /**

src/ios/AFNetworking/AFURLRequestSerialization.m

@@ -1195,62 +1195,6 @@ - (instancetype)copyWithZone:(NSZone *)zone {
 
 @end
 
-
-#pragma mark -
-
-@implementation AFRAWRequestSerializer
-
-+ (instancetype)serializer
-{
-    AFRAWRequestSerializer *serializer = [[self alloc] init];
-    return serializer;
-}
-
-#pragma mark - AFURLRequestSerialization
-
-- (NSURLRequest *)requestBySerializingRequest:(NSURLRequest *)request
-                               withParameters:(id)parameters
-                                        error:(NSError *__autoreleasing *)error
-{
-    NSParameterAssert(request);
-    
-    if ([self.HTTPMethodsEncodingParametersInURI containsObject:[[request HTTPMethod] uppercaseString]]) {
-        return [super requestBySerializingRequest:request withParameters:parameters error:error];
-    }
-    
-    NSMutableURLRequest *mutableRequest = [request mutableCopy];
-    
-    [self.HTTPRequestHeaders enumerateKeysAndObjectsUsingBlock:^(id field, id value, BOOL * __unused stop) {
-        if (![request valueForHTTPHeaderField:field]) {
-            [mutableRequest setValue:value forHTTPHeaderField:field];
-        }
-    }];
-    
-    if (parameters) {
-//        if (![mutableRequest valueForHTTPHeaderField:@"Content-Type"]) {
-//            [mutableRequest setValue:@"application/xml" forHTTPHeaderField:@"Content-Type"];
-//        }
-        
-        [mutableRequest setHTTPBody: [parameters dataUsingEncoding:NSUTF8StringEncoding]];
-    }
-    
-    return mutableRequest;
-}
-
-#pragma mark - NSSecureCoding
-
-- (instancetype)initWithCoder:(NSCoder *)decoder {
-    self = [super initWithCoder:decoder];
-    if (!self) {
-        return nil;
-    }
-    
-    return self;
-}
-
-@end
-
-
 #pragma mark -
 
 @implementation AFJSONRequestSerializer

src/ios/CordovaHttpPlugin.m

@@ -0,0 +1,8 @@
+#import <Foundation/Foundation.h>
+#import "AFURLRequestSerialization.h"
+
+@interface TextRequestSerializer : AFHTTPRequestSerializer
+
++ (instancetype)serializer;
+
+@end

src/ios/TextRequestSerializer.h

@@ -0,0 +1,53 @@
+#import "TextRequestSerializer.h"
+
+@implementation TextRequestSerializer
+
++ (instancetype)serializer
+{
+    TextRequestSerializer *serializer = [[self alloc] init];
+    return serializer;
+}
+
+#pragma mark - AFURLRequestSerialization
+
+- (NSURLRequest *)requestBySerializingRequest:(NSURLRequest *)request
+                               withParameters:(id)parameters
+                                        error:(NSError *__autoreleasing *)error
+{
+    NSParameterAssert(request);
+
+    if ([self.HTTPMethodsEncodingParametersInURI containsObject:[[request HTTPMethod] uppercaseString]]) {
+        return [super requestBySerializingRequest:request withParameters:parameters error:error];
+    }
+
+    NSMutableURLRequest *mutableRequest = [request mutableCopy];
+
+    [self.HTTPRequestHeaders enumerateKeysAndObjectsUsingBlock:^(id field, id value, BOOL * __unused stop) {
+        if (![request valueForHTTPHeaderField:field]) {
+            [mutableRequest setValue:value forHTTPHeaderField:field];
+        }
+    }];
+
+    if (parameters) {
+        if (![mutableRequest valueForHTTPHeaderField:@"Content-Type"]) {
+            [mutableRequest setValue:@"text/plain; charset=utf-8" forHTTPHeaderField:@"Content-Type"];
+        }
+
+        [mutableRequest setHTTPBody: [[parameters valueForKey:@"text"] dataUsingEncoding:NSUTF8StringEncoding]];
+    }
+
+    return mutableRequest;
+}
+
+#pragma mark - NSSecureCoding
+
+- (instancetype)initWithCoder:(NSCoder *)decoder {
+    self = [super initWithCoder:decoder];
+    if (!self) {
+        return nil;
+    }
+
+    return self;
+}
+
+@end

src/ios/TextRequestSerializer.m

@@ -8,6 +8,7 @@ const hooks = {
 const helpers = {
   acceptAllCerts: function(done) { cordova.plugin.http.acceptAllCerts(true, done, done); },
   setJsonSerializer: function(done) { done(cordova.plugin.http.setDataSerializer('json')); },
+  setUtf8StringSerializer: function(done) { done(cordova.plugin.http.setDataSerializer('utf8')); },
   setUrlEncodedSerializer: function(done) { done(cordova.plugin.http.setDataSerializer('urlencoded')); },
   getWithXhr: function(done, url) {
     var xhr = new XMLHttpRequest();
@@ -382,6 +383,17 @@ const tests = [
       cookies.myCookie.should.be.equal('myValue');
       cookies.mySecondCookie.should.be.equal('mySecondValue');
     }
+  },{
+    description: 'should send UTF-8 encoded raw string correctly (POST)',
+    expected: 'resolved: {"status": 200, "data": "{\\"data\\": \\"this is a test string\\"...',
+    before: helpers.setUtf8StringSerializer,
+    func: function(resolve, reject) {
+      cordova.plugin.http.post('http://httpbin.org/anything', { text: 'this is a test string' }, {}, resolve, reject);
+    },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      JSON.parse(result.data.data).data.should.eql('this is a test string');
+    }
   }
 ];
 

test/app-test-definitions.js

@@ -20,20 +20,15 @@
  * under the License.
  *
  * Modified by Andrew Stephan for Sync OnSet
- * Modified by Sefa Ilkimen:
- *  - added configurable params serializer
- *  - added put and delete methods
- *  - using cordova www module pattern
- *  - some minor improvements
- *
+ * Modified by Sefa Ilkimen
 */
 
 /*
  * An HTTP Plugin for PhoneGap.
  */
 
 var pluginId = module.id.slice(0, module.id.indexOf('.'));
-var validSerializers = ['urlencoded', 'json', 'raw' ];
+var validSerializers = ['urlencoded', 'json', 'utf8' ];
 
 var exec = require('cordova/exec');
 var angularIntegration = require(pluginId +'.angular-integration');