oj 2.11.2 → 2.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f27c42c67b86cac4812b8452cbc81242a348e8e0
-  data.tar.gz: 71dd249f7dccc0136180b8661e6f33208025c237
+  metadata.gz: 92a7b7be45175f18661ed207bb79b4a03192c731
+  data.tar.gz: 2c2f13ed34b8d715265c4e9a5a53ee203ed042c1
 SHA512:
-  metadata.gz: c033fbec5b0af79396795bb4d1dd8c4be2984d27c1d87d008c7994e3fcd46f1e2f41caa85b0a3d0b9f0642ab9abac643c8c014e4b01c186775b3454797adb25b
-  data.tar.gz: 61d7bb7f02ddeaf63b94d6f27bfbc496a4d3a15f1fb85b714119d34762bcc432b80fa668c68cc65f2c55608d0bd3dc47b35d112477c2a43198fc500ffd7728a2
+  metadata.gz: 6f195c7904b2c9de392d93e097155dbd32e028a8d0d4bf1640782e16e25aee11dbeaa73c35d1cc472804e378aeab801961c095a0501f1c6c1d976855e89ebfb0
+  data.tar.gz: ce8fadea6f3f07de21144e16f0b2b1aabeb108debbc34ee6b2b7adb22e9eaca18824b9e354dcf04c1affcd0a2610886ecd3a87b4c4dd0c42557e999f5a914fc8

data/README.md

@@ -26,17 +26,9 @@ 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.11.2
+## Current Release 2.11.3
 
- - Changed the defaults for mimic_JSON to use 16 significant digits instead of
-   the default 15.
-
- - Fixed bug where a subclass of Array would be serialized as if in object mode
-   instead of compat when in compat mode.
-
-### Release 2.11.1
-
- - Changed the use_to_json option to still allow as_json even when set to false.
+ - DateTime encoding now includes nanoseconds.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/dump.c

@@ -1713,6 +1713,7 @@ dump_struct_obj(VALUE obj, int depth, Out out) {
 static void
 dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
     ID			*idp;
+    AttrGetFunc		*fp;
     volatile VALUE	v;
     const char		*name;
     size_t		size;
@@ -1740,7 +1741,7 @@ dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
 	*out->cur++ = ',';
     }
     size = d2 * out->indent + 1;
-    for (idp = odd->attrs; 0 != *idp; idp++) {
+    for (idp = odd->attrs, fp = odd->attrFuncs; 0 != *idp; idp++, fp++) {
 	size_t	nlen;
 
 	if (out->end - out->cur <= (long)size) {
@@ -1748,7 +1749,9 @@ dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
 	}
 	name = rb_id2name(*idp);
 	nlen = strlen(name);
-	if (0 == strchr(name, '.')) {
+	if (0 != *fp) {
+	    v = (*fp)(obj);
+	} else if (0 == strchr(name, '.')) {
 	    v = rb_funcall(obj, *idp, 0);
 	} else {
 	    char	nbuf[256];

data/ext/oj/extconf.rb

@@ -32,6 +32,7 @@ dflags = {
   'IS_WINDOWS' => is_windows ? 1 : 0,
   'USE_PTHREAD_MUTEX' => is_windows ? 0 : 1,
   'USE_RB_MUTEX' => (is_windows && !('1' == version[0] && '8' == version[1])) ? 1 : 0,
+  'DATETIME_1_8' => ('ruby' == type && ('1' == version[0] && '8' == version[1])) ? 1 : 0,
 }
 # This is a monster hack to get around issues with 1.9.3-p0 on CentOS 5.4. SO
 # some reason math.h and string.h contents are not processed. Might be a

data/ext/oj/odd.c

@@ -35,6 +35,10 @@
 static struct _Odd	_odds[4]; // bump up if new initial Odd classes are added
 static struct _Odd	*odds = _odds;
 static long		odd_cnt = 0;
+static ID		sec_id;
+static ID		sec_fraction_id;
+static ID		to_f_id;
+static ID		rational_id;
 
 static void
 set_class(Odd odd, const char *classname) {
@@ -52,11 +56,35 @@ set_class(Odd odd, const char *classname) {
     *idp = 0;
 }
 
+static VALUE
+get_datetime_secs(VALUE obj) {
+    VALUE	rsecs = rb_funcall(obj, sec_id, 0);
+    VALUE	rfrac = rb_funcall(obj, sec_fraction_id, 0);
+    double	secs = NUM2DBL(rb_funcall(rfrac, to_f_id, 0));
+
+#if DATETIME_1_8
+    secs *= 86400.0;
+#endif
+    secs += NUM2DBL(rb_funcall(rsecs, to_f_id, 0));
+ 
+#if DATETIME_1_8
+    return rb_funcall(rb_cObject, rational_id, 2, LONG2FIX((long)(secs * 1000000000)), LONG2FIX(1000000000));
+#else
+    return rb_float_new(secs);
+#endif
+}
+
 void
 oj_odd_init() {
     Odd		odd;
     const char	**np;
 
+    sec_id = rb_intern("sec");
+    sec_fraction_id = rb_intern("sec_fraction");
+    to_f_id = rb_intern("to_f");
+    rational_id = rb_intern("Rational");
+
+    memset(_odds, 0, sizeof(_odds));
     odd = odds;
     // Rational
     np = odd->attr_names;
@@ -65,7 +93,7 @@ oj_odd_init() {
     *np = 0;
     set_class(odd, "Rational");
     odd->create_obj = rb_cObject;
-    odd->create_op = rb_intern("Rational");
+    odd->create_op = rational_id;
     odd->attr_cnt = 2;
     // Date
     odd++;
@@ -91,6 +119,7 @@ oj_odd_init() {
     *np++ = 0;
     set_class(odd, "DateTime");
     odd->attr_cnt = 8;
+    odd->attrFuncs[5] = get_datetime_secs;
     // Range
     odd++;
     np = odd->attr_names;
@@ -166,6 +195,7 @@ oj_reg_odd(VALUE clas, VALUE create_object, VALUE create_method, int mcnt, VALUE
     Odd		odd;
     const char	**np;
     ID		*ap;
+    AttrGetFunc	*fp;
 
     if (_odds == odds) {
 	odds = ALLOC_N(struct _Odd, odd_cnt + 1);
@@ -181,7 +211,8 @@ oj_reg_odd(VALUE clas, VALUE create_object, VALUE create_method, int mcnt, VALUE
     odd->create_obj = create_object;
     odd->create_op = SYM2ID(create_method);
     odd->attr_cnt = mcnt;
-    for (ap = odd->attrs, np = odd->attr_names; 0 < mcnt; mcnt--, ap++, np++, members++) {
+    for (ap = odd->attrs, np = odd->attr_names, fp = odd->attrFuncs; 0 < mcnt; mcnt--, ap++, np++, members++, fp++) {
+	*fp = 0;
 	switch (rb_type(*members)) {
 	case T_STRING:
 	    *np = strdup(rb_string_value_ptr(members));

data/ext/oj/odd.h

@@ -35,6 +35,8 @@
 
 #define MAX_ODD_ARGS	10
 
+typedef VALUE	(*AttrGetFunc)(VALUE obj);
+
 typedef struct _Odd {
     const char	*classname;
     size_t	clen;
@@ -44,6 +46,7 @@ typedef struct _Odd {
     int		attr_cnt;
     const char	*attr_names[MAX_ODD_ARGS];	// 0 terminated attr IDs
     ID		attrs[MAX_ODD_ARGS];	// 0 terminated attr IDs
+    AttrGetFunc	attrFuncs[MAX_ODD_ARGS];
 } *Odd;
 
 typedef struct _OddArgs {

data/lib/oj/version.rb

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

data/test/test_object.rb

@@ -473,6 +473,10 @@ class ObjectJuice < Minitest::Test
     dump_and_load(Date.new(2012, 6, 19), false)
   end
 
+  def test_odd_datetime
+    dump_and_load(DateTime.new(2012, 6, 19, 13, 5, Rational(7123456789, 1000000000)), false)
+  end
+
   def test_odd_string
     Oj.register_odd(Strung, Strung, :create, :to_s, 'safe?')
     s = Strung.new("Pete", true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.11.2
+  version: 2.11.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-10 00:00:00.000000000 Z
+date: 2015-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -179,8 +179,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oj
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files: []
+has_rdoc: true