oj 2.14.4 → 2.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e24cfa368da8658a1a0d7a327081d3dcf54eb2b1
-  data.tar.gz: c54d265f263e0e5ff7fe5694b7318b6ec25dc594
+  metadata.gz: 18d01b3bb2476564f6b39dd5df0b8ece9d9dd2a4
+  data.tar.gz: b1927b77d0fad77544118e3d11a137374cf1630d
 SHA512:
-  metadata.gz: cb94917cf00f55f316fa6679ff46f01a7bbfc8fb8e6c162db4c28fb35bf9c102f8ed37360672b2a5ca5b07f61b0e33bb3419f0a4736bef09ed3455a89fe5a8d5
-  data.tar.gz: 49dee1f8813f27c8b846b1a81c2e4ac0ca97579f3a2ccd1bc1175f3ed6eb51684d304dc76137c12266ba884cc316a47a909b509ee1d01d0c892410ae7cad339c
+  metadata.gz: 2a493651cc5bffc96ec16a7cbb98e8d025a2484419ccad9ea67a0fd9f854eaf7f26efaf7f5740988e01c63426a424571f2d65ef2d07dc29128ec1c6ed41eb066
+  data.tar.gz: 89e15826b019ddc6a70b9c8c130edb26f44afdf0115e603d3b45a47a20105b78530a46740630595272bd89771a95439f6614ff6c5e7e44b0ce1eb75eb7b57f51

data/README.md

@@ -69,7 +69,7 @@ actual default options but on a copy of the Hash:
 Oj.default_options = {:mode => :compat }
 ```
 
- * `:mode` [Symbol] mode for dumping and loading JSON.
+ * `:mode` [Symbol] mode for dumping and loading JSON. **Important format details [here](http://www.ohler.com/dev/oj_misc/encoding_format.html).**
 
   - `:object` mode will dump any `Object` as a JSON `Object` with keys that
     match the Ruby `Object`'s variable names without the '@' prefix
@@ -159,9 +159,10 @@ Oj.default_options = {:mode => :compat }
 
 ## Releases
 
-**Release 2.14.4**
+**Release 2.14.5**
 
- - When not in quirks mode strings are now raise an exception if they are the top level JSON value.
+ - Parse errors in mimic mode are not a separate class than Oj.ParseError so the
+   displayed name is JSON::ParserError instead.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/compat.c

@@ -130,6 +130,7 @@ oj_compat_parse(int argc, VALUE *argv, VALUE self) {
 
     pi.options = oj_default_options;
     pi.handler = Qnil;
+    pi.err_class = Qnil;
     oj_set_compat_callbacks(&pi);
 
     if (T_STRING == rb_type(*argv)) {
@@ -145,6 +146,7 @@ oj_compat_parse_cstr(int argc, VALUE *argv, char *json, size_t len) {
 
     pi.options = oj_default_options;
     pi.handler = Qnil;
+    pi.err_class = Qnil;
     oj_set_strict_callbacks(&pi);
     pi.end_hash = end_hash;
     pi.hash_set_cstr = hash_set_cstr;

data/ext/oj/object.c

@@ -776,6 +776,7 @@ oj_object_parse(int argc, VALUE *argv, VALUE self) {
 
     pi.options = oj_default_options;
     pi.handler = Qnil;
+    pi.err_class = Qnil;
     oj_set_object_callbacks(&pi);
 
     if (T_STRING == rb_type(*argv)) {
@@ -791,6 +792,7 @@ oj_object_parse_cstr(int argc, VALUE *argv, char *json, size_t len) {
 
     pi.options = oj_default_options;
     pi.handler = Qnil;
+    pi.err_class = Qnil;
     oj_set_strict_callbacks(&pi);
     pi.end_hash = end_hash;
     pi.start_hash = start_hash;

data/ext/oj/oj.c

@@ -122,6 +122,7 @@ static VALUE	float_prec_sym;
 static VALUE	float_sym;
 static VALUE	indent_sym;
 static VALUE	json_sym;
+static VALUE	json_parser_error_class;
 static VALUE	mode_sym;
 static VALUE	newline_sym;
 static VALUE	nilnil_sym;
@@ -752,6 +753,7 @@ load_file(int argc, VALUE *argv, VALUE self) {
     Check_Type(*argv, T_STRING);
     pi.options = oj_default_options;
     pi.handler = Qnil;
+    pi.err_class = Qnil;
     if (2 <= argc) {
 	VALUE	ropts = argv[1];
 	VALUE	v;
@@ -806,6 +808,7 @@ safe_load(VALUE self, VALUE doc) {
     struct _ParseInfo	pi;
     VALUE		args[1];
 
+    pi.err_class = Qnil;
     pi.options = oj_default_options;
     pi.options.auto_define = No;
     pi.options.sym_key = No;
@@ -1591,6 +1594,7 @@ mimic_load(int argc, VALUE *argv, VALUE self) {
     VALUE		obj;
     VALUE		p = Qnil;
 
+    pi.err_class = json_parser_error_class;
     pi.options = oj_default_options;
     oj_set_compat_callbacks(&pi);
 
@@ -1727,6 +1731,7 @@ mimic_parse(int argc, VALUE *argv, VALUE self) {
 	rb_raise(rb_eArgError, "Wrong number of arguments to parse.");
     }
     oj_set_compat_callbacks(&pi);
+    pi.err_class = json_parser_error_class;
     pi.options = oj_default_options;
     pi.options.auto_define = No;
     pi.options.quirks_mode = No;
@@ -1942,7 +1947,8 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
     if (rb_const_defined_at(mimic, rb_intern("ParserError"))) {
 	rb_funcall(mimic, rb_intern("remove_const"), 1, ID2SYM(rb_intern("ParserError")));
     }
-    rb_define_const(mimic, "ParserError", oj_parse_error_class);
+    rb_define_class_under(mimic, "ParserError", rb_eException);
+    json_parser_error_class = rb_const_get(mimic, rb_intern("ParserError"));
 
     if (!rb_const_defined_at(mimic, rb_intern("State"))) {
         rb_define_class_under(mimic, "State", rb_cObject);
@@ -2107,6 +2113,7 @@ void Init_oj() {
     oj_parse_error_class = rb_const_get_at(Oj, rb_intern("ParseError"));
     oj_stringio_class = rb_const_get(rb_cObject, rb_intern("StringIO"));
     oj_struct_class = rb_const_get(rb_cObject, rb_intern("Struct"));
+    json_parser_error_class = Qnil; // replaced if mimic is called
 
     allow_gc_sym = ID2SYM(rb_intern("allow_gc"));	rb_gc_register_address(&allow_gc_sym);
     ascii_only_sym = ID2SYM(rb_intern("ascii_only"));	rb_gc_register_address(&ascii_only_sym);

data/ext/oj/parse.c

@@ -906,23 +906,35 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len, int yie
 	rb_jump_tag(line);
     }
     if (err_has(&pi->err)) {
+	if (Qnil != pi->err_class) {
+	    pi->err.clas = pi->err_class;
+	}
 	oj_err_raise(&pi->err);
     }
     if (pi->options.quirks_mode == No) {
 	switch (rb_type(result)) {
-            case T_NIL:
-	    case T_TRUE:
-	    case T_FALSE:
-	    case T_FIXNUM:
-	    case T_FLOAT:
-	    case T_CLASS:
-	    case T_STRING:
-	    case T_SYMBOL:
-		rb_raise(oj_parse_error_class, "unexpected non-document value");
-		break;
-	    default:
-		// okay
-		break;
+	case T_NIL:
+	case T_TRUE:
+	case T_FALSE:
+	case T_FIXNUM:
+	case T_FLOAT:
+	case T_CLASS:
+	case T_STRING:
+	case T_SYMBOL: {
+	    struct _Err	err;
+
+	    if (Qnil == pi->err_class) {
+		err.clas = oj_parse_error_class;
+	    } else {
+		err.clas = pi->err_class;
+	    }
+	    snprintf(err.msg, sizeof(err.msg), "unexpected non-document value");
+	    oj_err_raise(&err);
+	    break;
+	}
+	default:
+	    // okay
+	    break;
 	}
     }
     return result;

data/ext/oj/parse.h

@@ -88,6 +88,7 @@ typedef struct _ParseInfo {
     void		(*add_cstr)(struct _ParseInfo *pi, const char *str, size_t len, const char *orig);
     void		(*add_num)(struct _ParseInfo *pi, NumInfo ni);
     void		(*add_value)(struct _ParseInfo *pi, VALUE val);
+    VALUE		err_class;
 } *ParseInfo;
 
 extern void	oj_parse2(ParseInfo pi);

data/ext/oj/scp.c

@@ -187,6 +187,7 @@ oj_sc_parse(int argc, VALUE *argv, VALUE self) {
     struct _ParseInfo	pi;
     VALUE		input = argv[1];
 
+    pi.err_class = Qnil;
     pi.options = oj_default_options;
     if (3 == argc) {
 	oj_parse_options(argv[2], &pi.options);

data/ext/oj/sparse.c

@@ -809,6 +809,9 @@ oj_pi_sparse(int argc, VALUE *argv, ParseInfo pi, int fd) {
 	rb_jump_tag(line);
     }
     if (err_has(&pi->err)) {
+	if (Qnil != pi->err_class) {
+	    pi->err.clas = pi->err_class;
+	}
 	oj_err_raise(&pi->err);
     }
     return result;

data/ext/oj/strict.c

@@ -159,6 +159,7 @@ oj_strict_parse(int argc, VALUE *argv, VALUE self) {
 
     pi.options = oj_default_options;
     pi.handler = Qnil;
+    pi.err_class = Qnil;
     oj_set_strict_callbacks(&pi);
 
     if (T_STRING == rb_type(*argv)) {
@@ -174,6 +175,7 @@ oj_strict_parse_cstr(int argc, VALUE *argv, char *json, size_t len) {
 
     pi.options = oj_default_options;
     pi.handler = Qnil;
+    pi.err_class = Qnil;
     oj_set_strict_callbacks(&pi);
 
     return oj_pi_parse(argc, argv, &pi, json, len, 1);

data/lib/oj/version.rb

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

data/test/perf_compat.rb

@@ -68,7 +68,7 @@ $obj = {
 Oj.default_options = { :indent => $indent, :mode => :compat }
 
 if 0 < $size
-  s = Oj.dump($obj, :mode => :compat).size + 1
+  s = Oj.dump($obj).size + 1
   cnt = $size * 1024 / s
   o = $obj
   $obj = []
@@ -77,7 +77,7 @@ if 0 < $size
   end
 end
 
-$json = Oj.dump($obj, :mode => :compat)
+$json = Oj.dump($obj)
 $failed = {} # key is same as String used in tests later
 
 def capture_error(tag, orig, load_key, dump_key, &blk)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.14.4
+  version: 2.14.5
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler