oj 2.12.4 → 2.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19a014def903ab0e1994fd5c35f882bbfc4d19b4
-  data.tar.gz: b02d7ad3224f234b26c3a53039c4f802fc362427
+  metadata.gz: e34ba8c73f9262974880d2fcf2be2b7d541b636b
+  data.tar.gz: 11828007a4ddd9c8817e0039e86ff7c8e555a0d2
 SHA512:
-  metadata.gz: d48e74d74f16124fe1a3db9111071886cbcdb2f92714b75a73534125a6c6ae79697d419a31e99a7aa0546a53075e90c83f4d1ee99ebf979c14667f66375c1125
-  data.tar.gz: b8ec4119322934662c75def9c6951b1d27ee10dc9872fa9214f6e511afe4e3e47adc9cd4cde3b7a3addfeaee6cd786f4474c92042c5fe267ff514ebb0c3adba2
+  metadata.gz: 45f5d1cc476dded1921261dbb4ab1eda551ade35d6f66a97174167fed2b09f05d9c6fa8b1c3a1daa8a6f73238a5b48aad8cd81609aa2c5cf99dd696f71be46ce
+  data.tar.gz: 9e89459bceb129fd3607b938c304ebcd6a7c92fdd1aa055b9cea9086a1cdcfa2768c2015c15128840be049e9dac91c76227d4f3b46a5761339babb397a62f183

data/README.md

@@ -26,9 +26,9 @@ Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announceme
 
 [![Build Status](https://secure.travis-ci.org/ohler55/oj.png?branch=master)](http://travis-ci.org/ohler55/oj)
 
-## Current Release 2.12.4
+## Release 2.12.5
 
- - Fixed memory leak in Oj::Doc when not using a given proc.
+ - In :null mode Oj now dumps Infinity and NaN as null.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/dump.c

@@ -457,23 +457,44 @@ dump_float(VALUE obj, Out out) {
 	*b++ = '\0';
 	cnt = 3;
     } else if (OJ_INFINITY == d) {
-	if (StrictMode == out->opts->mode) {
+	switch (out->opts->mode) {
+	case StrictMode:
 	    raise_strict(obj);
+	case NullMode:
+	    strcpy(buf, "null");
+	    cnt = 4;
+	    break;
+	default:
+	    strcpy(buf, "Infinity");
+	    cnt = 8;
+	    break;
 	}
-	strcpy(buf, "Infinity");
-	cnt = 8;
     } else if (-OJ_INFINITY == d) {
-	if (StrictMode == out->opts->mode) {
+	switch (out->opts->mode) {
+	case StrictMode:
 	    raise_strict(obj);
+	case NullMode:
+	    strcpy(buf, "null");
+	    cnt = 4;
+	    break;
+	default:
+	    strcpy(buf, "-Infinity");
+	    cnt = 9;
+	    break;
 	}
-	strcpy(buf, "-Infinity");
-	cnt = 9;
     } else if (isnan(d)) {
-	if (StrictMode == out->opts->mode) {
+	switch (out->opts->mode) {
+	case StrictMode:
 	    raise_strict(obj);
+	case NullMode:
+	    strcpy(buf, "null");
+	    cnt = 4;
+	    break;
+	default:
+	    strcpy(buf, "NaN");
+	    cnt = 3;
+	    break;
 	}
-	strcpy(buf, "NaN");
-	cnt = 3;
     } else if (d == (double)(long long int)d) {
 	cnt = snprintf(buf, sizeof(buf), "%.1f", d);
     } else if (0 == out->opts->float_prec) {

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '2.12.4'
+  VERSION = '2.12.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.12.4
+  version: 2.12.5
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler