oj 2.14.5 → 2.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18d01b3bb2476564f6b39dd5df0b8ece9d9dd2a4
-  data.tar.gz: b1927b77d0fad77544118e3d11a137374cf1630d
+  metadata.gz: a4eeac461218d534327dc278a6dfe132de7227bb
+  data.tar.gz: 9197b3baa13fe3077519d6156a9d9dbbd1176066
 SHA512:
-  metadata.gz: 2a493651cc5bffc96ec16a7cbb98e8d025a2484419ccad9ea67a0fd9f854eaf7f26efaf7f5740988e01c63426a424571f2d65ef2d07dc29128ec1c6ed41eb066
-  data.tar.gz: 89e15826b019ddc6a70b9c8c130edb26f44afdf0115e603d3b45a47a20105b78530a46740630595272bd89771a95439f6614ff6c5e7e44b0ce1eb75eb7b57f51
+  metadata.gz: 1a89867a9e4e684a3d0f268e18179d54f63471a0b8f3fed3ed174a11b5dc3f0cd582bce893955de582e57872985196c6dd671078624b1de4bbfb17805508e9ef
+  data.tar.gz: 9eb8668bbc77cc0a3057321706f08bbded75ab0bca623964554796bdc9835ede42e34b36a596f64637a81461b9bc9a67d94cd5d46ee8fca5fce04c8a9ab5f6cb

data/README.md

@@ -159,10 +159,9 @@ Oj.default_options = {:mode => :compat }
 
 ## Releases
 
-**Release 2.14.5**
+**Release 2.14.6**
 
- - Parse errors in mimic mode are not a separate class than Oj.ParseError so the
-   displayed name is JSON::ParserError instead.
+ - Changed JSON::ParserError to inherit from JSON::JSONError which inherits from StandardError.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/oj.c

@@ -1881,7 +1881,8 @@ static VALUE
 define_mimic_json(int argc, VALUE *argv, VALUE self) {
     VALUE	ext;
     VALUE	dummy;
-	
+    VALUE	json_error;
+    
     // Either set the paths to indicate JSON has been loaded or replaces the
     // methods if it has been loaded.
     if (rb_const_defined_at(rb_cObject, rb_intern("JSON"))) {
@@ -1944,11 +1945,14 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
     create_additions_sym = ID2SYM(rb_intern("create_additions"));	rb_gc_register_address(&create_additions_sym);
     symbolize_names_sym = ID2SYM(rb_intern("symbolize_names"));		rb_gc_register_address(&symbolize_names_sym);
 
+    if (rb_const_defined_at(mimic, rb_intern("JSONError"))) {
+	rb_funcall(mimic, rb_intern("remove_const"), 1, ID2SYM(rb_intern("JSONError")));
+    }
+    json_error = rb_define_class_under(mimic, "JSONError", rb_eStandardError);
     if (rb_const_defined_at(mimic, rb_intern("ParserError"))) {
 	rb_funcall(mimic, rb_intern("remove_const"), 1, ID2SYM(rb_intern("ParserError")));
     }
-    rb_define_class_under(mimic, "ParserError", rb_eException);
-    json_parser_error_class = rb_const_get(mimic, rb_intern("ParserError"));
+    json_parser_error_class = rb_define_class_under(mimic, "ParserError", json_error);
 
     if (!rb_const_defined_at(mimic, rb_intern("State"))) {
         rb_define_class_under(mimic, "State", rb_cObject);

data/lib/oj/version.rb

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

metadata

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