Minor cleanup.

Author: calebd

CMDQueryStringSerialization/CMDQueryStringArrayTransformer.m

@@ -15,22 +15,21 @@ @implementation CMDQueryStringArrayTransformer
 + (NSString *)stringWithKey:(NSString *)key value:(id)value options:(CMDQueryStringWritingOptions)options {
     NSArray *escapedValues = [value valueForKey:@"cmd_stringByAddingEscapes"];
     if ((options & CMDQueryStringWritingOptionArrayCommaSeparatedValues) == CMDQueryStringWritingOptionArrayCommaSeparatedValues) {
-        key = [key cmd_stringByAddingEscapes];
         value = [escapedValues componentsJoinedByString:@","];
         return [NSString stringWithFormat:@"%@=%@", key, value];
     }
     else if ((options & CMDQueryStringWritingOptionArrayRepeatKeysWithBrackets) == CMDQueryStringWritingOptionArrayRepeatKeysWithBrackets) {
         NSMutableArray *pairs = [NSMutableArray new];
         for (id escapedValue in escapedValues) {
-            NSString *string = [NSString stringWithFormat:@"%@[]=%@", [key cmd_stringByAddingEscapes], escapedValue];
+            NSString *string = [NSString stringWithFormat:@"%@[]=%@", key, escapedValue];
             [pairs addObject:string];
         }
         return [pairs componentsJoinedByString:@"&"];
     }
     else if ((options & CMDQueryStringWritingOptionArrayRepeatKeys) == CMDQueryStringWritingOptionArrayRepeatKeys) {
         NSMutableArray *pairs = [NSMutableArray new];
         for (id escapedValue in escapedValues) {
-            NSString *string = [NSString stringWithFormat:@"%@=%@", [key cmd_stringByAddingEscapes], escapedValue];
+            NSString *string = [NSString stringWithFormat:@"%@=%@", key, escapedValue];
             [pairs addObject:string];
         }
         return [pairs componentsJoinedByString:@"&"];

CMDQueryStringSerialization/CMDQueryStringNumberTransformer.m

@@ -13,9 +13,7 @@ @implementation CMDQueryStringNumberTransformer
 #pragma mark - CMDQueryStringValueTransformer
 
 + (NSString *)stringWithKey:(NSString *)key value:(id)value options:(CMDQueryStringWritingOptions)options {
-    NSString *escapedKey = [key cmd_stringByAddingEscapes];
-    NSString *escapedValue = [[value stringValue] cmd_stringByAddingEscapes];
-    return [NSString stringWithFormat:@"%@=%@", escapedKey, escapedValue];
+    return [NSString stringWithFormat:@"%@=%@", key, [value stringValue]];
 }
 
 @end

CMDQueryStringSerialization/CMDQueryStringSerialization.m

@@ -20,9 +20,9 @@ + (NSDictionary *)dictionaryWithQueryString:(NSString *)string {
 
 + (NSString *)queryStringWithDictionary:(NSDictionary *)dictionary {
     CMDQueryStringWritingOptions options = (
-                                            CMDQueryStringWritingOptionArrayRepeatKeysWithBrackets |
-                                            CMDQueryStringWritingOptionDateAsUnixTimestamp
-                                            );
+        CMDQueryStringWritingOptionArrayRepeatKeysWithBrackets |
+        CMDQueryStringWritingOptionDateAsUnixTimestamp
+    );
     return [self queryStringWithDictionary:dictionary options:options];
 }
 

CMDQueryStringSerialization/CMDQueryStringStringTransformer.m

@@ -7,15 +7,14 @@
 //
 
 #import "CMDQueryStringStringTransformer.h"
+#import "NSString+CMDQueryStringSerialization.h"
 
 @implementation CMDQueryStringStringTransformer
 
 #pragma mark - CMDQueryStringValueTransformer
 
 + (NSString *)stringWithKey:(NSString *)key value:(id)value options:(CMDQueryStringWritingOptions)options {
-    return [NSString stringWithFormat:@"%@=%@",
-            [key cmd_stringByAddingEscapes],
-            [value cmd_stringByAddingEscapes]];
+    return [NSString stringWithFormat:@"%@=%@", key, [value cmd_stringByAddingEscapes]];
 }
 
 @end

CMDQueryStringSerialization/CMDQueryStringValueTransformer.h

@@ -7,7 +7,6 @@
 //
 
 #import "CMDQueryStringSerialization.h"
-#import "NSString+CMDQueryStringSerialization.h"
 
 @protocol CMDQueryStringValueTransformer <NSObject>
 @required

CMDQueryStringSerialization/CMDQueryStringWriter.m

@@ -12,25 +12,26 @@
 #import "CMDQueryStringValueTransformer.h"
 
 @implementation CMDQueryStringWriter {
-    NSMutableDictionary *_dictionary;
+    NSDictionary *_dictionary;
     CMDQueryStringWritingOptions _options;
 }
 
 #pragma mark - Public
 
 - (instancetype)initWithDictionary:(NSDictionary *)dictionary options:(CMDQueryStringWritingOptions)options {
-    if (!dictionary) {
-        return nil;
-    }
     if ((self = [super init])) {
-        _dictionary = [dictionary mutableCopy];
+        _dictionary = [dictionary copy];
         _options = options;
     }
     return self;
 }
 
 
 - (NSString *)stringValue {
+    if (!_dictionary) {
+        return nil;
+    }
+    
     NSMutableArray *pairs = [NSMutableArray new];
     [_dictionary enumerateKeysAndObjectsUsingBlock:^(id key, id value, BOOL *stop) {
         NSString *string = [self stringWithKey:key value:value];