oj 3.1.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 921337fe55a2f80cc6537cb652c5d54a98dd39d3
-  data.tar.gz: acdf0cc3bdaed92fd5ecb0a7239cfcf88873c59b
+  metadata.gz: 35634d84fa9efd54d2c6a5c82572386ab76dcbd9
+  data.tar.gz: b53f05e6cbb2159d88b800165e5e843bd0f8f10f
 SHA512:
-  metadata.gz: d51c9c25369ca4c5d9b7cd5670e1d4d87ce3458b9e8760d1d893c37f48f4775b145f9fad1b2aba78ba5a157981d7cda854e3c091dd9cf4256f1c9bb096699bd8
-  data.tar.gz: bdc8810b381c0a6f822432443ba201a2ed37aa30c8fe3f2e2ce00c446cae53a4cfdd90cb796e29cb2bcf60e34c62b607cdd90bf8bbc7b1ca773ba840caed5899
+  metadata.gz: 6a7fd255fb03915f2d5bef8d5d9093693a7544345b9dcc3a5208d26db2009b264797a1879e70e1d25e2144813d90e690cbab992092fc65fa0b7aaf22e93fa265
+  data.tar.gz: 29166d47b6bdd0ef4fde76c532fd6227f163786ca1f9dd4b5f2a9f507658d078a8ef47ff25ffb59dfe98e5981f70a964e7b62c8703f246fa183f946d00ae115b

data/ext/oj/code.c

@@ -132,40 +132,48 @@ oj_code_has(Code codes, VALUE clas, bool encode) {
 }
 
 void
-oj_code_attrs(VALUE obj, Attr attrs, int depth, Out out) {
+oj_code_attrs(VALUE obj, Attr attrs, int depth, Out out, bool with_class) {
     int		d2 = depth + 1;
     int		d3 = d2 + 1;
     size_t	sep_len = out->opts->dump_opts.before_size + out->opts->dump_opts.after_size + 2;
     const char	*classname = rb_obj_classname(obj);
     size_t	len = strlen(classname);
     size_t	size = d2 * out->indent + 10 + len + out->opts->create_id_len + sep_len;
-
+    bool	no_comma = true;
+    
     assure_size(out, size);
     *out->cur++ = '{';
-    fill_indent(out, d2);
-    *out->cur++ = '"';
-    memcpy(out->cur, out->opts->create_id, out->opts->create_id_len);
-    out->cur += out->opts->create_id_len;
-    *out->cur++ = '"';
-    if (0 < out->opts->dump_opts.before_size) {
-	strcpy(out->cur, out->opts->dump_opts.before_sep);
-	out->cur += out->opts->dump_opts.before_size;
-    }
-    *out->cur++ = ':';
-    if (0 < out->opts->dump_opts.after_size) {
-	strcpy(out->cur, out->opts->dump_opts.after_sep);
-	out->cur += out->opts->dump_opts.after_size;
-    }
-    *out->cur++ = '"';
-    memcpy(out->cur, classname, len);
-    out->cur += len;
-    *out->cur++ = '"';
 
+    if (with_class) {
+	fill_indent(out, d2);
+	*out->cur++ = '"';
+	memcpy(out->cur, out->opts->create_id, out->opts->create_id_len);
+	out->cur += out->opts->create_id_len;
+	*out->cur++ = '"';
+	if (0 < out->opts->dump_opts.before_size) {
+	    strcpy(out->cur, out->opts->dump_opts.before_sep);
+	    out->cur += out->opts->dump_opts.before_size;
+	}
+	*out->cur++ = ':';
+	if (0 < out->opts->dump_opts.after_size) {
+	    strcpy(out->cur, out->opts->dump_opts.after_sep);
+	    out->cur += out->opts->dump_opts.after_size;
+	}
+	*out->cur++ = '"';
+	memcpy(out->cur, classname, len);
+	out->cur += len;
+	*out->cur++ = '"';
+	no_comma = false;
+    }
     size = d3 * out->indent + 2;
     for (; NULL != attrs->name; attrs++) {
 	assure_size(out, size + attrs->len + sep_len + 2);
-	*out->cur++ = ',';
-	fill_indent(out, d3);
+	if (no_comma) {
+	    no_comma = false;
+	} else {
+	    *out->cur++ = ',';
+	}
+	fill_indent(out, d2);
 	*out->cur++ = '"';
 	memcpy(out->cur, attrs->name, attrs->len);
 	out->cur += attrs->len;

data/ext/oj/code.h

@@ -35,7 +35,7 @@ extern VALUE	oj_code_load(Code codes, VALUE clas, VALUE args);
 extern void	oj_code_set_active(Code codes, VALUE clas, bool active);
 extern bool	oj_code_has(Code codes, VALUE clas, bool encode);
 
-extern void	oj_code_attrs(VALUE obj, Attr attrs, int depth, Out out);
+extern void	oj_code_attrs(VALUE obj, Attr attrs, int depth, Out out, bool with_class);
 
 extern struct _Code	oj_compat_codes[];
 

data/ext/oj/custom.c

@@ -26,7 +26,7 @@ dump_obj_str(VALUE obj, int depth, Out out) {
     };
     attrs->value = rb_funcall(obj, oj_to_s_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out);
+    oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
 }
 
 
@@ -64,7 +64,7 @@ complex_dump(VALUE obj, int depth, Out out) {
     attrs[0].value = rb_funcall(obj, real_id, 0);
     attrs[1].value = rb_funcall(obj, imag_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out);
+    oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
 }
 
 static VALUE
@@ -84,7 +84,7 @@ date_dump(VALUE obj, int depth, Out out) {
     };
     attrs->value = rb_funcall(obj, rb_intern("iso8601"), 0);
 
-    oj_code_attrs(obj, attrs, depth, out);
+    oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
 }
 
 static VALUE
@@ -120,7 +120,7 @@ openstruct_dump(VALUE obj, int depth, Out out) {
     }
     attrs->value = rb_funcall(obj, table_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out);
+    oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
 }
 
 static VALUE
@@ -143,7 +143,7 @@ range_dump(VALUE obj, int depth, Out out) {
     attrs[1].value = rb_funcall(obj, oj_end_id, 0);
     attrs[2].value = rb_funcall(obj, oj_exclude_end_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out);
+    oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
 }
 
 static VALUE
@@ -174,7 +174,7 @@ rational_dump(VALUE obj, int depth, Out out) {
     attrs[0].value = rb_funcall(obj, numerator_id, 0);
     attrs[1].value = rb_funcall(obj, denominator_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out);
+    oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
 }
 
 static VALUE
@@ -199,13 +199,23 @@ regexp_load(VALUE clas, VALUE args) {
 
 static void
 time_dump(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
-	{ "time", 4, Qundef, 0, Qundef },
-	{ NULL, 0, Qnil },
-    };
-    attrs->time = obj;
-
-    oj_code_attrs(obj, attrs, depth, 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
@@ -340,7 +350,7 @@ dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
 
     assure_size(out, 2);
     *out->cur++ = '{';
-    if (NULL != out->opts->create_id) {
+    if (NULL != out->opts->create_id && Yes == out->opts->create_ok) {
 	const char	*classname = rb_class2name(clas);
 	int		clen = (int)strlen(classname);
 	size_t		sep_len = out->opts->dump_opts.before_size + out->opts->dump_opts.after_size + 2;
@@ -557,7 +567,7 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 
     assure_size(out, 2);
     *out->cur++ = '{';
-    if (Qundef != clas) {
+    if (Qundef != clas && NULL != out->opts->create_id && Yes == out->opts->create_ok) {
 	size_t		sep_len = out->opts->dump_opts.before_size + out->opts->dump_opts.after_size + 2;
 	const char	*classname = rb_obj_classname(obj);
 	size_t		len = strlen(classname);

data/ext/oj/dump_compat.c

@@ -224,7 +224,7 @@ bigdecimal_alt(VALUE obj, int depth, Out out) {
     }
     attrs[0].value = rb_funcall(obj, _dump_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out);
+    oj_code_attrs(obj, attrs, depth, out, true);
 }
 
 static ID	real_id = 0;
@@ -245,7 +245,7 @@ complex_alt(VALUE obj, int depth, Out out) {
     attrs[0].value = rb_funcall(obj, real_id, 0);
     attrs[1].value = rb_funcall(obj, imag_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out);
+    oj_code_attrs(obj, attrs, depth, out, true);
 }
 
 static ID	year_id = 0;
@@ -273,7 +273,7 @@ date_alt(VALUE obj, int depth, Out out) {
     attrs[2].value = rb_funcall(obj, day_id, 0);
     attrs[3].value = rb_funcall(obj, start_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out);
+    oj_code_attrs(obj, attrs, depth, out, true);
 }
 
 static ID	hour_id = 0;
@@ -313,7 +313,7 @@ datetime_alt(VALUE obj, int depth, Out out) {
     attrs[6].value = rb_funcall(rb_funcall(obj, offset_id, 0), oj_to_s_id, 0);
     attrs[7].value = rb_funcall(obj, start_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out);
+    oj_code_attrs(obj, attrs, depth, out, true);
 }
 
 static ID	message_id = 0;
@@ -381,7 +381,7 @@ openstruct_alt(VALUE obj, int depth, Out out) {
     }
     attrs[0].value = rb_funcall(obj, table_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out);
+    oj_code_attrs(obj, attrs, depth, out, true);
 }
 
 static void
@@ -434,7 +434,7 @@ rational_alt(VALUE obj, int depth, Out out) {
     attrs[0].value = rb_funcall(obj, numerator_id, 0);
     attrs[1].value = rb_funcall(obj, denominator_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out);
+    oj_code_attrs(obj, attrs, depth, out, true);
 }
 
 static ID	options_id = 0;
@@ -454,7 +454,7 @@ regexp_alt(VALUE obj, int depth, Out out) {
     attrs[0].value = rb_funcall(obj, options_id, 0);
     attrs[1].value = rb_funcall(obj, source_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out);
+    oj_code_attrs(obj, attrs, depth, out, true);
 }
 
 static void
@@ -469,7 +469,7 @@ time_alt(VALUE obj, int depth, Out out) {
     attrs[0].num = ts.tv_sec;
     attrs[1].num = ts.tv_nsec;
 
-    oj_code_attrs(obj, attrs, depth, out);
+    oj_code_attrs(obj, attrs, depth, out, true);
 }
 
 struct _Code	oj_compat_codes[] = {

data/ext/oj/mimic_json.c

@@ -753,6 +753,8 @@ mimic_state(VALUE self) {
 void
 oj_mimic_json_methods(VALUE json) {
     VALUE	json_error;
+    VALUE	generator;
+    VALUE	ext;
 
     rb_define_module_function(json, "create_id=", mimic_set_create_id, 1);
     rb_define_module_function(json, "create_id", mimic_create_id, 0);
@@ -796,6 +798,22 @@ oj_mimic_json_methods(VALUE json) {
     } else {
     	rb_define_class_under(json, "NestingError", json_error);
     }
+
+    if (rb_const_defined_at(json, rb_intern("Ext"))) {
+	ext = rb_const_get_at(json, rb_intern("Ext"));
+     } else {
+	ext = rb_define_module_under(json, "Ext");
+    }
+    if (rb_const_defined_at(ext, rb_intern("Generator"))) {
+	generator = rb_const_get_at(ext, rb_intern("Generator"));
+     } else {
+	generator = rb_define_module_under(ext, "Generator");
+    }
+    if (!rb_const_defined_at(generator, rb_intern("State"))) {
+	rb_require("oj/state");
+    }
+    // Pull in the JSON::State mimic file.
+    state_class = rb_const_get_at(generator, rb_intern("State"));
 }
 
 /* Document-module: JSON
@@ -804,11 +822,9 @@ oj_mimic_json_methods(VALUE json) {
  */
 VALUE
 oj_define_mimic_json(int argc, VALUE *argv, VALUE self) {
-    VALUE	ext;
     VALUE	dummy;
     VALUE	verbose;
     VALUE	json;
-    VALUE	generator;
     
     // Either set the paths to indicate JSON has been loaded or replaces the
     // methods if it has been loaded.
@@ -832,23 +848,7 @@ oj_define_mimic_json(int argc, VALUE *argv, VALUE self) {
 	    rb_funcall2(Oj, rb_intern("mimic_loaded"), 0, 0);
 	}
     }
-    if (rb_const_defined_at(json, rb_intern("Ext"))) {
-	ext = rb_const_get_at(json, rb_intern("Ext"));
-     } else {
-	ext = rb_define_module_under(json, "Ext");
-    }
-    if (rb_const_defined_at(ext, rb_intern("Generator"))) {
-	generator = rb_const_get_at(ext, rb_intern("Generator"));
-     } 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.
-    state_class = rb_const_get_at(generator, rb_intern("State"));
+
     // TBD create all modules in mimic_loaded
 
     oj_mimic_json_methods(json);

data/ext/oj/rails.c

@@ -898,7 +898,7 @@ oj_mimic_rails_init() {
     rb_define_module_function(rails, "optimize", rails_optimize, -1);
     rb_define_module_function(rails, "deoptimize", rails_deoptimize, -1);
     rb_define_module_function(rails, "optimized?", rails_optimized, 1);
-    rb_define_module_function(rails, "mimic_JSON?", rails_mimic_json, 0);
+    rb_define_module_function(rails, "mimic_JSON", rails_mimic_json, 0);
 
     rb_define_module_function(rails, "set_encoder", rails_set_encoder, 0);
     rb_define_module_function(rails, "set_decoder", rails_set_decoder, 0);

data/ext/oj/string_writer.c

@@ -66,6 +66,10 @@ oj_str_writer_init(StrWriter sw) {
     sw->out.opts = &sw->opts;
     sw->out.indent = sw->opts.indent;
     sw->out.depth = 0;
+    sw->out.argc = 0;
+    sw->out.argv = NULL;
+    sw->out.caller = 0;
+    sw->out.ropts = NULL;
 }
 
 void
@@ -140,24 +144,34 @@ oj_str_writer_push_array(StrWriter sw, const char *key) {
 
 void
 oj_str_writer_push_value(StrWriter sw, VALUE val, const char *key) {
+    Out	out = &sw->out;
+    
     if (sw->keyWritten) {
 	sw->keyWritten = 0;
     } else {
 	long	size;
 
 	key_check(sw, key);
-	size = sw->depth * sw->out.indent + 3;
-	assure_size(&sw->out, size);
+	size = sw->depth * out->indent + 3;
+	assure_size(out, size);
 	maybe_comma(sw);
 	if (0 < sw->depth) {
 	    fill_indent(&sw->out, sw->depth);
 	}
 	if (0 != key) {
-	    oj_dump_cstr(key, strlen(key), 0, 0, &sw->out);
-	    *sw->out.cur++ = ':';
+	    oj_dump_cstr(key, strlen(key), 0, 0, out);
+	    *out->cur++ = ':';
 	}
     }
-    oj_dump_custom_val(val, sw->depth, &sw->out, true);
+    switch (out->opts->mode) {
+    case StrictMode:	oj_dump_strict_val(val, sw->depth, out);				break;
+    case NullMode:	oj_dump_null_val(val, sw->depth, out);					break;
+    case ObjectMode:	oj_dump_obj_val(val, sw->depth, out);					break;
+    case CompatMode:	oj_dump_compat_val(val, sw->depth, out, Yes == out->opts->to_json);	break;
+    case RailsMode:	oj_dump_rails_val(val, sw->depth, out);					break;
+    case CustomMode:	oj_dump_custom_val(val, sw->depth, out, true);				break;
+    default:		oj_dump_custom_val(val, sw->depth, out, true);				break;
+    }
 }
 
 void
@@ -236,7 +250,11 @@ str_writer_free(void *ptr) {
 /* Document-method: new
  * call-seq: new(io, options)
  *
- * Creates a new StringWriter.
+ * Creates a new StringWriter. Options are supported according the the
+ * specified mode or the mode in the default options. Note that if mimic_JSON
+ * or Oj.optimize_rails has not been called then the behavior of the modes may
+ * not be the same as if they were.
+ *
  * - *io* [_IO_] stream to write to
  * - *options* [_Hash_] formating options
  */
@@ -248,6 +266,8 @@ str_writer_new(int argc, VALUE *argv, VALUE self) {
     if (1 == argc) {
 	oj_parse_options(argv[0], &sw->opts);
     }
+    sw->out.argc = argc - 1;
+    sw->out.argv = argv + 1;
     sw->out.indent = sw->opts.indent;
 
     return Data_Wrap_Struct(oj_string_writer_class, 0, str_writer_free, sw);

data/lib/oj/version.rb

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

data/test/bug.rb

@@ -4,9 +4,12 @@
 %w(lib ext test).each do |dir|
   $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
 end
+
 require 'rails'
+require 'active_support/json'
 require 'oj'
 
-Oj.mimic_JSON
+Oj.optimize_rails
+
+JSON.pretty_generate({'a'=>1,'b'=>[true,false]})
 
-nil.to_json

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-04 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler