oj 3.6.7 → 3.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07f971139aede75d733d478ac64e4ecab5717b96df11fa251f64099ff070ad7d
-  data.tar.gz: 74c66fb18be035b5a6de58e2c7cef899eb85376d4b2f1be6b93dda18b458c791
+  metadata.gz: aba240d544c37d3f3c5e2a6c7fe51b29507ba354b76ede963bd868e620df4ece
+  data.tar.gz: 832dd821fa37c9ff2fd7b993c2529537a86b54ca2eded2a72f39ac8c6980bfd1
 SHA512:
-  metadata.gz: 5df299170f6aaa4dc85aa3b558a23d30603b3294960dc1fb23894cc9838d0a8d41cb54cc4b317e641047bb6671c712a6c0673fa05baf7e50c272a6e3cca5338a
-  data.tar.gz: 821d826ede14244308a4eff3b2e1ca9d968777ce14eae00649ac2ee51d039664b3ec26237a80bb1f2c9790cda9d2fade906ecfc60a92b7a4e5eb5b1bf2ce6dde
+  metadata.gz: e485a0613aa0306d2a5239fbccc510cfc67456760f6e01ad65c7075f2c42f0a2a6fd796dca4b35e8002a2ec7ee950801ae0ce2478ebae0e3e7715d8021eef4dc
+  data.tar.gz: fa9a0f9e185ae31e783515012f1b9e5c09bc4341e1cfe5f20f8341639d30fef5ae2d748b260fe12e3753eaf4d3e7260c5ee67d81a5706b2b950256065a5530a8

data/ext/oj/custom.c

@@ -79,15 +79,70 @@ complex_load(VALUE clas, VALUE args) {
     return rb_complex_new(rb_hash_aref(args, rb_id2str(real_id)), rb_hash_aref(args, rb_id2str(imag_id)));
 }
 
+static void
+time_dump(VALUE obj, int depth, Out out) {
+    if (Yes == out->opts->create_ok) {
+	struct _Attr	attrs[] = {
+	    { "time", 4, Qundef, 0, Qundef },
+	    { NULL, 0, Qnil },
+	};
+	attrs->time = obj;
+
+	oj_code_attrs(obj, attrs, depth, out, true);
+    } else {
+	switch (out->opts->time_format) {
+	case RubyTime:	oj_dump_ruby_time(obj, out);	break;
+	case XmlTime:	oj_dump_xml_time(obj, out);	break;
+	case UnixZTime:	oj_dump_time(obj, out, true);	break;
+	case UnixTime:
+	default:	oj_dump_time(obj, out, false);	break;
+	}
+    }
+}
+
 static void
 date_dump(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
-	{ "s", 1, Qnil },
-	{ NULL, 0, Qnil },
-    };
-    attrs->value = rb_funcall(obj, rb_intern("iso8601"), 0);
+    if (Yes == out->opts->create_ok) {
+	struct _Attr	attrs[] = {
+	    { "s", 1, Qnil },
+	    { NULL, 0, Qnil },
+	};
+	attrs->value = rb_funcall(obj, rb_intern("iso8601"), 0);
 
-    oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
+	oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
+    } else {
+	volatile VALUE	v;
+	volatile VALUE	ov;
+	
+	switch (out->opts->time_format) {
+	case RubyTime:
+	case XmlTime:
+	    v = rb_funcall(obj, rb_intern("iso8601"), 0);
+	    oj_dump_cstr(rb_string_value_ptr((VALUE*)&v), RSTRING_LEN(v), 0, 0, out);
+	    break;
+	case UnixZTime:
+	    v = rb_funcall(obj, rb_intern("to_time"), 0);
+	    if (oj_date_class == rb_obj_class(obj)) {
+		ov = rb_funcall(v, rb_intern("utc_offset"), 0);
+		v = rb_funcall(v, rb_intern("utc"), 0);
+		v = rb_funcall(v, rb_intern("+"), 1, ov);
+		oj_dump_time(v, out, false);
+	    } else {
+		oj_dump_time(v, out, true);
+	    }
+	    break;
+	case UnixTime:
+	default:
+	    v = rb_funcall(obj, rb_intern("to_time"), 0);
+	    if (oj_date_class == rb_obj_class(obj)) {
+		ov = rb_funcall(v, rb_intern("utc_offset"), 0);
+		v = rb_funcall(v, rb_intern("utc"), 0);
+		v = rb_funcall(v, rb_intern("+"), 1, ov);
+	    }
+	    oj_dump_time(v, out, false);
+	    break;
+	}
+    }
 }
 
 static VALUE
@@ -200,27 +255,6 @@ regexp_load(VALUE clas, VALUE args) {
     return Qnil;
 }
 
-static void
-time_dump(VALUE obj, int depth, Out out) {
-    if (Yes == out->opts->create_ok) {
-	struct _Attr	attrs[] = {
-	    { "time", 4, Qundef, 0, Qundef },
-	    { NULL, 0, Qnil },
-	};
-	attrs->time = obj;
-
-	oj_code_attrs(obj, attrs, depth, out, true);
-    } else {
-	switch (out->opts->time_format) {
-	case RubyTime:	oj_dump_ruby_time(obj, out);	break;
-	case XmlTime:	oj_dump_xml_time(obj, out);	break;
-	case UnixZTime:	oj_dump_time(obj, out, true);	break;
-	case UnixTime:
-	default:	oj_dump_time(obj, out, false);	break;
-	}
-    }
-}
-
 static VALUE
 time_load(VALUE clas, VALUE args) {
     // Value should have already been replaced in one of the hash_set_xxx

data/ext/oj/rails.c

@@ -451,7 +451,7 @@ dump_activerecord_result(VALUE obj, int depth, Out out, bool as_ok) {
     out->argc = 0;
     cols = columns_array(rb_ivar_get(obj, columns_id), &ccnt);
     rows = rb_ivar_get(obj, rows_id);
-    rcnt = RARRAY_LEN(rows);
+    rcnt = (int)RARRAY_LEN(rows);
     assure_size(out, 2);
     *out->cur++ = '[';
     if (out->opts->dump_opts.use) {
@@ -828,7 +828,7 @@ rails_mimic_json(VALUE self) {
 	json = rb_define_module("JSON");
     }
     oj_mimic_json_methods(json);
-    oj_default_options.mode = RailsMode;
+    //oj_default_options.mode = RailsMode;
 
     return Qnil;
 }

data/lib/oj/version.rb

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

data/test/test_custom.rb

@@ -300,11 +300,62 @@ class CustomJuice < Minitest::Test
     dump_and_load(obj, false, :create_id => "^o", :create_additions => true)
   end
 
+  def test_date_unix
+    obj = Date.new(2017, 1, 5)
+    json = Oj.dump(obj, :indent => 2, time_format: :unix)
+    assert_equal('1483574400.000000000', json)
+  end
+
+  def test_date_unix_zone
+    obj = Date.new(2017, 1, 5)
+    json = Oj.dump(obj, :indent => 2, time_format: :unix_zone)
+    assert_equal('1483574400.000000000', json)
+  end
+
+  def test_date_ruby
+    obj = Date.new(2017, 1, 5)
+    json = Oj.dump(obj, :indent => 2, time_format: :ruby)
+    assert_equal('"2017-01-05"', json)
+  end
+
+  def test_date_xmlschema
+    obj = Date.new(2017, 1, 5)
+    json = Oj.dump(obj, :indent => 2, time_format: :xmlschema)
+    assert_equal('"2017-01-05"', json)
+  end
+
   def test_datetime
     obj = DateTime.new(2017, 1, 5, 10, 20, 30)
     dump_and_load(obj, false, :create_id => "^o", :create_additions => true)
   end
 
+  def test_datetime_unix
+    obj = DateTime.new(2017, 1, 5, 10, 20, 30, '-0500')
+    json = Oj.dump(obj, :indent => 2, time_format: :unix)
+    assert_equal('1483629630.000000000', json)
+  end
+
+  def test_datetime_unix_zone
+    # older versions seems to have issues getting the utc offset.
+    if '2.4' <= RUBY_VERSION
+      obj = DateTime.new(2017, 1, 5, 10, 20, 30, '-0500')
+      json = Oj.dump(obj, :indent => 2, time_format: :unix_zone)
+      assert_equal('1483629630.000000000e-18000', json)
+    end
+  end
+
+  def test_datetime_ruby
+    obj = DateTime.new(2017, 1, 5, 10, 20, 30, '-0500')
+    json = Oj.dump(obj, :indent => 2, time_format: :ruby)
+    assert_equal('"2017-01-05T10:20:30-05:00"', json)
+  end
+
+  def test_datetime_xmlschema
+    obj = DateTime.new(2017, 1, 5, 10, 20, 30, '-0500')
+    json = Oj.dump(obj, :indent => 2, time_format: :xmlschema)
+    assert_equal('"2017-01-05T10:20:30-05:00"', json)
+  end
+
   def test_regexp
     # this notation must be used to get an == match later
     obj = /(?ix-m:^yes$)/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.6.7
+  version: 3.6.8
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-26 00:00:00.000000000 Z
+date: 2018-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler