Added support for Infinity and -Infinity

client/css/prettyprint.less

@@ -3,7 +3,7 @@
     position: relative;
     white-space: pre;
 
-    .null, .bool, .atom,
+    .null, .bool, .atom, .inf,
     .z, .b, .a {
         color: #0086b3;
     }

client/js/json.coffee

@@ -226,8 +226,12 @@ GenghisJSON =
         # Property value has to be an array, object, literal, or a whitelisted call
         when 'Property'
           if node.value
-            if node.value.type is 'Identifier' and node.value.name is 'NaN'
-              node.update("\"#{node.key.name}\": {\"$genghisType\": \"NaN\"}")
+            # -Infinity is seen as a UnaryExp, so handle it with a special case
+            if node.value.type is 'UnaryExpression' and node.value.argument.type is 'Identifier' and node.value.argument.name is 'Infinity'
+              node.update("\"#{node.key.name}\": {\"$genghisType\": \"-Infinity\"}")
+            # +Infinity and NaN are known identifiers, where the genghisType is the same as the identifier
+            else if node.value.type is 'Identifier' and node.value.name in ['NaN', 'Infinity']
+              node.update("\"#{node.key.name}\": {\"$genghisType\": \"#{node.value.name}\"}")
             else
               unless ALLOWED_PROPERTY_VALUES[node.value.type]
                 addError("Unexpected value: #{node.value.source()}", node.value)
@@ -336,6 +340,10 @@ GenghisJSON =
           "<span class='call bindata'>BinData(#{$subtype}, #{$binary})</span>"
         when 'NaN'
           "<span class='v a'>NaN</span>"
+        when 'Infinity'
+          "<span class='v a inf'>Infinity</span>"
+        when '-Infinity'
+          "<span class='v a inf'>-Infinity</span>"
         when 'Timestamp'
           $t = printScalar(value.$value.$t)
           $i = printScalar(value.$value.$i)

server/php/Genghis/Json.php

@@ -107,6 +107,8 @@ private static function doEncode($object)
             }
         } elseif (is_float($object) && is_nan($object)) {
             return array('$genghisType' => 'NaN');
+        } elseif (is_float($object) && is_infinite($object)) {
+            return array('$genghisType' => $object > 0 ? 'Infinity' : '-Infinity');
         }
 
         return $object;
@@ -158,6 +160,12 @@ private static function doDecode($object)
                     case 'NaN':
                         return NAN;
 
+                    case 'Infinity':
+                        return INF;
+
+                    case '-Infinity':
+                        return -INF;
+
                     case 'Timestamp':
                         $sec = self::getProp($value, 't');
                         $inc = self::getProp($value, 'i');

server/rb/genghis/json.rb

@@ -45,7 +45,7 @@ def enc(o, *a)
         when BSON::Timestamp then thunk('Timestamp', '$t' => o.seconds, '$i' => o.increment)
         when BSON::MinKey then {'$genghisType' => 'MinKey'}
         when BSON::MaxKey then {'$genghisType' => 'MaxKey'}
-        when Float then o.nan? ? {'$genghisType' => 'NaN'} : o
+        when Float then o.nan? ? {'$genghisType' => 'NaN'} : o.finite? ? o : {'$genghisType' => o.to_s}
         else o
         end
       end
@@ -100,6 +100,8 @@ def dec(o)
           when 'MinKey'     then BSON::MinKey.new
           when 'MaxKey'     then BSON::MaxKey.new
           when 'NaN'        then Float::NAN
+          when 'Infinity'   then Float::INFINITY
+          when '-Infinity'  then 0 - Float::INFINITY
           when 'NumberLong' then o['$value'].to_i
           else fail Genghis::MalformedDocument
           end

spec/requests/api_spec.rb

@@ -784,6 +784,34 @@
           end
         end
 
+        context 'with Infinity values' do
+          let(:doc) { {:foo => {'$genghisType' => 'Infinity'}} }
+
+          it 'handles Infinity values like a champ' do
+            expect(res.status).to eq 200
+            expect(res).to be_a_json_response
+            expect(res.body).to match_json_expression \
+              :_id => OBJECT_ID,
+              :foo => {
+                '$genghisType' => 'Infinity'
+              }
+          end
+        end
+
+        context 'with -Infinity values' do
+          let(:doc) { {:foo => {'$genghisType' => '-Infinity'}} }
+
+          it 'handles -Infinity values like a champ' do
+            expect(res.status).to eq 200
+            expect(res).to be_a_json_response
+            expect(res.body).to match_json_expression \
+              :_id => OBJECT_ID,
+              :foo => {
+                '$genghisType' => '-Infinity'
+              }
+          end
+        end
+
         context 'with MinKey and MaxKey values' do
           let(:doc) { {:foo => {'$genghisType' => 'MinKey'}, :bar => {'$genghisType' => 'MaxKey'}} }