oj-safe 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5db75d52595ff977025eb4746986c3e640f865fb0e022dc979cad6a1ebbf4c59
-  data.tar.gz: fffe75b048a7b2f9a583517b038c3d4f14d592f8d860a880f851a7c3cc352f30
+  metadata.gz: 262a285be89f6f4758bba4caad7c99eda8eac378bd4b0eb4fb68a8c77737f26a
+  data.tar.gz: f74a8afb6c8272ebe279db56229a9be6e453a192d73bff71403cd14f678288e0
 SHA512:
-  metadata.gz: 989dae91a64a063661d2a761b72bd5f0e7b593a157123131ab06ead18092098801b21b22031cc3f8a483206d06edeb530d1d28892df31562d12f8b791be3e4eb
-  data.tar.gz: 9d9b2c822fbce6dad86f969f653217462af714f79e1a757cbde2fb14cfb062977b436ff844ea81cf31b50ba66a1c90e43795a16878a4d59cc9941d8c2ce3c5d1
+  metadata.gz: ccd553b596fa4a7da41881a5ca1e8c1d2bedff4fc58fbc917a8e0e005a53a5a4025d61fb8e29397a366fe86c02aec73f7c3f4c5aacd4f3ac1b9df1fed7fb5bc5
+  data.tar.gz: a86b9023619c3585b8056872fc378aff581302d4da577640da4f30145c3be1505237006a95ef8fd56e8589e537b4276361fcb85acff5da6c652a023545e5f68d

data/README.md

@@ -28,7 +28,7 @@ Maximum number of key/value pairs allowed in a JSON object.
 parser = Oj::Safe.new(max_hash_size: 2)
 
 parser.parse('{ "foo": 1, "bar": 2 }') # => { "foo" => 1, "bar" => 2 }
-parser.parse('{ "foo": 1, "bar": 2, "baz": 3 }') # => Raises `Oj::Safe::ValidationError`.
+parser.parse('{ "foo": 1, "bar": 2, "baz": 3 }') # => Raises `Oj::Safe::HashSizeError`.
 ```
 
 ##### `max_array_size`
@@ -39,7 +39,7 @@ Maximum number of items allowed in a JSON array.
 parser = Oj::Safe.new(max_array_size: 2)
 
 parser.parse('[1, 2]') # => [1, 2]
-parser.parse('[1, 2, 3]') # => Raises `Oj::Safe::ValidationError`.
+parser.parse('[1, 2, 3]') # => Raises `Oj::Safe::ArraySizeError`.
 ```
 
 ##### `max_depth`
@@ -50,7 +50,7 @@ Maximum nesting depth allowed.
 parser = Oj::Safe.new(max_depth: 2)
 
 parser.parse('[[]]') # => [[]]
-parser.parse('[[[]]]]') # => Raises `Oj::Safe::ValidationError`.
+parser.parse('[[[]]]]') # => Raises `Oj::Safe::DepthError`.
 ```
 
 ##### `max_total_elements`
@@ -61,7 +61,7 @@ Maximum total number of parsed elements.
 parser = Oj::Safe.new(max_total_elements: 2)
 
 parser.parse('[true]') # => [true]
-parser.parse('[true, false]') # => Raises `Oj::Safe::ValidationError`.
+parser.parse('[true, false]') # => Raises `Oj::Safe::TotalElementsError`.
 ```
 
 ##### `max_json_size_bytes`
@@ -72,7 +72,7 @@ Maximum size of the input JSON string in bytes.
 parser = Oj::Safe.new(max_json_size_bytes: 2)
 
 parser.parse('12') # => 12
-parser.parse('123') # => Raises `Oj::Safe::ValidationError`.
+parser.parse('123') # => Raises `Oj::Safe::PayloadSizeError`.
 ```
 
 ## Development

data/ext/oj-safe/oj.sym

@@ -1,3 +1,2 @@
 _oj_init_usual
 _oj_parser_new
-_oj_parser_set_option

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.4.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.4.0
 platform: ruby
 authors:
 - Mehmet Emin INAC
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.16.10
+        version: 3.16.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.16.10
+        version: 3.16.16
 description: A JSON parser that enforces configurable limits on input size and structure
   to prevent excessive resource usage.
 email:
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.7
+rubygems_version: 4.0.8
 specification_version: 4
 summary: Safe JSON parser with configurable limits.
 test_files: []