Merge pull request #91 from tumblr/feature/ziba-nested-dictionaries

Adding Ziba's nested parameter dictionary changes, along with a test

Author: irace

Podfile

@@ -4,8 +4,3 @@ platform :ios, '5.0'
 
 pod 'JXHTTP', '~> 2.0'
 pod 'Spectacles', '~> 1.0'
-
-target :test, :exclusive => true do
-    link_with 'TMTumblrSDKTests'
-    pod 'OCMock'
-end

TMTumblrSDK.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "TMTumblrSDK",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "summary": "An unopinionated and flexible library for easily integrating Tumblr data into your iOS or OS X application.",
   "authors": {
     "Bryan Irace": "[email protected]"
@@ -12,7 +12,7 @@
   },
   "source": {
     "git": "https://github.com/tumblr/TMTumblrSDK.git",
-    "tag": "2.1.2"
+    "tag": "2.1.3"
   },
   "requires_arc": true,
   "platforms": {

TMTumblrSDK.xcodeproj/project.pbxproj

@@ -32,30 +32,22 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "93E52A80168BB43700E5471A"
-               BuildableName = "TMTumblrSDKTests.xctest"
-               BlueprintName = "TMTumblrSDKTests"
+               BlueprintIdentifier = "93A015BA1B0696E20047F8C4"
+               BuildableName = "Tests.xctest"
+               BlueprintName = "Tests"
                ReferencedContainer = "container:TMTumblrSDK.xcodeproj">
             </BuildableReference>
-            <SkippedTests>
-               <Test
-                  Identifier = "TMAPIClientBlogTest">
-               </Test>
-               <Test
-                  Identifier = "TMAPIClientPostTest">
-               </Test>
-               <Test
-                  Identifier = "TMAPIClientTagTest">
-               </Test>
-               <Test
-                  Identifier = "TMAPIClientUnitTest">
-               </Test>
-               <Test
-                  Identifier = "TMAPIClientUserTest">
-               </Test>
-            </SkippedTests>
          </TestableReference>
       </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "93E52A6F168BB43600E5471A"
+            BuildableName = "libTMTumblrSDK.a"
+            BlueprintName = "TMTumblrSDK"
+            ReferencedContainer = "container:TMTumblrSDK.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -66,6 +58,15 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "93E52A6F168BB43600E5471A"
+            BuildableName = "libTMTumblrSDK.a"
+            BlueprintName = "TMTumblrSDK"
+            ReferencedContainer = "container:TMTumblrSDK.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
@@ -75,6 +76,15 @@
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "93E52A6F168BB43600E5471A"
+            BuildableName = "libTMTumblrSDK.a"
+            BlueprintName = "TMTumblrSDK"
+            ReferencedContainer = "container:TMTumblrSDK.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

TMTumblrSDK.xcodeproj/xcshareddata/xcschemes/TMTumblrSDK.xcscheme

@@ -58,21 +58,30 @@ @implementation TMSDKFunctions
 NSString *TMDictionaryToQueryString(NSDictionary *dictionary) {
     NSMutableArray *parameters = [NSMutableArray array];
 
-    void (^addParameter)(NSString *key, NSString *value) = ^(NSString *key, NSString *value) {
-        [parameters addObject:[NSString stringWithFormat:@"%@=%@", TMURLEncode(key), TMURLEncode(value)]];
-    };
-    
     for (NSString *key in [[dictionary allKeys] sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)]) {
-        id value = dictionary[key];
-        
-        if ([value isKindOfClass:[NSArray class]]) {
-            for (NSString *arrayValue in (NSArray *)value)
-                addParameter(key, arrayValue);
-        } else
-            addParameter(key, value);
+        TMAddKeyValuePairToQueryStringMutableArray(key, dictionary[key], parameters);
     }
 
     return [parameters componentsJoinedByString:@"&"];
 }
 
+#pragma mark - Private
+
+void TMAddKeyValuePairToQueryStringMutableArray(NSString *key, id value, NSMutableArray *parameters) {
+    if ([value isKindOfClass:[NSDictionary class]]) {
+        NSDictionary *dictionary = (NSDictionary *)value;
+        for (NSString *subKey in [dictionary.allKeys sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)]) {
+            TMAddKeyValuePairToQueryStringMutableArray([NSString stringWithFormat:@"%@[%@]", key, subKey], dictionary[subKey], parameters);
+        }
+    }
+    else if ([value isKindOfClass:[NSArray class]]) {
+        for (id arrayValue in (NSArray *)value){
+            TMAddKeyValuePairToQueryStringMutableArray(key, arrayValue, parameters);
+        }
+    }
+    else {
+        [parameters addObject:[NSString stringWithFormat:@"%@=%@", TMURLEncode(key), TMURLEncode(value)]];
+    }
+}
+
 @end