support for Number.POSITIVE_INFINITY, Number.NEGATIVE_INFINITY, Numbe…

…r.NaN jeromelebel/MongoHub-Mac#206
jeromelebel · Mar 5, 2015 · 104d9cd · 104d9cd
1 parent 9e8367e
commit 104d9cd
Show file tree

Hide file tree

Showing 4 changed files with 370 additions and 261 deletions.
diff --git a/MongoObjCDriver Tests/MODJsonParsingTestCase.m b/MongoObjCDriver Tests/MODJsonParsingTestCase.m
@@ -368,4 +368,11 @@ - (void)testTrueFalseParsing
                         shouldEqual:[MODSortedDictionary sortedDictionaryWithObjectsAndKeys:[NSNumber numberWithBool:NO], @"false", [NSNumber numberWithBool:YES], @"true", nil]];
 }
 
+- (void)testInfinityAndNaN
+{
+    [self jsonTesterWithJsonToParse:@"{\"infinity\":Number.POSITIVE_INFINITY,\"-infinity\":Number.NEGATIVE_INFINITY,\"NaN\":Number.NaN}"
+                       jsonExpected:nil
+                        shouldEqual:[MODSortedDictionary sortedDictionaryWithObjectsAndKeys:[NSNumber numberWithDouble:INFINITY], @"infinity", [NSNumber numberWithDouble:-INFINITY], @"-infinity", [NSNumber numberWithDouble:-NAN], @"NaN", nil]];
+}
+
 @end
diff --git a/Sources/MODClient_utils.m b/Sources/MODClient_utils.m
@@ -659,14 +659,23 @@ static void convertValueToJson(NSMutableString *result, int indent, id value, NS
                 [result appendString:@"false"];
             }
         } else if (strcmp([value objCType], @encode(double)) == 0 || strcmp([value objCType], @encode(float)) == 0) {
-          NSMutableString *stringValue;
+            NSString *stringValue;
 
-          // make sure a double always ends with .0 (at least)
-          stringValue = [NSMutableString stringWithFormat:@"%.20g", [value doubleValue]];
-          if ([stringValue rangeOfString:@"."].location == NSNotFound) {
-              [stringValue appendString:@".0"];
-          }
-          [result appendString:stringValue];
+            if ([value doubleValue] == INFINITY) {
+                stringValue = @"Number.POSITIVE_INFINITY";
+            } else if ([value doubleValue] == -INFINITY) {
+                stringValue = @"Number.NEGATIVE_INFINITY";
+            } else if (isnan([value doubleValue])) {
+                stringValue = @"Number.NaN";
+            } else {
+                // make sure a double always ends with .0 (at least)
+                NSMutableString *mutableStringValue = [NSMutableString stringWithFormat:@"%.20g", [value doubleValue]];
+                if ([mutableStringValue rangeOfString:@"."].location == NSNotFound) {
+                    [mutableStringValue appendString:@".0"];
+                }
+                stringValue = mutableStringValue;
+            }
+            [result appendString:stringValue];
         } else if (strcmp([value objCType], @encode(long long)) == 0 || strcmp([value objCType], @encode(unsigned long long)) == 0) {
             [result appendFormat:@"NumberLong(%@)", [value description]];
         } else {