oj 2.10.2 → 2.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a212c2204a5f29bb42b42ed9db56d51f44bda08
-  data.tar.gz: 6f151a8f68ff8720ebb3e1dac263b234d0cedb00
+  metadata.gz: 305f46dd63f131a124b3716a4d884f5dc355b80e
+  data.tar.gz: bcb452a3c8ca23658bd5f3362434fdb57c2fc5c8
 SHA512:
-  metadata.gz: 94d89b9109d22a280a368caf064717a7f662e9056681c1ec8ac6aae6d9c775cf5ef3cad6619cd3610d5864f0ad3f3d785c2aebf862a5891a027ce2180e588fa5
-  data.tar.gz: bee25237960557655787c3082aaf56652bcf002d0da6b23445bd30549a895be177215a266e5133dad8946d5dea8b83662dede24570623c3cf193fb3d626fffd0
+  metadata.gz: 8c52c779973b9e6af3d5cfcd32236070a431fd16e79f204737179e00025c66c212c934c68e8a9d3c1a4838f1d9239c210ed85efe10996fd19baf63736d1a7550
+  data.tar.gz: ea85ed66665d3c10cb8b2ae96d014530cae2bed32bd1c1168a1b4e8c96308827f5032d78f5ced787aa225b9f72b1558ecc5f4282fa47ee47593919b7833cb5ff

data/README.md

@@ -26,9 +26,14 @@ 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.10.2
+### Current Release 2.10.3
 
- - Fixed string corruption bug due to an uncommented assignment used for debugging.
+ - Using the xmlschema option with :object mode now saves time as a string and
+   preserves the timezone.
+
+ - Rational recursive loop caused by active support fixed.
+
+ - Time in mimic_JSON mode are now the ruby string representation of a date.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 
@@ -54,7 +59,7 @@ is the `:object` mode.
   performance mode.
 
 - `:compat` mode attempts to be compatible with other systems. It will serialize any
-  `Object`, but will check to see if the `Object` implements an `as_hash` or `to_json`
+  `Object`, but will check to see if the `Object` implements an `to_hash` or `to_json`
   method. If either exists, that method is used for serializing the `Object`.
   Since `as_json` is more flexible and produces more consistent output, it is
   preferred over the `to_json` method. If neither the `to_json` or `to_hash`

data/ext/oj/dump.c

@@ -997,15 +997,13 @@ dump_time(VALUE obj, Out out) {
     long		nsec = NUM2LONG(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
 #endif
 #endif
-
+    
     if (0 > sec) {
 	neg = 1;
 	sec = -sec;
 	if (0 < nsec) {
 	    nsec = 1000000000 - nsec;
-#ifndef JRUBY_RUBY
 	    sec--;
-#endif
 	}
     }
     *b-- = '\0';
@@ -1237,7 +1235,16 @@ dump_data_obj(VALUE obj, int depth, Out out) {
 	*out->cur++ = 't';
 	*out->cur++ = '"';
 	*out->cur++ = ':';
-	dump_time(obj, out);
+	switch (out->opts->time_format) {
+	case RubyTime: // Does not output fractional seconds
+	case XmlTime:
+	    dump_xml_time(obj, out);
+	    break;
+	case UnixTime:
+	default:
+	    dump_time(obj, out);
+	    break;
+	}
 	*out->cur++ = '}';
 	*out->cur = '\0';
     } else {
@@ -1264,7 +1271,7 @@ dump_obj_comp(VALUE obj, int depth, Out out) {
 	    rb_raise(rb_eTypeError, "%s.to_hash() did not return a Hash.\n", rb_class2name(rb_obj_class(obj)));
 	}
 	dump_hash(h, Qundef, depth, out->opts->mode, out);
-    } else if (rb_respond_to(obj, oj_as_json_id)) {
+    } else if (Yes == out->opts->to_json && rb_respond_to(obj, oj_as_json_id)) {
 	dump_val(rb_funcall(obj, oj_as_json_id, 0), depth, out);
     } else if (Yes == out->opts->to_json && rb_respond_to(obj, oj_to_json_id)) {
 	volatile VALUE	rs;
@@ -1292,7 +1299,11 @@ dump_obj_comp(VALUE obj, int depth, Out out) {
 	    } else {
 		dump_cstr(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
 	    }
+#if (defined T_RATIONAL && defined RRATIONAL)
+	} else if (oj_datetime_class == clas || oj_date_class == clas || rb_cRational == clas) {
+#else
 	} else if (oj_datetime_class == clas || oj_date_class == clas) {
+#endif
 	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
 	    dump_cstr(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);

data/ext/oj/object.c

@@ -132,6 +132,9 @@ hat_cstr(ParseInfo pi, Val parent, Val kval, const char *str, size_t len) {
 	case 'c': // class
 	    parent->val = oj_name2class(pi, str, len, Yes == pi->options.auto_define);
 	    break;
+	case 't': // time
+	    parent->val = rb_funcall(oj_time_class, rb_intern("parse"), 1, rb_str_new(str, len));
+	    break;
 	default:
 	    return 0;
 	    break;
@@ -161,6 +164,9 @@ hat_num(ParseInfo pi, Val parent, Val kval, NumInfo ni) {
 #else
 		parent->val = rb_time_new(ni->i, (long)(nsec / 1000));
 #endif
+		// TBD if there is an exponent then if not gmt_offset
+		// add gmt_offset and then getgmt()
+		// if not 0 then getlocal(offset)
 	    }
 	    break;
 	case 'i': // circular index

data/ext/oj/oj.c

@@ -1716,7 +1716,7 @@ static struct _Options	mimic_object_to_json_options = {
     JSONEsc,		// escape_mode
     CompatMode,		// mode
     No,			// class_cache
-    UnixTime,		// time_format
+    RubyTime,		// time_format
     Yes,		// bigdec_as_num
     AutoDec,		// bigdec_load
     No,			// to_json
@@ -1738,7 +1738,8 @@ mimic_object_to_json(int argc, VALUE *argv, VALUE self) {
     out.buf = buf;
     out.end = buf + sizeof(buf) - 10;
     out.allocated = 0;
-    oj_dump_obj_to_json(self, &mimic_object_to_json_options, &out);
+    //oj_dump_obj_to_json(self, &mimic_object_to_json_options, &out);
+    oj_dump_obj_to_json(self, &oj_default_options, &out);
     if (0 == out.buf) {
 	rb_raise(rb_eNoMemError, "Not enough memory.");
     }
@@ -1844,9 +1845,7 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
         rb_define_class_under(mimic, "State", rb_cObject);
     }
 
-    oj_default_options.mode = CompatMode;
-    oj_default_options.escape_mode = ASCIIEsc;
-    oj_default_options.nilnil = Yes;
+    oj_default_options = mimic_object_to_json_options;
 
     return mimic;
 }
@@ -1880,6 +1879,7 @@ iconv_rescue(VALUE x) {
 
 static VALUE
 protect_require(VALUE x) {
+    rb_require("time");
     rb_require("bigdecimal");
     return Qnil;
 }

data/lib/oj/version.rb

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

data/test/_test_mimic_rails.rb

@@ -1,5 +1,8 @@
+#!/usr/bin/env ruby
 # encoding: UTF-8
 
+$: << File.dirname(__FILE__)
+
 require 'helper'
 Oj.mimic_JSON
 require 'rails/all'
@@ -25,6 +28,17 @@ class MimicRails < Minitest::Test
   true,
   null
 ]
+}, json)
+  end
+
+  def test_dump_rational
+    Oj.default_options= {:indent => 2} # JSON this will not change anything
+    json = ActiveSupport::JSON.encode([1, true, Rational(1)])
+    assert_equal(%{[
+  1,
+  true,
+  "1/1"
+]
 }, json)
   end
 

data/test/isolated/shared.rb

@@ -186,7 +186,7 @@ class SharedMimicTest < Minitest::Test
   end
   def test_parse_additions
     jam = Jam.new(true, 58)
-    json = Oj.dump(jam, :mode => :compat)
+    json = Oj.dump(jam, :mode => :compat, :use_to_json => true)
     obj = JSON.parse(json)
     assert_equal(jam, obj)
     obj = JSON.parse(json, :create_additions => true)
@@ -209,7 +209,7 @@ class SharedMimicTest < Minitest::Test
   def test_recurse_proc
     children = []
     JSON.recurse_proc({ 'a' => 1, 'b' => [true, false]}) { |x| children << x }
-    # JRuby 1.7.0 rb_yield() is broken and converts the [true, falser] array into true
+    # JRuby 1.7.0 rb_yield() is broken and converts the [true, false] array into true
     unless 'jruby' == $ruby && '1.9.3' == RUBY_VERSION
       assert([1, true, false, [true, false], { 'a' => 1, 'b' => [true, false]}] == children ||
              [true, false, [true, false], 1, { 'b' => [true, false], 'a' => 1}] == children)

data/test/test_compat.rb

@@ -269,6 +269,7 @@ class CompatJuice < Minitest::Test
 
   def test_json_object_compat
     obj = Jeez.new(true, 58)
+    Oj.default_options = { :mode => :compat, :use_to_json => true }
     dump_and_load(obj, false)
   end
 
@@ -279,7 +280,7 @@ class CompatJuice < Minitest::Test
 
   def test_json_object_create_id
     expected = Jeez.new(true, 58)
-    json = Oj.dump(expected, :indent => 2, :mode => :compat)
+    json = Oj.dump(expected, :indent => 2, :mode => :compat, :use_to_json => true)
     obj = Oj.compat_load(json)
     assert_equal(expected, obj)
   end
@@ -297,7 +298,7 @@ class CompatJuice < Minitest::Test
 
   def test_json_object_create_cache
     expected = Jeez.new(true, 58)
-    json = Oj.dump(expected, :indent => 2, :mode => :compat)
+    json = Oj.dump(expected, :indent => 2, :mode => :compat, :use_to_json => true)
     obj = Oj.compat_load(json, :class_cache => true)
     assert_equal(expected, obj)
     obj = Oj.compat_load(json, :class_cache => false)
@@ -306,7 +307,7 @@ class CompatJuice < Minitest::Test
 
   def test_json_object_create_id_other
     expected = Jeez.new(true, 58)
-    json = Oj.dump(expected, :indent => 2, :mode => :compat)
+    json = Oj.dump(expected, :indent => 2, :mode => :compat, :use_to_json => true)
     json.gsub!('json_class', '_class_')
     obj = Oj.compat_load(json, :create_id => "_class_")
     assert_equal(expected, obj)

data/test/test_debian.rb

@@ -36,7 +36,7 @@ class DebJuice < Minitest::Test
   end
 
   def test_as_json_object_compat_hash_cached
-    Oj.default_options = { :mode => :compat, :class_cache => true }
+    Oj.default_options = { :mode => :compat, :class_cache => true, :use_to_json => true }
     obj = Orange.new(true, 58)
     json = Oj.dump(obj, :indent => 2)
     assert(!json.nil?)

data/test/test_file.rb

@@ -79,7 +79,7 @@ class FileJuice < Minitest::Test
   end
 
   def test_float
-    mode = opts = Oj.default_options()[:mode]
+    mode = Oj.default_options()[:mode]
     Oj.default_options = {:mode => :object}
     dump_and_load(0.0, false)
     dump_and_load(12345.6789, false)
@@ -157,7 +157,7 @@ class FileJuice < Minitest::Test
   end
 
   def test_as_json_object_compat_hash
-    Oj.default_options = { :mode => :compat }
+    Oj.default_options = { :mode => :compat, :use_to_json => true }
     obj = Orange.new(true, 58)
     json = Oj.dump(obj, :indent => 2)
     assert(!json.nil?)

data/test/test_object.rb

@@ -355,6 +355,24 @@ class ObjectJuice < Minitest::Test
     dump_and_load(t, false)
   end
 
+  def test_xml_time
+    Oj.default_options = { :mode => :object, :time_format => :xmlschema }
+    t = Time.now()
+    dump_and_load(t, false)
+  end
+
+  def test_utc_time
+    Oj.default_options = { :mode => :object, :time_format => :xmlschema }
+    t = Time.now().utc
+    dump_and_load(t, false)
+  end
+
+  def test_ruby_time
+    Oj.default_options = { :mode => :object, :time_format => :ruby }
+    t = Time.now()
+    dump_and_load(t, false)
+  end
+
   def test_time_early
     t = Time.xmlschema("1954-01-05T00:00:00.123456")
     dump_and_load(t, false)

data/test/test_various.rb

@@ -167,7 +167,7 @@ class Juice < Minitest::Test
   end
 
   def test_float
-    mode = opts = Oj.default_options()[:mode]
+    mode = Oj.default_options()[:mode]
     Oj.default_options = {:mode => :object}
     dump_and_load(0.0, false)
     dump_and_load(12345.6789, false)
@@ -398,7 +398,11 @@ class Juice < Minitest::Test
         sign = '-'
         tz = -tz
       end
-      assert_equal(%{"2012-01-05T23:58:07%s%02d:%02d"} % [sign, tz / 3600, tz / 60 % 60], json)
+      if RUBY_VERSION.start_with?('1.8')
+        assert_equal(%{"2012-01-05T23:58:07%sZ"} % [sign], json)
+      else
+        assert_equal(%{"2012-01-05T23:58:07%s%02d:%02d"} % [sign, tz / 3600, tz / 60 % 60], json)
+      end
     end
   end
   def test_xml_time_compat_precision
@@ -436,7 +440,11 @@ class Juice < Minitest::Test
         sign = '-'
         tz = -tz
       end
-      assert_equal(%{"2012-01-05T23:58:08%s%02d:%02d"} % [sign, tz / 3600, tz / 60 % 60], json)
+      if RUBY_VERSION.start_with?('1.8')
+        assert_equal(%{"2012-01-05T23:58:08%sZ"} % [sign], json)
+      else
+        assert_equal(%{"2012-01-05T23:58:08%s%02d:%02d"} % [sign, tz / 3600, tz / 60 % 60], json)
+      end
     end
   end
   def test_xml_time_compat_zulu
@@ -656,7 +664,7 @@ class Juice < Minitest::Test
   end
 
   def test_as_json_object_compat_hash
-    Oj.default_options = { :mode => :compat }
+    Oj.default_options = { :mode => :compat, :use_to_json => true }
     obj = Orange.new(true, 58)
     json = Oj.dump(obj, :indent => 2)
     assert(!json.nil?)
@@ -664,7 +672,7 @@ class Juice < Minitest::Test
   end
 
   def test_as_json_object_compat_non_hash
-    Oj.default_options = { :mode => :compat }
+    Oj.default_options = { :mode => :compat, :use_to_json => true }
     obj = Melon.new(true, 58)
     json = Oj.dump(obj, :indent => 2)
     assert_equal(%{"true 58"}, json)

metadata

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