oj 2.0.2 → 2.0.3

data/README.md

@@ -32,17 +32,9 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 2.0.2
+### Release 2.0.3
 
- - Fixed bug in Oj.load where loading a hash with symbold keys and also turning on symbolize keys would try to symbolize a symbol.
-
-### Release 2.0.1
-
- - BigDecimals now dump to a string in compat mode thanks to cgriego.
-
- - High precision time (nano time) can be turned off for better compatibility with other JSON parsers.
-
- - Times before 1970 now encode correctly.
+ - Fixed round off error in time format when rounding up to the next second.
 
 ## <a name="description">Description</a>
 

data/ext/oj/dump.c

@@ -929,6 +929,7 @@ dump_time(VALUE obj, Out out) {
     long		size;
     char		*dot = b - 10;
     int			neg = 0;
+    long		one = 1000000000;
 #if HAS_RB_TIME_TIMESPEC
     struct timespec	ts = rb_time_timespec(obj);
     time_t		sec = ts.tv_sec;
@@ -960,8 +961,13 @@ dump_time(VALUE obj, Out out) {
 	    for (i = 9 - out->opts->sec_prec; 0 < i; i--) {
 		dot++;
 		nsec = (nsec + 5) / 10;
+		one /= 10;
 	    }
 	}
+	if (one <= nsec) {
+	    nsec -= one;
+	    sec++;
+	}
 	for (; dot < b; b--, nsec /= 10) {
 	    *b = '0' + (nsec % 10);
 	}
@@ -998,6 +1004,7 @@ static void
 dump_xml_time(VALUE obj, Out out) {
     char		buf[64];
     struct tm		*tm;
+    long		one = 1000000000;
 #if HAS_RB_TIME_TIMESPEC
     struct timespec	ts = rb_time_timespec(obj);
     time_t		sec = ts.tv_sec;
@@ -1017,6 +1024,18 @@ dump_xml_time(VALUE obj, Out out) {
     if (out->end - out->cur <= 36) {
 	grow(out, 36);
     }
+    if (9 > out->opts->sec_prec) {
+	int	i;
+
+	for (i = 9 - out->opts->sec_prec; 0 < i; i--) {
+	    nsec = (nsec + 5) / 10;
+	    one /= 10;
+	}
+	if (one <= nsec) {
+	    nsec -= one;
+	    sec++;
+	}
+    }
     // 2012-01-05T23:58:07.123456000+09:00
     //tm = localtime(&sec);
     sec += tz_secs;
@@ -1058,13 +1077,8 @@ dump_xml_time(VALUE obj, Out out) {
 	int	len = 35;
 
 	if (9 > out->opts->sec_prec) {
-	    int	i;
-
 	    format[32] = '0' + out->opts->sec_prec;
-	    for (i = 9 - out->opts->sec_prec; 0 < i; i--) {
-		nsec = (nsec + 5) / 10;
-		len--;
-	    }
+	    len -= 9 - out->opts->sec_prec;
 	}
 	sprintf(buf, format,
 		tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,

data/lib/oj/version.rb

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

data/test/tests.rb

@@ -273,6 +273,9 @@ class Juice < ::Test::Unit::TestCase
     #t = Time.local(2012, 1, 5, 23, 58, 7, 123456)
     json = Oj.dump(t, :mode => :compat, :second_precision => 5)
     assert_equal(%{1325775487.12346}, json)
+    t = Time.xmlschema("2012-01-05T23:58:07.999600+09:00")
+    json = Oj.dump(t, :mode => :compat, :second_precision => 3)
+    assert_equal(%{1325775488.000}, json)
   end    
   def test_unix_time_compat_early
     t = Time.xmlschema("1954-01-05T00:00:00.123456789+00:00")
@@ -347,6 +350,25 @@ class Juice < ::Test::Unit::TestCase
       assert_equal(%{"2012-01-05T23:58:07.12346%s%02d:%02d"} % [sign, tz / 3600, tz / 60 % 60], json)
     end
   end    
+  def test_xml_time_compat_precision_round
+    begin
+      t = Time.new(2012, 1, 5, 23, 58, 7.9996, 32400)
+      json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema, :second_precision => 3)
+      assert_equal(%{"2012-01-05T23:58:08.000+09:00"}, json)
+    rescue Exception
+      # some Rubies (1.8.7) do not allow the timezome to be set
+      t = Time.local(2012, 1, 5, 23, 58, 7, 999600)
+      json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema, :second_precision => 3)
+      tz = t.utc_offset
+      # Ruby does not handle a %+02d properly so...
+      sign = '+'
+      if 0 > tz
+        sign = '-'
+        tz = -tz
+      end
+      assert_equal(%{"2012-01-05T23:58:08%s%02d:%02d"} % [sign, tz / 3600, tz / 60 % 60], json)
+    end
+  end    
   def test_xml_time_compat_zulu
     begin
       t = Time.new(2012, 1, 5, 23, 58, 7.0, 0)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies: []
 description: ! 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com