All the tests pass!

calebd · calebd · commit 4e49086ec1df · 2014-02-18T15:14:08.000-08:00
diff --git a/CMDQueryStringSerialization.xcodeproj/project.pbxproj b/CMDQueryStringSerialization.xcodeproj/project.pbxproj
@@ -17,7 +17,7 @@
 		3BF7142818B3FB3200D596B6 /* CMDQueryStringWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BF7142718B3FB3200D596B6 /* CMDQueryStringWriter.m */; };
 		3BF7142918B3FB3200D596B6 /* CMDQueryStringWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BF7142718B3FB3200D596B6 /* CMDQueryStringWriter.m */; };
 		93832CBD18957BCD005D5744 /* CMDQueryStringMultipleKeysArrayTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 93832CBC18957BCD005D5744 /* CMDQueryStringMultipleKeysArrayTransformer.m */; };
-		93832CC618957F4A005D5744 /* CMDQueryStringMultipleBracketedKeysArrayTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 93832CC518957F4A005D5744 /* CMDQueryStringMultipleBracketedKeysArrayTransformer.m */; };
+		93832CC618957F4A005D5744 /* CMDQueryStringMultipleKeysWithBracketsArrayTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 93832CC518957F4A005D5744 /* CMDQueryStringMultipleKeysWithBracketsArrayTransformer.m */; };
 		93832CC918957F8F005D5744 /* CMDQueryStringCommaSeparatedArrayTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 93832CC818957F8F005D5744 /* CMDQueryStringCommaSeparatedArrayTransformer.m */; };
 		93832CCC189582EF005D5744 /* CMDKeyValuePairString.m in Sources */ = {isa = PBXBuildFile; fileRef = 93832CCB189582EF005D5744 /* CMDKeyValuePairString.m */; };
 		93832CCF18958BAF005D5744 /* NSString+CMDQueryStringSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 93832CCE18958BAF005D5744 /* NSString+CMDQueryStringSerialization.m */; };
@@ -48,6 +48,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		3B63E2C518B415E7002812A5 /* CMDQueryStringValueTransformer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CMDQueryStringValueTransformer.h; sourceTree = "<group>"; };
 		3B6EAF9A188F5D78005D2EB4 /* libCMDQueryStringSerialization.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libCMDQueryStringSerialization.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B6EAFA1188F5D78005D2EB4 /* CMDQueryStringSerialization-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CMDQueryStringSerialization-Prefix.pch"; sourceTree = "<group>"; };
 		3B6EAFA2188F5D78005D2EB4 /* CMDQueryStringSerialization.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CMDQueryStringSerialization.h; sourceTree = "<group>"; };
@@ -63,8 +64,8 @@
 		93832CBB18957BCD005D5744 /* CMDQueryStringMultipleKeysArrayTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMDQueryStringMultipleKeysArrayTransformer.h; sourceTree = "<group>"; };
 		93832CBC18957BCD005D5744 /* CMDQueryStringMultipleKeysArrayTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CMDQueryStringMultipleKeysArrayTransformer.m; sourceTree = "<group>"; };
 		93832CC118957E74005D5744 /* CMDQueryStringArrayTransformer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CMDQueryStringArrayTransformer.h; sourceTree = "<group>"; };
-		93832CC418957F4A005D5744 /* CMDQueryStringMultipleBracketedKeysArrayTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMDQueryStringMultipleBracketedKeysArrayTransformer.h; sourceTree = "<group>"; };
-		93832CC518957F4A005D5744 /* CMDQueryStringMultipleBracketedKeysArrayTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CMDQueryStringMultipleBracketedKeysArrayTransformer.m; sourceTree = "<group>"; };
+		93832CC418957F4A005D5744 /* CMDQueryStringMultipleKeysWithBracketsArrayTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMDQueryStringMultipleKeysWithBracketsArrayTransformer.h; sourceTree = "<group>"; };
+		93832CC518957F4A005D5744 /* CMDQueryStringMultipleKeysWithBracketsArrayTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CMDQueryStringMultipleKeysWithBracketsArrayTransformer.m; sourceTree = "<group>"; };
 		93832CC718957F8F005D5744 /* CMDQueryStringCommaSeparatedArrayTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMDQueryStringCommaSeparatedArrayTransformer.h; sourceTree = "<group>"; };
 		93832CC818957F8F005D5744 /* CMDQueryStringCommaSeparatedArrayTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CMDQueryStringCommaSeparatedArrayTransformer.m; sourceTree = "<group>"; };
 		93832CCA189582EF005D5744 /* CMDKeyValuePairString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMDKeyValuePairString.h; sourceTree = "<group>"; };
@@ -177,13 +178,14 @@
 		93832CC218957E89005D5744 /* Arrays */ = {
 			isa = PBXGroup;
 			children = (
+				3B63E2C518B415E7002812A5 /* CMDQueryStringValueTransformer.h */,
 				93832CC118957E74005D5744 /* CMDQueryStringArrayTransformer.h */,
 				93832CC718957F8F005D5744 /* CMDQueryStringCommaSeparatedArrayTransformer.h */,
 				93832CC818957F8F005D5744 /* CMDQueryStringCommaSeparatedArrayTransformer.m */,
 				93832CBB18957BCD005D5744 /* CMDQueryStringMultipleKeysArrayTransformer.h */,
 				93832CBC18957BCD005D5744 /* CMDQueryStringMultipleKeysArrayTransformer.m */,
-				93832CC418957F4A005D5744 /* CMDQueryStringMultipleBracketedKeysArrayTransformer.h */,
-				93832CC518957F4A005D5744 /* CMDQueryStringMultipleBracketedKeysArrayTransformer.m */,
+				93832CC418957F4A005D5744 /* CMDQueryStringMultipleKeysWithBracketsArrayTransformer.h */,
+				93832CC518957F4A005D5744 /* CMDQueryStringMultipleKeysWithBracketsArrayTransformer.m */,
 			);
 			name = Arrays;
 			sourceTree = "<group>";
@@ -274,7 +276,7 @@
 				93832CC918957F8F005D5744 /* CMDQueryStringCommaSeparatedArrayTransformer.m in Sources */,
 				3BF7142418B3FAD300D596B6 /* CMDQueryStringReader.m in Sources */,
 				93832CCC189582EF005D5744 /* CMDKeyValuePairString.m in Sources */,
-				93832CC618957F4A005D5744 /* CMDQueryStringMultipleBracketedKeysArrayTransformer.m in Sources */,
+				93832CC618957F4A005D5744 /* CMDQueryStringMultipleKeysWithBracketsArrayTransformer.m in Sources */,
 				93832CBD18957BCD005D5744 /* CMDQueryStringMultipleKeysArrayTransformer.m in Sources */,
 				3BF7142818B3FB3200D596B6 /* CMDQueryStringWriter.m in Sources */,
 			);
diff --git a/CMDQueryStringSerialization/CMDQueryStringArrayTransformer.h b/CMDQueryStringSerialization/CMDQueryStringArrayTransformer.h
@@ -7,7 +7,8 @@
 //
 
 /**
- Defines an interface for transforming a key and array of values into an array of query string key/value pairs.
+ Defines an interface for transforming a key and array of values into an array
+ of query string key/value pairs.
  */
 @protocol CMDQueryStringArrayTransformer <NSObject>
 
diff --git a/CMDQueryStringSerialization/CMDQueryStringCommaSeparatedArrayTransformer.h b/CMDQueryStringSerialization/CMDQueryStringCommaSeparatedArrayTransformer.h
@@ -6,11 +6,8 @@
 //  Copyright (c) 2014 Caleb Davenport. All rights reserved.
 //
 
-#import "CMDQueryStringArrayTransformer.h"
+#import "CMDQueryStringValueTransformer.h"
 
-/**
- Transforms a key and array of values into a single key/value pair where the value contains the array's values separated by a comma.
- */
-@interface CMDQueryStringCommaSeparatedArrayTransformer : NSObject <CMDQueryStringArrayTransformer>
+@interface CMDQueryStringCommaSeparatedArrayTransformer : NSObject <CMDQueryStringValueTransformer>
 
 @end
diff --git a/CMDQueryStringSerialization/CMDQueryStringCommaSeparatedArrayTransformer.m b/CMDQueryStringSerialization/CMDQueryStringCommaSeparatedArrayTransformer.m
@@ -6,23 +6,23 @@
 //  Copyright (c) 2014 Caleb Davenport. All rights reserved.
 //
 
-#import "CMDKeyValuePairString.h"
 #import "CMDQueryStringCommaSeparatedArrayTransformer.h"
 #import "NSString+CMDQueryStringSerialization.h"
 
 @implementation CMDQueryStringCommaSeparatedArrayTransformer
 
 #pragma mark - CMDQueryStringArrayTransformer
 
-+ (NSArray *)keyValuePairStringsFromKey:(NSString *)key values:(NSArray *)values {
-    NSMutableArray *escapedValues = [NSMutableArray arrayWithCapacity:[values count]];
++ (NSString *)stringWithKey:(NSString *)key value:(id)value {
+    NSMutableArray *escapedValues = [NSMutableArray arrayWithCapacity:[value count]];
     
-    [values enumerateObjectsUsingBlock:^(NSString *value, NSUInteger index, BOOL *stop) {
+    [value enumerateObjectsUsingBlock:^(NSString *value, NSUInteger index, BOOL *stop) {
         [escapedValues addObject:[value cmd_stringByAddingEscapes]];
     }];
     
-    return @[[CMDKeyValuePairString pairStringWithKey:[key cmd_stringByAddingEscapes]
-                                                value:[escapedValues componentsJoinedByString:@","]]];
+    key = [key cmd_stringByAddingEscapes];
+    value = [escapedValues componentsJoinedByString:@","];
+    return [NSString stringWithFormat:@"%@=%@", key, value];
 }
 
 @end
diff --git a/CMDQueryStringSerialization/CMDQueryStringMultipleBracketedKeysArrayTransformer.h b/CMDQueryStringSerialization/CMDQueryStringMultipleBracketedKeysArrayTransformer.h
diff --git a/CMDQueryStringSerialization/CMDQueryStringMultipleKeysArrayTransformer.h b/CMDQueryStringSerialization/CMDQueryStringMultipleKeysArrayTransformer.h
@@ -6,11 +6,8 @@
 //  Copyright (c) 2014 Caleb Davenport. All rights reserved.
 //
 
-#import "CMDQueryStringArrayTransformer.h"
+#import "CMDQueryStringValueTransformer.h"
 
-/**
- Transforms a key and array of values into multiple key/value pairs.
- */
-@interface CMDQueryStringMultipleKeysArrayTransformer : NSObject <CMDQueryStringArrayTransformer>
+@interface CMDQueryStringMultipleKeysArrayTransformer : NSObject <CMDQueryStringValueTransformer>
 
 @end
diff --git a/CMDQueryStringSerialization/CMDQueryStringMultipleKeysArrayTransformer.m b/CMDQueryStringSerialization/CMDQueryStringMultipleKeysArrayTransformer.m
@@ -6,25 +6,24 @@
 //  Copyright (c) 2014 Caleb Davenport. All rights reserved.
 //
 
-#import "CMDKeyValuePairString.h"
 #import "CMDQueryStringMultipleKeysArrayTransformer.h"
 #import "NSString+CMDQueryStringSerialization.h"
 
 @implementation CMDQueryStringMultipleKeysArrayTransformer
 
 #pragma mark - CMDQueryStringArrayTransformer
 
-+ (NSArray *)keyValuePairStringsFromKey:(NSString *)key values:(NSArray *)values {
-    NSMutableArray *mutablePairs = [[NSMutableArray alloc] init];
++ (NSString *)stringWithKey:(NSString *)key value:(id)value {
+    NSMutableArray *pairs = [[NSMutableArray alloc] init];
     
-    [values enumerateObjectsUsingBlock:^(NSString *value, NSUInteger index, BOOL *stop) {
+    [value enumerateObjectsUsingBlock:^(NSString *value, NSUInteger index, BOOL *stop) {
         NSString *escapedKey = [key cmd_stringByAddingEscapes];
         NSString *escapedValue = [value cmd_stringByAddingEscapes];
-        
-        [mutablePairs addObject:[CMDKeyValuePairString pairStringWithKey:escapedKey value:escapedValue]];
+        NSString *string = [NSString stringWithFormat:@"%@=%@", escapedKey, escapedValue];
+        [pairs addObject:string];
     }];
     
-    return [mutablePairs copy];
+    return [pairs componentsJoinedByString:@"&"];
 }
 
 @end
diff --git a/CMDQueryStringSerialization/CMDQueryStringMultipleKeysWithBracketsArrayTransformer.h b/CMDQueryStringSerialization/CMDQueryStringMultipleKeysWithBracketsArrayTransformer.h
@@ -0,0 +1,13 @@
+//
+//  CMDQueryStringMultipleBracketedKeysArrayTransformer.h
+//  CMDQueryStringSerialization
+//
+//  Created by Bryan Irace on 1/26/14.
+//  Copyright (c) 2014 Caleb Davenport. All rights reserved.
+//
+
+#import "CMDQueryStringValueTransformer.h"
+
+@interface CMDQueryStringMultipleKeysWithBracketsArrayTransformer : NSObject <CMDQueryStringValueTransformer>
+
+@end
diff --git a/CMDQueryStringSerialization/CMDQueryStringMultipleKeysWithBracketsArrayTransformer.m b/CMDQueryStringSerialization/CMDQueryStringMultipleKeysWithBracketsArrayTransformer.m
@@ -6,25 +6,24 @@
 //  Copyright (c) 2014 Caleb Davenport. All rights reserved.
 //
 
-#import "CMDKeyValuePairString.h"
-#import "CMDQueryStringMultipleBracketedKeysArrayTransformer.h"
+#import "CMDQueryStringMultipleKeysWithBracketsArrayTransformer.h"
 #import "NSString+CMDQueryStringSerialization.h"
 
-@implementation CMDQueryStringMultipleBracketedKeysArrayTransformer
+@implementation CMDQueryStringMultipleKeysWithBracketsArrayTransformer
 
 #pragma mark - CMDQueryStringArrayTransformer
 
-+ (NSArray *)keyValuePairStringsFromKey:(NSString *)key values:(NSArray *)values {
++ (NSString *)stringWithKey:(NSString *)key value:(id)value {
     NSMutableArray *mutablePairs = [[NSMutableArray alloc] init];
     
-    [values enumerateObjectsUsingBlock:^(NSString *value, NSUInteger index, BOOL *stop) {
+    [value enumerateObjectsUsingBlock:^(NSString *value, NSUInteger index, BOOL *stop) {
         NSString *escapedKey = [[key cmd_stringByAddingEscapes] stringByAppendingString:@"[]"];
         NSString *escapedValue = [value cmd_stringByAddingEscapes];
-        
-        [mutablePairs addObject:[CMDKeyValuePairString pairStringWithKey:escapedKey value:escapedValue]];
+        NSString *string = [NSString stringWithFormat:@"%@=%@", escapedKey, escapedValue];
+        [mutablePairs addObject:string];
     }];
     
-    return [mutablePairs copy];
+    return [mutablePairs componentsJoinedByString:@"&"];
 }
 
 @end
diff --git a/CMDQueryStringSerialization/CMDQueryStringSerialization.m b/CMDQueryStringSerialization/CMDQueryStringSerialization.m
@@ -24,7 +24,7 @@ + (NSString *)queryStringWithDictionary:(NSDictionary *)dictionary {
 
 
 + (NSString *)queryStringWithDictionary:(NSDictionary *)dictionary options:(CMDQueryStringWritingOptions)options {
-    CMDQueryStringWriter *writer = [[CMDQueryStringWriter alloc] initWithDictionary:dictionary];
+    CMDQueryStringWriter *writer = [[CMDQueryStringWriter alloc] initWithDictionary:dictionary options:options];
     return [writer stringValue];
 }
 
@@ -94,12 +94,6 @@ + (NSString *)queryStringWithDictionary:(NSDictionary *)dictionary options:(CMDQ
 //
 //#pragma mark - Serialization
 //
-//<<<<<<< HEAD
-//- (NSString *)cmd_stringByRemovingEscapes {
-//    return [self stringByRemovingPercentEncoding] ?: @"";
-//}
-//
-//
 //- (void)cmd_enumeratePairs:(void (^) (NSString *key, NSString *value))block {
 //    if ([self length] == 0) {
 //        return;
@@ -154,31 +148,3 @@ + (NSString *)queryStringWithDictionary:(NSDictionary *)dictionary options:(CMDQ
 //}
 //
 //@end
-//
-//@implementation NSMutableDictionary (CMDQueryStringSerialization)
-//
-//- (void)cmd_addObject:(id)object forKey:(NSString *)key {
-//    id existingObject = self[key];
-//    
-//    if (existingObject) {
-//        if ([existingObject isKindOfClass:[NSArray class]]) {
-//            self[key] = [existingObject arrayByAddingObject:object];
-//        }
-//        else {
-//            self[key] = @[ existingObject, object ];
-//        }
-//    }
-//    else {
-//        self[key] = object;
-//    }
-//}
-//
-//@end
-//
-//@implementation NSNumber (CMDQueryStringSerialization)
-//
-//-(NSString *)cmd_stringByAddingEscapes {
-//    return [[self stringValue] cmd_stringByAddingEscapes];
-//}
-//
-//@end
diff --git a/CMDQueryStringSerialization/CMDQueryStringValueTransformer.h b/CMDQueryStringSerialization/CMDQueryStringValueTransformer.h
@@ -0,0 +1,14 @@
+//
+//  CMDQueryStringValueTransformer.h
+//  CMDQueryStringSerialization
+//
+//  Created by Caleb Davenport on 2/18/14.
+//  Copyright (c) 2014 Caleb Davenport. All rights reserved.
+//
+
+@protocol CMDQueryStringValueTransformer <NSObject>
+@required
+
++ (NSString *)stringWithKey:(NSString *)key value:(id)value;
+
+@end
diff --git a/CMDQueryStringSerialization/CMDQueryStringWriter.h b/CMDQueryStringSerialization/CMDQueryStringWriter.h
@@ -6,9 +6,11 @@
 //  Copyright (c) 2014 Caleb Davenport. All rights reserved.
 //
 
+#import "CMDQueryStringSerialization.h"
+
 @interface CMDQueryStringWriter : NSObject
 
-- (instancetype)initWithDictionary:(NSDictionary *)dictionary;
+- (instancetype)initWithDictionary:(NSDictionary *)dictionary options:(CMDQueryStringWritingOptions)options;
 
 - (NSString *)stringValue;
 
diff --git a/CMDQueryStringSerialization/CMDQueryStringWriter.m b/CMDQueryStringSerialization/CMDQueryStringWriter.m
@@ -8,17 +8,25 @@
 
 #import "CMDQueryStringWriter.h"
 #import "NSString+CMDQueryStringSerialization.h"
+#import "CMDQueryStringSerialization.h"
+#import "CMDQueryStringCommaSeparatedArrayTransformer.h"
+#import "CMDQueryStringMultipleKeysArrayTransformer.h"
+#import "CMDQueryStringMultipleKeysWithBracketsArrayTransformer.h"
 
 @implementation CMDQueryStringWriter {
     NSMutableDictionary *_dictionary;
+    CMDQueryStringWritingOptions _options;
 }
 
-- (instancetype)initWithDictionary:(NSDictionary *)dictionary {
+#pragma mark - Public
+
+- (instancetype)initWithDictionary:(NSDictionary *)dictionary options:(CMDQueryStringWritingOptions)options {
     if (!dictionary) {
         return nil;
     }
     if ((self = [super init])) {
         _dictionary = [dictionary mutableCopy];
+        _options = options;
     }
     return self;
 }
@@ -27,22 +35,54 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary {
 - (NSString *)stringValue {
     NSMutableArray *pairs = [NSMutableArray new];
     [_dictionary enumerateKeysAndObjectsUsingBlock:^(id key, id value, BOOL *stop) {
-        if ([value isKindOfClass:[NSString class]]) {
-            value = [value cmd_stringByAddingEscapes];
-        }
-        else if ([value isKindOfClass:[NSNumber class]]) {
-            value = [value stringValue];
+        NSString *string = [self stringWithKey:key value:value];
+        [pairs addObject:string];
+    }];
+    return [pairs componentsJoinedByString:@"&"];
+}
+
+
+#pragma mark - Private
+
+- (NSString *)stringWithKey:(id)key value:(id)value {
+    
+    // Be sure the key is a string
+    if (![key isKindOfClass:[NSString class]]) {
+        [NSException raise:NSInvalidArgumentException format:nil];
+    }
+    key = [key cmd_stringByAddingEscapes];
+    
+    // Escape strings
+    if ([value isKindOfClass:[NSString class]]) {
+        value = [value cmd_stringByAddingEscapes];
+    }
+    
+    // Convert numbers into strings
+    else if ([value isKindOfClass:[NSNumber class]]) {
+        value = [value stringValue];
+    }
+    
+    // Transform arrays
+    else if ([value isKindOfClass:[NSArray class]]) {
+        if ((_options & CMDQueryStringWritingOptionArrayCommaSeparatedValues) == CMDQueryStringWritingOptionArrayCommaSeparatedValues) {
+            value = [CMDQueryStringCommaSeparatedArrayTransformer stringWithKey:key value:value];
         }
-        else if ([value isKindOfClass:[NSArray class]]) {
-            value = [value description];
+        else if ((_options & CMDQueryStringWritingOptionArrayRepeatKeysWithBrackets) == CMDQueryStringWritingOptionArrayRepeatKeysWithBrackets) {
+            value = [CMDQueryStringMultipleKeysWithBracketsArrayTransformer stringWithKey:key value:value];
         }
-        else {
-            [NSException raise:NSInvalidArgumentException format:nil];
+        else if ((_options & CMDQueryStringWritingOptionArrayRepeatKeys) == CMDQueryStringWritingOptionArrayRepeatKeys) {
+            value = [CMDQueryStringMultipleKeysArrayTransformer stringWithKey:key value:value];
         }
-        NSString *pair = [NSString stringWithFormat:@"%@=%@", [key cmd_stringByAddingEscapes], value];
-        [pairs addObject:pair];
-    }];
-    return [pairs componentsJoinedByString:@"&"];
+        return value;
+    }
+    
+    // Bail out
+    else {
+        [NSException raise:NSInvalidArgumentException format:nil];
+    }
+    
+    // Flatten
+    return [NSString stringWithFormat:@"%@=%@", key, value];
 }
 
 @end
diff --git a/CMDQueryStringSerializationTests/CMDQueryStringSerializationTests.m b/CMDQueryStringSerializationTests/CMDQueryStringSerializationTests.m
