oj 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af2435c13d3e1e32934f3743b0de0333093ec0bd
-  data.tar.gz: 05013dc900f2839c67a5d8aea480845686ac2bf9
+  metadata.gz: 70265e88ab461a3fc0c6207db8f333504df2f53c
+  data.tar.gz: 9a0bd96af511e73ed8f5aa6caaebe2f7a4b00bed
 SHA512:
-  metadata.gz: 49af58a9f5747e506f972ca8a6a85d9463ae915194f230f2b64edb74f627c5d20f50ba38b9a07c5a9e56f774c3c5c1a58e45ec979151a35ac72e96cb0a77d2d6
-  data.tar.gz: 6c0fb738c3dd93610034550cb2ef123c75e5bb9cc2cf27f5effd7f97197f5747eac7dcce7542a5d1b0c9e6b7de8b25b9a6b914e77d710ebaf6514e98d3bb7a11
+  metadata.gz: 546692fc1cdc5bebc182b539a38267789ee67e354dd791154e6141df22ab0514927a0c501915bb1ed38c1b3ebc64c07986326abcb5980c9550a0fd68717bd854
+  data.tar.gz: dedc2c96f831f2d09576c74bf6d9ec97af06ca36497e389a02d321d8f60c3645aaeb81bcc3384835fad28d9638b02309473071e37281440760c7f7bc378dffc5

data/ext/oj/custom.c

@@ -564,6 +564,7 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
     size_t	size = 0;
     int		d2 = depth + 1;
     int		cnt;
+    bool	class_written = false;
 
     assure_size(out, 2);
     *out->cur++ = '{';
@@ -592,9 +593,10 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 	memcpy(out->cur, classname, len);
 	out->cur += len;
 	*out->cur++ = '"';
+	class_written = true;
     }
     cnt = (int)rb_ivar_count(obj);
-    if (Qundef != clas && 0 < cnt) {
+    if (class_written) {
 	*out->cur++ = ',';
     }
     if (0 == cnt && Qundef == clas) {

data/ext/oj/dump_compat.c

@@ -593,19 +593,19 @@ dump_float(VALUE obj, int depth, Out out, bool as_ok) {
 	*b++ = '\0';
 	cnt = 3;
     } else if (OJ_INFINITY == d) {
-	if (out->opts->dump_opts.nan_dump) {
+	if (WordNan == out->opts->dump_opts.nan_dump) {
 	    strcpy(buf, "Infinity");
 	} else {
 	    raise_json_err("Infinity not allowed in JSON.", "GeneratorError");
 	}
     } else if (-OJ_INFINITY == d) {
-	if (out->opts->dump_opts.nan_dump) {
+	if (WordNan == out->opts->dump_opts.nan_dump) {
 	    strcpy(buf, "-Infinity");
 	} else {
 	    raise_json_err("-Infinity not allowed in JSON.", "GeneratorError");
 	}
     } else if (isnan(d)) {
-	if (out->opts->dump_opts.nan_dump) {
+	if (WordNan == out->opts->dump_opts.nan_dump) {
 	    strcpy(buf, "NaN");
 	} else {
 	    raise_json_err("NaN not allowed in JSON.", "GeneratorError");

data/ext/oj/dump_strict.c

@@ -167,7 +167,11 @@ dump_array(VALUE a, int depth, Out out, bool as_ok) {
 	    } else {
 		fill_indent(out, d2);
 	    }
-	    oj_dump_strict_val(rb_ary_entry(a, i), d2, out);
+	    if (NullMode == out->opts->mode) {
+		oj_dump_null_val(rb_ary_entry(a, i), d2, out);
+	    } else {
+		oj_dump_strict_val(rb_ary_entry(a, i), d2, out);
+	    }
 	    if (i < cnt) {
 		*out->cur++ = ',';
 	    }
@@ -203,7 +207,7 @@ hash_cb(VALUE key, VALUE value, Out out) {
     int		rtype = rb_type(key);
     
     if (rtype != T_STRING && rtype != T_SYMBOL) {
-	rb_raise(rb_eTypeError, "In :strict mode all Hash keys must be Strings or Symbols, not %s.\n", rb_class2name(rb_obj_class(key)));
+	rb_raise(rb_eTypeError, "In :strict and :null mode all Hash keys must be Strings or Symbols, not %s.\n", rb_class2name(rb_obj_class(key)));
     }
     if (out->omit_nil && Qnil == value) {
 	return ST_CONTINUE;
@@ -249,7 +253,11 @@ hash_cb(VALUE key, VALUE value, Out out) {
 	    out->cur += out->opts->dump_opts.after_size;
 	}
     }
-    oj_dump_strict_val(value, depth, out);
+    if (NullMode == out->opts->mode) {
+	oj_dump_null_val(value, depth, out);
+    } else {
+	oj_dump_strict_val(value, depth, out);
+    }
     out->depth = depth;
     *out->cur++ = ',';
 

data/ext/oj/mimic_json.c

@@ -108,7 +108,11 @@ oj_parse_mimic_dump_options(VALUE ropts, Options copts) {
 	}
     }
     if (Qnil != (v = rb_hash_lookup(ropts, oj_allow_nan_sym))) {
-	copts->dump_opts.nan_dump = (Qtrue == v);
+	if (Qtrue == v) {
+	    copts->dump_opts.nan_dump = WordNan;
+	} else {
+	    copts->dump_opts.nan_dump = RaiseNan;
+	}
     }
     if (Qnil != (v = rb_hash_lookup(ropts, oj_indent_sym))) {
 	rb_check_type(v, T_STRING);
@@ -362,7 +366,7 @@ mimic_generate_core(int argc, VALUE *argv, Options copts) {
     out.caller = CALLER_GENERATE;
     // For obj.to_json or generate nan is not allowed but if called from dump
     // it is.
-    copts->dump_opts.nan_dump = false;
+    copts->dump_opts.nan_dump = RaiseNan;
     copts->mode = CompatMode;
     if (2 == argc && Qnil != argv[1]) {
 	oj_parse_mimic_dump_options(argv[1], copts);
@@ -698,7 +702,7 @@ static struct _Options	mimic_object_to_json_options = {
 	0,	// after_size
 	0,	// hash_size
 	0,	// array_size
-	AutoNan,// nan_dump
+	RaiseNan,// nan_dump
 	false,	// omit_nil
 	100, // max_depth
     },

data/ext/oj/oj.c

@@ -222,7 +222,7 @@ struct _Options	oj_default_options = {
  * - *:time_format* [_:unix_|_:unix_zone_|_:xmlschema_|_:ruby_] time format when dumping in :compat and :object mode
  * - *:bigdecimal_as_decimal* [_Boolean_|_nil_] dump BigDecimal as a decimal number or as a String
  * - *:bigdecimal_load* [_:bigdecimal_|_:float_|_:auto_] load decimals as BigDecimal instead of as a Float. :auto pick the most precise for the number of digits.
- * - *:create_id* [_String_|_nil_] create id for json compatible object encoding, default is 'json_create'
+ * - *:create_id* [_String_|_nil_] create id for json compatible object encoding, default is 'json_class'
  * - *:second_precision* [_Fixnum_|_nil_] number of digits after the decimal when dumping the seconds portion of time
  * - *:float_precision* [_Fixnum_|_nil_] number of digits of precision when dumping floats, 0 indicates use Ruby
  * - *:use_to_json* [_Boolean_|_nil_] call to_json() methods on dump, default is false
@@ -949,12 +949,12 @@ dump(int argc, VALUE *argv, VALUE self) {
     if (1 > argc) {
 	rb_raise(rb_eArgError, "wrong number of arguments (0 for 1).");
     }
+    if (CompatMode == copts.mode) {
+	copts.dump_opts.nan_dump = WordNan;
+    }
     if (2 == argc) {
 	oj_parse_options(argv[1], &copts);
     }
-    if (CompatMode == copts.mode) {
-	copts.dump_opts.nan_dump = true;
-    }
     out.buf = buf;
     out.end = buf + sizeof(buf) - 10;
     out.allocated = false;
@@ -1001,7 +1001,7 @@ to_json(int argc, VALUE *argv, VALUE self) {
 	rb_raise(rb_eArgError, "wrong number of arguments (0 for 1).");
     }
     copts.escape_mode = JXEsc;
-    copts.dump_opts.nan_dump = false;
+    copts.dump_opts.nan_dump = RaiseNan;
     if (2 == argc) {
 	oj_parse_mimic_dump_options(argv[1], &copts);
     }
@@ -1013,8 +1013,7 @@ to_json(int argc, VALUE *argv, VALUE self) {
     out.omit_nil = copts.dump_opts.omit_nil;
     // For obj.to_json or generate nan is not allowed but if called from dump
     // it is.
-    copts.dump_opts.nan_dump = false;
-    oj_dump_obj_to_json_using_params(*argv, &copts, &out, argc - 1,argv + 1);
+    oj_dump_obj_to_json_using_params(*argv, &copts, &out, argc - 1, argv + 1);
 
     if (0 == out.buf) {
 	rb_raise(rb_eNoMemError, "Not enough memory.");

data/lib/oj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -60,14 +60,14 @@ extensions:
 extra_rdoc_files:
 - README.md
 - pages/Advanced.md
-- pages/Compatibility.md
-- pages/Custom.md
 - pages/Encoding.md
-- pages/JsonGem.md
 - pages/Modes.md
-- pages/Options.md
-- pages/Rails.md
 - pages/Security.md
+- pages/JsonGem.md
+- pages/Rails.md
+- pages/Compatibility.md
+- pages/Custom.md
+- pages/Options.md
 files:
 - LICENSE
 - README.md
@@ -149,7 +149,6 @@ files:
 - test/activesupport5/encoding_test_cases.rb
 - test/activesupport5/test_helper.rb
 - test/activesupport5/time_zone_test_helpers.rb
-- test/bug.rb
 - test/files.rb
 - test/helper.rb
 - test/isolated/shared.rb
@@ -240,76 +239,75 @@ signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files:
-- test/_test_active.rb
-- test/_test_active_mimic.rb
-- test/_test_mimic_rails.rb
-- test/activesupport4/decoding_test.rb
-- test/activesupport4/encoding_test.rb
-- test/activesupport4/test_helper.rb
-- test/activesupport5/decoding_test.rb
-- test/activesupport5/encoding_test.rb
-- test/activesupport5/encoding_test_cases.rb
 - test/activesupport5/test_helper.rb
 - test/activesupport5/time_zone_test_helpers.rb
-- test/bug.rb
+- test/activesupport5/decoding_test.rb
+- test/activesupport5/encoding_test_cases.rb
+- test/activesupport5/encoding_test.rb
+- test/test_file.rb
 - test/files.rb
-- test/helper.rb
-- test/isolated/shared.rb
-- test/isolated/test_mimic_after.rb
-- test/isolated/test_mimic_alone.rb
-- test/isolated/test_mimic_as_json.rb
-- test/isolated/test_mimic_before.rb
-- test/isolated/test_mimic_define.rb
-- test/isolated/test_mimic_rails_after.rb
-- test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_redefine.rb
-- test/json_gem/json_addition_test.rb
-- test/json_gem/json_common_interface_test.rb
-- test/json_gem/json_encoding_test.rb
-- test/json_gem/json_ext_parser_test.rb
-- test/json_gem/json_fixtures_test.rb
-- test/json_gem/json_generator_test.rb
-- test/json_gem/json_generic_object_test.rb
-- test/json_gem/json_parser_test.rb
-- test/json_gem/json_string_matching_test.rb
-- test/json_gem/test_helper.rb
-- test/perf.rb
-- test/perf_compat.rb
-- test/perf_fast.rb
-- test/perf_file.rb
-- test/perf_object.rb
-- test/perf_saj.rb
 - test/perf_scp.rb
-- test/perf_simple.rb
-- test/perf_strict.rb
-- test/sample/change.rb
-- test/sample/dir.rb
-- test/sample/doc.rb
+- test/test_debian.rb
+- test/test_gc.rb
+- test/_test_mimic_rails.rb
+- test/test_writer.rb
+- test/test_hash.rb
 - test/sample/file.rb
-- test/sample/group.rb
 - test/sample/hasprops.rb
 - test/sample/layer.rb
-- test/sample/line.rb
+- test/sample/change.rb
+- test/sample/doc.rb
 - test/sample/oval.rb
-- test/sample/rect.rb
 - test/sample/shape.rb
 - test/sample/text.rb
-- test/sample.rb
-- test/sample_json.rb
-- test/test_compat.rb
-- test/test_custom.rb
-- test/test_debian.rb
-- test/test_fast.rb
-- test/test_file.rb
-- test/test_gc.rb
-- test/test_hash.rb
-- test/test_null.rb
+- test/sample/group.rb
+- test/sample/dir.rb
+- test/sample/line.rb
+- test/sample/rect.rb
+- test/tests.rb
 - test/test_object.rb
+- test/tests_mimic.rb
+- test/perf_saj.rb
+- test/tests_mimic_addition.rb
 - test/test_saj.rb
+- test/sample.rb
 - test/test_scp.rb
-- test/test_strict.rb
+- test/perf_object.rb
+- test/perf_simple.rb
+- test/test_null.rb
+- test/_test_active_mimic.rb
+- test/_test_active.rb
+- test/test_compat.rb
+- test/sample_json.rb
+- test/json_gem/test_helper.rb
+- test/json_gem/json_generic_object_test.rb
+- test/json_gem/json_common_interface_test.rb
+- test/json_gem/json_string_matching_test.rb
+- test/json_gem/json_addition_test.rb
+- test/json_gem/json_fixtures_test.rb
+- test/json_gem/json_generator_test.rb
+- test/json_gem/json_ext_parser_test.rb
+- test/json_gem/json_parser_test.rb
+- test/json_gem/json_encoding_test.rb
+- test/helper.rb
+- test/activesupport4/test_helper.rb
+- test/activesupport4/decoding_test.rb
+- test/activesupport4/encoding_test.rb
+- test/perf_file.rb
+- test/perf_compat.rb
 - test/test_various.rb
-- test/test_writer.rb
-- test/tests.rb
-- test/tests_mimic.rb
-- test/tests_mimic_addition.rb
+- test/test_strict.rb
+- test/test_custom.rb
+- test/perf_strict.rb
+- test/perf_fast.rb
+- test/isolated/test_mimic_alone.rb
+- test/isolated/test_mimic_after.rb
+- test/isolated/test_mimic_as_json.rb
+- test/isolated/test_mimic_rails_after.rb
+- test/isolated/test_mimic_before.rb
+- test/isolated/test_mimic_rails_before.rb
+- test/isolated/test_mimic_define.rb
+- test/isolated/shared.rb
+- test/isolated/test_mimic_redefine.rb
+- test/perf.rb
+- test/test_fast.rb

data/test/bug.rb

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-%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.optimize_rails
-
-puts JSON.parse('{"a":1}', symbolize_names: true)
-
-