Enhance parameter packers. Added transformValue to handle case like transforming NSArray to comma separated string.

Author: kevin-lyn

STNetTaskQueue/STHTTPNetTask.h

@@ -55,6 +55,15 @@ typedef NS_ENUM(NSUInteger, STHTTPNetTaskResponseType) {
 
 @optional
 
+/**
+ Transform a value to another.
+ Use case: NSArray need to be transformed to comma separated string.
+ 
+ @param value id Value to be transformed
+ @return id The transformed value. Should return the same value if "value" is not supposed to be transformed.
+ */
+- (id)transformValue:(id)value;
+
 /**
  Separator string which should be used when packing parameters.
  E.g. property schoolName will be converted to school_name.

STNetTaskQueue/STHTTPNetTaskParametersPacker.m

@@ -61,26 +61,11 @@ - (NSDictionary *)parametersFromRequestObject:(id<STHTTPNetTaskRequestObject>)re
             continue;
         }
 
-        id propertyValue = [(NSObject *)requestObject valueForKey:propertyName];
-        if ([propertyValue conformsToProtocol:@protocol(STHTTPNetTaskRequestObject)]) {
-            [parameters addEntriesFromDictionary:[self parametersFromRequestObject:propertyValue]];
-        }
-        else if ([propertyValue isKindOfClass:[NSDictionary class]]) {
-            [parameters addEntriesFromDictionary:propertyValue];
-        }
-        else {
-            if (![propertyValue isKindOfClass:[NSNumber class]] &&
-                ![propertyValue isKindOfClass:[NSString class]] &&
-                ![propertyValue isKindOfClass:[NSArray class]]) {
-                continue;
-            }
-            
-            NSString *separator = STHTTPNetTaskRequestObjectDefaultSeparator;
-            if ([requestObject respondsToSelector:@selector(parameterNameSeparator)]) {
-                separator = [requestObject parameterNameSeparator];
-            }
-            NSString *parameterName = [self parameterNameOfProperty:propertyName withSeparator:separator];
-            parameters[parameterName] = propertyValue;
+        NSString *separator = [self separatorFromRequestObject:requestObject];
+        NSString *parameterName = [self parameterNameFromName:propertyName withSeparator:separator];
+        id parameterValue = [self parameterValueFromValue:[(NSObject *)requestObject valueForKey:propertyName] inRequestObject:requestObject];
+        if (parameterName && parameterValue) {
+            parameters[parameterName] = parameterValue;
         }
     }
 
@@ -89,23 +74,53 @@ - (NSDictionary *)parametersFromRequestObject:(id<STHTTPNetTaskRequestObject>)re
     return parameters;
 }
 
-- (BOOL)shouldPackPropertyWithAttributes:(NSArray *)attributes
+- (NSDictionary *)parametersFromDictionary:(NSDictionary *)dictionary inRequestObject:(id<STHTTPNetTaskRequestObject>)requestObject
 {
-    // Only pack non-readonly property
-    return ![attributes containsObject:@"R"];
+    NSString *separator = [self separatorFromRequestObject:requestObject];
+    NSMutableDictionary *parameters = [NSMutableDictionary new];
+    for (NSString *key in dictionary) {
+        NSString *parameterName = [self parameterNameFromName:key withSeparator:separator];
+        id parameterValue = [self parameterValueFromValue:dictionary[key] inRequestObject:requestObject];
+        if (parameterName && parameterValue) {
+            parameters[parameterName] = parameterValue;
+        }
+    }
+    return parameters;
+}
+
+- (id)parameterValueFromValue:(id)value inRequestObject:(id<STHTTPNetTaskRequestObject>)requestObject
+{
+    if ([requestObject respondsToSelector:@selector(transformedValue:)]) {
+        id transformedValue = [requestObject transformValue:value];
+        if (transformedValue != value) {
+            return transformedValue;
+        }
+    }
+    if ([value conformsToProtocol:@protocol(STHTTPNetTaskRequestObject)]) {
+        return [self parametersFromRequestObject:value];
+    }
+    else if ([value isKindOfClass:[NSDictionary class]]) {
+        return [self parametersFromDictionary:value inRequestObject:requestObject];
+    }
+    else if ([value isKindOfClass:[NSNumber class]] ||
+             [value isKindOfClass:[NSString class]] ||
+             [value isKindOfClass:[NSArray class]]) {
+        return value;
+    }
+    return nil;
 }
 
-- (NSString *)parameterNameOfProperty:(NSString *)propertyName withSeparator:(NSString *)separator
+- (NSString *)parameterNameFromName:(NSString *)name withSeparator:(NSString *)separator
 {
     if (!separator) {
-        return propertyName;
+        return name;
     }
 
     NSMutableString *parameterName = [NSMutableString new];
-    const char *chars = propertyName.UTF8String;
-    for (NSUInteger i = 0; i < propertyName.length; i++) {
+    const char *chars = name.UTF8String;
+    for (NSUInteger i = 0; i < name.length; i++) {
         BOOL hasPrevious = i != 0;
-        BOOL hasNext = i + 1 < propertyName.length;
+        BOOL hasNext = i + 1 < name.length;
         BOOL prependUnderscore = NO;
         char ch = chars[i];
         if (isupper(ch)) {
@@ -132,4 +147,19 @@ - (NSString *)parameterNameOfProperty:(NSString *)propertyName withSeparator:(NS
     return [NSString stringWithString:parameterName];
 }
 
+- (NSString *)separatorFromRequestObject:(id<STHTTPNetTaskRequestObject>)requestObject
+{
+    NSString *separator = STHTTPNetTaskRequestObjectDefaultSeparator;
+    if ([requestObject respondsToSelector:@selector(parameterNameSeparator)]) {
+        separator = [requestObject parameterNameSeparator];
+    }
+    return separator;
+}
+
+- (BOOL)shouldPackPropertyWithAttributes:(NSArray *)attributes
+{
+    // Only pack non-readonly property
+    return ![attributes containsObject:@"R"];
+}
+
 @end

STNetTaskQueue/STHTTPNetTaskQueueHandler.m

@@ -222,7 +222,7 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didComp
                                         code:0
                                     userInfo:@{ STHTTPNetTaskErrorStatusCodeUserInfoKey: @(httpResponse.statusCode),
                                                 STHTTPNetTaskErrorResponseDataUserInfoKey: data }];
-            [STNetTaskQueueLog log:_task.description];
+            [STNetTaskQueueLog log:@"\n%@", _task.description];
         }
         [_queue task:_task didFailWithError:error];
     }