oj 1.4.1 → 1.4.2

data/README.md

@@ -32,6 +32,12 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
+### Release 1.4.2
+
+ - Fixed dump and load of BigDecimals in :object mode.
+
+ - BigDecimals are now dumped and loaded in all modes.
+
 ### Release 1.4.1
 
  - Windows RubyInstaller and TCS-Ruby now supported thanks to Jarmo Pertman. Thanks Jarmo.

data/ext/oj/dump.c

@@ -91,6 +91,8 @@ static void	dump_hash(VALUE obj, int depth, int mode, Out out);
 static void	dump_time(VALUE obj, Out out);
 static void	dump_ruby_time(VALUE obj, Out out);
 static void	dump_xml_time(VALUE obj, Out out);
+static void	dump_data_strict(VALUE obj, Out out);
+static void	dump_data_null(VALUE obj, Out out);
 static void	dump_data_comp(VALUE obj, Out out);
 static void	dump_data_obj(VALUE obj, int depth, Out out);
 static void	dump_obj_comp(VALUE obj, int depth, Out out);
@@ -1029,6 +1031,32 @@ dump_xml_time(VALUE obj, Out out) {
     }
 }
 
+static void
+dump_data_strict(VALUE obj, Out out) {
+    VALUE	clas = rb_obj_class(obj);
+
+    if (oj_bigdecimal_class == clas) {
+	VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+
+	dump_raw(StringValuePtr(rstr), RSTRING_LEN(rstr), out);
+    } else {
+	raise_strict(obj);
+    }
+}
+
+static void
+dump_data_null(VALUE obj, Out out) {
+    VALUE	clas = rb_obj_class(obj);
+
+    if (oj_bigdecimal_class == clas) {
+	VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+
+	dump_raw(StringValuePtr(rstr), RSTRING_LEN(rstr), out);
+    } else {
+	dump_nil(out);
+    }
+}
+
 static void
 dump_data_comp(VALUE obj, Out out) {
     VALUE	clas = rb_obj_class(obj);
@@ -1072,11 +1100,16 @@ dump_data_obj(VALUE obj, int depth, Out out) {
 	*out->cur++ = '}';
 	*out->cur = '\0';
     } else {
-	VALUE	clas = rb_obj_class(obj);
 	Odd	odd = oj_get_odd(clas);
 
 	if (0 == odd) {
-	    dump_nil(out);
+	    if (oj_bigdecimal_class == clas) {
+		VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+
+		dump_raw(StringValuePtr(rstr), RSTRING_LEN(rstr), out);
+	    } else {
+		dump_nil(out);
+	    }
 	} else {
 	    dump_odd(obj, odd, clas, depth + 1, out);
 	}
@@ -1133,7 +1166,13 @@ dump_obj_obj(VALUE obj, int depth, Out out) {
 	Odd	odd = oj_get_odd(clas);
 
 	if (0 == odd) {
-	    dump_obj_attrs(obj, clas, id, depth, out);
+	    if (oj_bigdecimal_class == clas) {
+		VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+
+		dump_raw(StringValuePtr(rstr), RSTRING_LEN(rstr), out);
+	    } else {
+		dump_obj_attrs(obj, clas, id, depth, out);
+	    }
 	} else {
 	    dump_odd(obj, odd, clas, depth + 1, out);
 	}
@@ -1469,8 +1508,8 @@ dump_val(VALUE obj, int depth, Out out) {
 #endif
     case T_OBJECT:
 	switch (out->opts->mode) {
-	case StrictMode:	raise_strict(obj);		break;
-	case NullMode:		dump_nil(out);			break;
+	case StrictMode:	dump_data_strict(obj, out);	break;
+	case NullMode:		dump_data_null(obj, out);	break;
 	case CompatMode:	dump_obj_comp(obj, depth, out);	break;
 	case ObjectMode:
 	default:		dump_obj_obj(obj, depth, out);	break;
@@ -1478,8 +1517,8 @@ dump_val(VALUE obj, int depth, Out out) {
 	break;
     case T_DATA:
 	switch (out->opts->mode) {
-	case StrictMode:	raise_strict(obj);		break;
-	case NullMode:		dump_nil(out);			break;
+	case StrictMode:	dump_data_strict(obj, out);	break;
+	case NullMode:		dump_data_null(obj, out);	break;
 	case CompatMode:	dump_data_comp(obj, out);	break;
 	case ObjectMode:
 	default:		dump_data_obj(obj, depth, out);	break;

data/lib/oj/version.rb

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

data/test/tests.rb

@@ -162,10 +162,6 @@ class Juice < ::Test::Unit::TestCase
     dump_and_load(1, false)
   end
 
-  def test_bignum
-    dump_and_load(12345678901234567890123456789, false)
-  end
-
   def test_float
     dump_and_load(0.0, false)
     dump_and_load(12345.6789, false)
@@ -649,16 +645,16 @@ class Juice < ::Test::Unit::TestCase
 
   # BigDecimal
   def test_bigdecimal_strict
-    begin
-      json = Oj.dump(BigDecimal.new('3.14159265358979323846'), :mode => :strict)
-      assert(false)
-    rescue Exception => e
-      assert(true)
-    end
+    mode = Oj.default_options[:mode]
+    Oj.default_options = {:mode => :strict}
+    dump_and_load(BigDecimal.new('3.14159265358979323846'), false)
+    Oj.default_options = {:mode => mode}
   end
   def test_bigdecimal_null
-    json = Oj.dump(BigDecimal.new('3.14159265358979323846'), :mode => :null)
-    assert_equal('null', json)
+    mode = Oj.default_options[:mode]
+    Oj.default_options = {:mode => :null}
+    dump_and_load(BigDecimal.new('3.14159265358979323846'), false)
+    Oj.default_options = {:mode => mode}
   end
   def test_bigdecimal_compat
     orig = BigDecimal.new('3.14159265358979323846')
@@ -667,11 +663,14 @@ class Juice < ::Test::Unit::TestCase
     assert_equal(orig, bg)
   end
   def test_bigdecimal_object
+    mode = Oj.default_options[:mode]
+    Oj.default_options = {:mode => :object}
     dump_and_load(BigDecimal.new('3.14159265358979323846'), false)
+    Oj.default_options = {:mode => mode}
     # Infinity is the same for Float and BigDecimal
-    json = Oj.dump(BigDecimal.new('Infinity'), :mode => :compat)
+    json = Oj.dump(BigDecimal.new('Infinity'), :mode => :object)
     assert_equal('Infinity', json)
-    json = Oj.dump(BigDecimal.new('-Infinity'), :mode => :compat)
+    json = Oj.dump(BigDecimal.new('-Infinity'), :mode => :object)
     assert_equal('-Infinity', json)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
   prerelease: 
 platform: ruby
 authors: