oj 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77898b80dc0daaabff6e620f0d9ef0b6eb26eac1
-  data.tar.gz: 112de18472976923d86d57a62fa30f611e0c4bbc
+  metadata.gz: d4fd78480b3ee92e4d3934bd33045024639bc758
+  data.tar.gz: 920bd7a9dc6270ed8b8826c1db7311681ac7c074
 SHA512:
-  metadata.gz: f59fca5e3442fcf3d46e5f931ec36657e54f359924e60707ed4962c11f9b7f402e41e2166befb257a7bf6686a4552a6be8553b84552908ca503a30bdd4f94ec1
-  data.tar.gz: 9443804d9d931de71e5b9d3f2ba29d05141fb0dd86bd9700d285908d75e5566f50476b5887200c49dc3524637a076c3efb9f489adb4926bf4dd0403753eb5032
+  metadata.gz: c0017d120037458f4d502e183006492db64005e57b57906e8654bb0391c9ce2980c2f9f7792b80eadcb8df7d360070e60a1324c1124713be39fd13cdba61cbea
+  data.tar.gz: 391c4c4ff9abffc12050e4c0128bf8daa98e8bb811f53ed71dfd80ccab9a3a71dd2a1e549441f050f25d32f416026b660f63592b66d2c386d5af17e22d43e642

data/README.md

@@ -1,4 +1,4 @@
-# [![{}j](http://www.ohler.com/dev/images/oj_hel_fire_64.png)](http://www.ohler.com/oj) gem
+# [![{}j](http://www.ohler.com/dev/images/oj_comet_64.png)](http://www.ohler.com/oj) gem
 
 [![Build Status](https://img.shields.io/travis/ohler55/oj/master.svg)](http://travis-ci.org/ohler55/oj?branch=master) ![Gem](https://img.shields.io/gem/v/oj.svg) ![Gem](https://img.shields.io/gem/dt/oj.svg)
 

data/ext/oj/mimic_json.c

@@ -754,10 +754,12 @@ oj_define_mimic_json(int argc, VALUE *argv, VALUE self) {
      } else {
 	generator = rb_define_module_under(ext, "Generator");
     }
-
+    if (!rb_const_defined_at(generator, rb_intern("State"))) {
+	rb_require("oj/state");
+    }
+    
     // convince Ruby that the json gem has already been loaded
     // Pull in the JSON::State mimic file.
-    rb_require("oj/state");
     state_class = rb_const_get_at(generator, rb_intern("State"));
     // TBD create all modules in mimic_loaded
 

data/ext/oj/rails.c

@@ -211,22 +211,10 @@ dump_bigdecimal(VALUE obj, int depth, Out out, bool as_ok) {
 }
 
 static void
-dump_time(VALUE obj, int depth, Out out, bool as_ok) {
+dump_sec_nano(VALUE obj, time_t sec, long nsec, 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;
-    long		nsec = ts.tv_nsec;
-#else
-    time_t		sec = NUM2LONG(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
-#if HAS_NANO_TIME
-    long long		nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
-#else
-    long long		nsec = rb_num2ll(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
-#endif
-#endif
     long		tzsecs = NUM2LONG(rb_funcall2(obj, oj_utc_offset_id, 0, 0));
     int			tzhour, tzmin;
     char		tzsign = '+';
@@ -251,7 +239,6 @@ dump_time(VALUE obj, int depth, Out out, bool as_ok) {
     // 2012-01-05T23:58:07.123456000+09:00 or 2012/01/05 23:58:07 +0900
     sec += tzsecs;
     tm = gmtime(&sec);
-#if 1
     if (0 > tzsecs) {
         tzsign = '-';
         tzhour = (int)(tzsecs / -3600);
@@ -260,16 +247,6 @@ dump_time(VALUE obj, int depth, Out out, bool as_ok) {
         tzhour = (int)(tzsecs / 3600);
         tzmin = (int)(tzsecs / 60) - (tzhour * 60);
     }
-#else
-    if (0 > tm->tm_gmtoff) {
-        tzsign = '-';
-        tzhour = (int)(tm->tm_gmtoff / -3600);
-        tzmin = (int)(tm->tm_gmtoff / -60) - (tzhour * 60);
-    } else {
-        tzhour = (int)(tm->tm_gmtoff / 3600);
-        tzmin = (int)(tm->tm_gmtoff / 60) - (tzhour * 60);
-    }
-#endif
     if (!xml_time) {
 	len = sprintf(buf, "%04d/%02d/%02d %02d:%02d:%02d %c%02d%02d",
 		      tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
@@ -312,6 +289,34 @@ dump_time(VALUE obj, int depth, Out out, bool as_ok) {
     oj_dump_cstr(buf, len, 0, 0, out);
 }
 
+static void
+dump_time(VALUE obj, int depth, Out out, bool as_ok) {
+#if HAS_RB_TIME_TIMESPEC
+    struct timespec	ts = rb_time_timespec(obj);
+    time_t		sec = ts.tv_sec;
+    long		nsec = ts.tv_nsec;
+#else
+    time_t		sec = NUM2LONG(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
+#if HAS_NANO_TIME
+    long long		nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
+#else
+    long long		nsec = rb_num2ll(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
+#endif
+#endif
+    dump_sec_nano(obj, sec, nsec, out);
+}
+
+static void
+dump_timewithzone(VALUE obj, int depth, Out out, bool as_ok) {
+    time_t	sec = NUM2LONG(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
+#if HAS_NANO_TIME
+    long long	nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
+#else
+    long long	nsec = rb_num2ll(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
+#endif
+    dump_sec_nano(obj, sec, nsec, out);
+}
+
 static void
 dump_to_s(VALUE obj, int depth, Out out, bool as_ok) {
     volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
@@ -329,16 +334,27 @@ static struct _NamedFunc	dump_map[] = {
     { "Range", dump_to_s },
     { "Regexp", dump_to_s },
     { "Time", dump_time },
+    { "ActiveSupport::TimeWithZone", dump_timewithzone },
     { NULL, NULL },
 };
 
+static VALUE	activerecord_base = Qundef;
+
+static void
+dump_activerecord(VALUE obj, int depth, Out out, bool as_ok) {
+    volatile VALUE	attrs = rb_funcall(obj, rb_intern("attributes"), 0);
+
+    out->argc = 0;
+    dump_rails_val(attrs, depth, out, true);
+}
+
 static ROpt
 create_opt(ROptTable rot, VALUE clas) {
     ROpt	ro;
     NamedFunc	nf;
     const char	*classname = rb_class2name(clas);
     int		olen = rot->len;
-    
+
     rot->len++;
     if (NULL == rot->table) {
 	rot->alen = 256;
@@ -373,7 +389,17 @@ create_opt(ROptTable rot, VALUE clas) {
 	}
     }
     if (ro->dump == dump_obj_attrs) {
-	if (Qtrue == rb_class_inherited_p(clas, rb_cStruct)) { // check before enumerable
+	if (Qundef == activerecord_base) {
+	    // If not defined let an exception be raised.
+	    VALUE	ar = rb_const_get_at(rb_cObject, rb_intern("ActiveRecord"));
+
+	    if (Qundef != ar) {
+		activerecord_base = rb_const_get_at(ar, rb_intern("Base"));
+	    }
+	}
+	if (Qundef != activerecord_base && Qtrue == rb_class_inherited_p(clas, activerecord_base)) {
+	    ro->dump = dump_activerecord;
+	} else if (Qtrue == rb_class_inherited_p(clas, rb_cStruct)) { // check before enumerable
 	    ro->dump = dump_struct;
 	} else if (Qtrue == rb_class_inherited_p(clas, rb_mEnumerable)) {
 	    ro->dump = dump_enumerable;
@@ -898,7 +924,8 @@ dump_array(VALUE a, int depth, Out out, bool as_ok) {
 	    return;
 	}
     }
-    if (as_ok && !oj_rails_array_opt && rb_respond_to(a, oj_as_json_id)) {
+    //if (!oj_rails_array_opt && as_ok && 0 < out->argc && rb_respond_to(a, oj_as_json_id)) {
+    if (as_ok && 0 < out->argc && rb_respond_to(a, oj_as_json_id)) {
 	dump_as_json(a, depth, out, false);
 	return;
     }
@@ -1029,11 +1056,8 @@ dump_hash(VALUE obj, int depth, Out out, bool as_ok) {
 	    return;
 	}
     }
-    // Nothing good can come from calling as_json on a hash which is supposed
-    // to be a primitive so if the type is a hash and the class is also a hash
-    // then do not call as_json.
-    //if (!oj_rails_hash_opt && as_ok && rb_cHash != rb_obj_class(obj) && rb_respond_to(obj, oj_as_json_id)) {
-    if (!oj_rails_hash_opt && as_ok && rb_respond_to(obj, oj_as_json_id)) {
+    //if (!oj_rails_hash_opt && 0 < out->argc && as_ok && rb_respond_to(obj, oj_as_json_id)) {
+    if (0 < out->argc && as_ok && rb_respond_to(obj, oj_as_json_id)) {
 	dump_as_json(obj, depth, out, false);
 	return;
     }

data/ext/oj/resolve.c

@@ -1,31 +1,6 @@
 /* resolve.c
  * Copyright (c) 2012, Peter Ohler
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- *  - Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 
- *  - Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- *  - Neither the name of Peter Ohler nor the names of its contributors may be
- *    used to endorse or promote products derived from this software without
- *    specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <stdlib.h>

data/ext/oj/resolve.h

@@ -1,31 +1,6 @@
 /* resolve.h
  * Copyright (c) 2011, Peter Ohler
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- *  - Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 
- *  - Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- *  - Neither the name of Peter Ohler nor the names of its contributors may be
- *    used to endorse or promote products derived from this software without
- *    specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef __OJ_RESOLVE_H__

data/lib/oj/json.rb

@@ -92,13 +92,13 @@ module JSON
     end # Parser
   end # Ext
   
-  State = ::JSON::Ext::Generator::State
+  State = ::JSON::Ext::Generator::State unless defined?(::JSON::State)
 
   begin
     Object.send(:remove_const, :Parser)
   rescue
   end
-  Parser = ::JSON::Ext::Parser
+  Parser = ::JSON::Ext::Parser unless defined?(::JSON::Parser)
   self.parser = ::JSON::Ext::Parser
   self.generator = ::JSON::Ext::Generator
 

data/lib/oj/version.rb

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

data/pages/Rails.md

@@ -10,7 +10,7 @@ require 'oj'
 
 Oj::Rails.set_encoder()
 Oj::Rails.set_decoder()
-Oj::Rails.optimize(Array, BigDecimal, Hash, Range, Regexp, Time)
+Oj::Rails.optimize(Array, BigDecimal, Hash, Range, Regexp, Time, ActiveSupport::TimeWithZone)
 ```
 
 Some of the Oj options are supported as arguments to the encoder if called
@@ -58,6 +58,9 @@ The classes that can be put in optimized mode are:
  * Range
  * Regexp
  * Time
+ * ActiveSupport::TimeWithZone
+ * any class inheriting from ActiveRecord::Base
+ * any other class where all attributes should be dumped
 
 The ActiveSupport decoder is the JSON.parse() method. Calling the
 Oj::Rails.set_decoder() method replaces that method with the Oj equivelant.

data/test/activesupport5/encoding_test.rb

@@ -11,7 +11,7 @@ require 'oj'
 # Sets the ActiveSupport emcoder to be Oj and also wraps the setting of
 # globals.
 Oj::Rails.set_encoder()
-Oj::Rails.optimize(BigDecimal, Time, Range, Regexp)
+Oj::Rails.optimize(Hash, Array, BigDecimal, Time, Range, Regexp, ActiveSupport::TimeWithZone)
 
 class TestJSONEncoding < ActiveSupport::TestCase
   include TimeZoneTestHelpers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler