oj 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 177a1133df5753c9fd378e44bcf2647c91f2cccf
-  data.tar.gz: d272392dbc1711664cb0aa7127a132ae46e76362
+  metadata.gz: 1d381fbfd7fb7f6a4db7b5a0352dc56e247ff558
+  data.tar.gz: f4bc74121936f923cc619bf6bc8a266489eb16e1
 SHA512:
-  metadata.gz: 5fbd4a3a406b90741f32a2b326035ebbcae1b92183bca17f2a3bf98b54bf14ea225e8c62139de84607a5505beb2e7d1450b1da91bd76d1d743d4aff52cef4ee5
-  data.tar.gz: 907088bc2d7a21f2624d23a317a21deeee6adb1bcf070d904652be25a103d4ad8a6952d2e458ec30666aaf1ccff05608845cc64a9076a6c812dfc0450a6569cc
+  metadata.gz: e1635008e3c52a9b9ed5cbe3b926acac6f5391fa0d894d93d68f1d0dcec5e0904e1cd216ec072eca857ae33d8df3fd32fd4068102626ec87bd724c3cfc9302fc
+  data.tar.gz: 68c45999557700cd5e65cf4c55d4d0da0fa227bc8c5c0c838b6430cc37cb2475d3f2f3a548c4abb9b23130cc44bb9f918a1ee6a8b957133ee072eaab36254be0

data/README.md

@@ -32,6 +32,10 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
+### Release 2.0.9
+
+ - Fixed problem with INFINITY with CentOS and Ruby 2.0.0. There are some header file conflicts so a different INFINITY was used.
+
 ### Release 2.0.8
 
  - Added :bigdecimal_load option that forces all decimals in a JSON string to be read as BigDecimals instead of as
@@ -43,11 +47,6 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
  - All tests pass with Ruby 2.0.0-p0. Had to modify Exception encoding slightly.
 
-### Release 2.0.7
-
- - Fixed bug where undefined classes specified in a JSON document would freeze Ruby instead of raising an exception when
-   the auto_define option was not set. (It seems that Ruby freezes on trying to add variables to nil.)
-
 ## <a name="description">Description</a>
 
 Optimized JSON (Oj), as the name implies was written to provide speed

data/ext/oj/dump.c

@@ -45,11 +45,8 @@
 #define rb_eEncodingError	rb_eException
 #endif
 
-//Workaround:
-#ifndef INFINITY
-#define INFINITY (1.0/0.0)
-#endif
-      
+// Workaround in case INFINITY is not defined in math.h or if the OS is CentOS
+#define OJ_INFINITY (1.0/0.0)
 
 typedef unsigned long	ulong;
 
@@ -431,10 +428,10 @@ dump_float(VALUE obj, Out out) {
 	*b++ = '0';
 	*b++ = '\0';
 	cnt = 3;
-    } else if (INFINITY == d) {
+    } else if (OJ_INFINITY == d) {
 	strcpy(buf, "Infinity");
 	cnt = 8;
-    } else if (-INFINITY == d) {
+    } else if (-OJ_INFINITY == d) {
 	strcpy(buf, "-Infinity");
 	cnt = 9;
     } else if (d == (double)(long long int)d) {

data/ext/oj/load.c

@@ -39,10 +39,8 @@
 #include <string.h>
 #include <math.h>
 
-//Workaround:
-#ifndef INFINITY
-#define INFINITY (1.0/0.0)
-#endif
+// Workaround in case INFINITY is not defined in math.h or if the OS is CentOS
+#define OJ_INFINITY (1.0/0.0)
 
 #include "oj.h"
 
@@ -753,9 +751,9 @@ read_num(ParseInfo pi) {
 	    return num;
 	} else {
 	    if (neg) {
-		return rb_float_new(-INFINITY);
+		return rb_float_new(-OJ_INFINITY);
 	    } else {
-		return rb_float_new(INFINITY);
+		return rb_float_new(OJ_INFINITY);
 	    }
 	}
     }

data/ext/oj/saj.c

@@ -36,10 +36,8 @@
 #include <string.h>
 #include <math.h>
 
-/* Workaround: */
-#ifndef INFINITY
-#define INFINITY (1.0/0.0)
-#endif
+// Workaround in case INFINITY is not defined in math.h or if the OS is CentOS
+#define OJ_INFINITY (1.0/0.0)
 
 #include "oj.h"
 
@@ -384,11 +382,11 @@ read_num(ParseInfo pi, const char *key) {
 	pi->s += 8;
 	if (neg) {
 	    if (pi->has_add_value) {
-		call_add_value(pi->handler, rb_float_new(-INFINITY), key);
+		call_add_value(pi->handler, rb_float_new(-OJ_INFINITY), key);
 	    }
 	} else {
 	    if (pi->has_add_value) {
-		call_add_value(pi->handler, rb_float_new(INFINITY), key);
+		call_add_value(pi->handler, rb_float_new(OJ_INFINITY), key);
 	    }
 	}
 	return;

data/lib/oj/version.rb

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

data/test/test_saj.rb

@@ -178,9 +178,7 @@ class SajTest < ::Test::Unit::TestCase
     json = %{12345xyz}
     Oj.saj_parse(handler, json)
     assert_equal([[:add_value, 12345, nil],
-                  [:error, "invalid format, extra characters at line 1, column 6 [saj.c:716]", 1, 6]], handler.calls)
+                  [:error, "invalid format, extra characters at line 1, column 6 [saj.c:714]", 1, 6]], handler.calls)
   end
 
 end
-
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com