oj-safe 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5db75d52595ff977025eb4746986c3e640f865fb0e022dc979cad6a1ebbf4c59
-  data.tar.gz: fffe75b048a7b2f9a583517b038c3d4f14d592f8d860a880f851a7c3cc352f30
+  metadata.gz: 02c5aa00ec358c39f60b008cb8d0beeac926b5635eda855df53e98df453aa425
+  data.tar.gz: cd7db2bab94dc7286b1c9cedfa6e3fa2a6edf31ce67527530c7424d6e9006af2
 SHA512:
-  metadata.gz: 989dae91a64a063661d2a761b72bd5f0e7b593a157123131ab06ead18092098801b21b22031cc3f8a483206d06edeb530d1d28892df31562d12f8b791be3e4eb
-  data.tar.gz: 9d9b2c822fbce6dad86f969f653217462af714f79e1a757cbde2fb14cfb062977b436ff844ea81cf31b50ba66a1c90e43795a16878a4d59cc9941d8c2ce3c5d1
+  metadata.gz: 9bc912c849561867cf7d780f9654e1c2a5df0605fea8e46eaa8d83417a5abe52d4cd9b3602a480ea7b52460cd5ad863f9a34ea852b97d18e269f04ae46908f1a
+  data.tar.gz: 3519be24f916efe79432313b1af5d37992d5ddfcfaee9bec3b5b07fb5bda33757e8ddc914b8349592bbdf76cc69c689bfe0509159120301baee701976ca45550

data/ext/oj-safe/safe.c

@@ -19,7 +19,11 @@ static VALUE max_hash_size_sym,
              max_depth_sym,
              max_total_elements_sym,
              max_json_size_bytes_sym,
-             validation_error_class;
+             max_hash_size_error_class,
+             max_array_size_error_class,
+             max_depth_error_class,
+             max_total_elements_error_class,
+             max_json_size_error_class;
 
 static ID parser_ivar_id,
           parse_id,
@@ -74,7 +78,7 @@ static void check_object_size(safe_T safe) {
 
   if(safe->max_hash_size > number_of_items_in_hash) return;
 
-  rb_raise(validation_error_class, "Too many object items!");
+  rb_raise(max_hash_size_error_class, "Too many object items!");
 }
 
 static void check_array_size(safe_T safe) {
@@ -88,13 +92,13 @@ static void check_array_size(safe_T safe) {
 
   if(safe->max_array_size > number_of_items_in_array) return;
 
-  rb_raise(validation_error_class, "Too many array items!");
+  rb_raise(max_array_size_error_class, "Too many array items!");
 }
 
 static void check_max_depth(safe_T safe, ojParser p) {
   if(safe->max_depth == 0 || safe->max_depth >= (p->depth + 1)) return;
 
-  rb_raise(validation_error_class, "JSON is too deep!");
+  rb_raise(max_depth_error_class, "JSON is too deep!");
 }
 
 static void check_max_total_elements(safe_T safe) {
@@ -106,7 +110,7 @@ static void check_max_total_elements(safe_T safe) {
   */
   if(safe->max_total_elements == 0 || safe->max_total_elements > safe->current_elements_count) return;
 
-  rb_raise(validation_error_class, "Too many elements!");
+  rb_raise(max_total_elements_error_class, "Too many elements!");
 }
 
 static void check_json_size(VALUE parser, VALUE json) {
@@ -119,7 +123,7 @@ static void check_json_size(VALUE parser, VALUE json) {
 
   if(safe->max_json_size_bytes == 0 || safe->max_json_size_bytes >= json_byte_size) return;
 
-  rb_raise(validation_error_class, "JSON payload is too big!");
+  rb_raise(max_json_size_error_class, "JSON payload is too big!");
 }
 
 static void safe_start(ojParser p) {
@@ -440,8 +444,19 @@ static VALUE rb_safe_parse(VALUE self, VALUE json) {
 void Init_safe_ext(void) {
   VALUE oj_module = rb_const_get(rb_cObject, rb_intern("Oj"));
   VALUE safe_parser_class = rb_define_class_under(oj_module, "Safe", rb_cObject);
-  validation_error_class = rb_define_class_under(safe_parser_class, "ValidationError", rb_eRuntimeError);
-  rb_gc_register_address(&validation_error_class);
+  VALUE validation_error_class = rb_define_class_under(safe_parser_class, "ValidationError", rb_eRuntimeError);
+
+  max_hash_size_error_class = rb_define_class_under(safe_parser_class, "HashSizeError", validation_error_class);
+  max_array_size_error_class = rb_define_class_under(safe_parser_class, "ArraySizeError", validation_error_class);
+  max_depth_error_class = rb_define_class_under(safe_parser_class, "DepthError", validation_error_class);
+  max_total_elements_error_class = rb_define_class_under(safe_parser_class, "TotalElementsError", validation_error_class);
+  max_json_size_error_class = rb_define_class_under(safe_parser_class, "PayloadSizeError", validation_error_class);
+
+  rb_gc_register_address(&max_hash_size_error_class);
+  rb_gc_register_address(&max_array_size_error_class);
+  rb_gc_register_address(&max_depth_error_class);
+  rb_gc_register_address(&max_total_elements_error_class);
+  rb_gc_register_address(&max_json_size_error_class);
 
   max_hash_size_sym = ID2SYM(rb_intern("max_hash_size"));
   max_array_size_sym = ID2SYM(rb_intern("max_array_size"));

data/lib/oj/safe/version.rb

@@ -2,6 +2,6 @@
 
 module Oj
   class Safe
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj-safe
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Mehmet Emin INAC