json 2.8.2 → 2.9.0

data/ext/json/ext/parser/parser.rl

@@ -26,19 +26,6 @@ static const char deprecated_create_additions_warning[] =
     "and will be removed in 3.0, use JSON.unsafe_load or explicitly "
     "pass `create_additions: true`";
 
-#ifndef HAVE_RB_GC_MARK_LOCATIONS
-// For TruffleRuby
-void rb_gc_mark_locations(const VALUE *start, const VALUE *end)
-{
-    VALUE *value = start;
-
-    while (value < end) {
-        rb_gc_mark(*value);
-        value++;
-    }
-}
-#endif
-
 #ifndef HAVE_RB_HASH_BULK_INSERT
 // For TruffleRuby
 void rb_hash_bulk_insert(long count, const VALUE *pairs, VALUE hash)
@@ -264,7 +251,10 @@ static inline void rvalue_stack_pop(rvalue_stack *stack, long count)
 static void rvalue_stack_mark(void *ptr)
 {
     rvalue_stack *stack = (rvalue_stack *)ptr;
-    rb_gc_mark_locations(stack->ptr, stack->ptr + stack->head);
+    long index;
+    for (index = 0; index < stack->head; index++) {
+        rb_gc_mark(stack->ptr[index]);
+    }
 }
 
 static void rvalue_stack_free(void *ptr)
@@ -1349,8 +1339,10 @@ static void JSON_mark(void *ptr)
     rb_gc_mark(json->match_string);
     rb_gc_mark(json->stack_handle);
 
-    const VALUE *name_cache_entries = &json->name_cache.entries[0];
-    rb_gc_mark_locations(name_cache_entries, name_cache_entries + json->name_cache.length);
+    long index;
+    for (index = 0; index < json->name_cache.length; index++) {
+        rb_gc_mark(json->name_cache.entries[index]);
+    }
 }
 
 static void JSON_free(void *ptr)

data/lib/json/common.rb

@@ -143,7 +143,23 @@ module JSON
   # :startdoc:
 
   # This exception is raised if a generator or unparser error occurs.
-  class GeneratorError < JSONError; end
+  class GeneratorError < JSONError
+    attr_reader :invalid_object
+
+    def initialize(message, invalid_object = nil)
+      super(message)
+      @invalid_object = invalid_object
+    end
+
+    def detailed_message(...)
+      if @invalid_object.nil?
+        super
+      else
+        "#{super}\nInvalid object: #{@invalid_object.inspect}"
+      end
+    end
+  end
+
   # For backwards compatibility
   UnparserError = GeneratorError # :nodoc:
 
@@ -286,7 +302,7 @@ module JSON
     if State === opts
       opts.generate(obj)
     else
-      State.generate(obj, opts)
+      State.generate(obj, opts, nil)
     end
   end
 
@@ -411,6 +427,10 @@ module JSON
   #
   # Returns the Ruby objects created by parsing the given +source+.
   #
+  # BEWARE: This method is meant to serialise data from trusted user input,
+  # like from your own database server or clients under your control, it could
+  # be dangerous to allow untrusted users to pass JSON sources into it.
+  #
   # - Argument +source+ must be, or be convertible to, a \String:
   #   - If +source+ responds to instance method +to_str+,
   #     <tt>source.to_str</tt> becomes the source.
@@ -425,9 +445,6 @@ module JSON
   # - Argument +proc+, if given, must be a \Proc that accepts one argument.
   #   It will be called recursively with each result (depth-first order).
   #   See details below.
-  #   BEWARE: This method is meant to serialise data from trusted user input,
-  #   like from your own database server or clients under your control, it could
-  #   be dangerous to allow untrusted users to pass JSON sources into it.
   # - Argument +opts+, if given, contains a \Hash of options for the parsing.
   #   See {Parsing Options}[#module-JSON-label-Parsing+Options].
   #   The default options can be changed via method JSON.unsafe_load_default_options=.
@@ -564,6 +581,16 @@ module JSON
   #
   # Returns the Ruby objects created by parsing the given +source+.
   #
+  # BEWARE: This method is meant to serialise data from trusted user input,
+  # like from your own database server or clients under your control, it could
+  # be dangerous to allow untrusted users to pass JSON sources into it.
+  # If you must use it, use JSON.unsafe_load instead to make it clear.
+  #
+  # Since JSON version 2.8.0, `load` emits a deprecation warning when a
+  # non native type is deserialized, without `create_additions` being explicitly
+  # enabled, and in JSON version 3.0, `load` will have `create_additions` disabled
+  # by default.
+  #
   # - Argument +source+ must be, or be convertible to, a \String:
   #   - If +source+ responds to instance method +to_str+,
   #     <tt>source.to_str</tt> becomes the source.
@@ -578,10 +605,6 @@ module JSON
   # - Argument +proc+, if given, must be a \Proc that accepts one argument.
   #   It will be called recursively with each result (depth-first order).
   #   See details below.
-  #   BEWARE: This method is meant to serialise data from trusted user input,
-  #   like from your own database server or clients under your control, it could
-  #   be dangerous to allow untrusted users to pass JSON sources into it.
-  #   If you must use it, use JSON.unsafe_load instead to make it clear.
   # - Argument +opts+, if given, contains a \Hash of options for the parsing.
   #   See {Parsing Options}[#module-JSON-label-Parsing+Options].
   #   The default options can be changed via method JSON.load_default_options=.
@@ -794,18 +817,15 @@ module JSON
     opts = opts.merge(:max_nesting => limit) if limit
     opts = merge_dump_options(opts, **kwargs) if kwargs
 
-    result = begin
-      generate(obj, opts)
+    begin
+      if State === opts
+        opts.generate(obj, anIO)
+      else
+        State.generate(obj, opts, anIO)
+      end
     rescue JSON::NestingError
       raise ArgumentError, "exceed depth limit"
     end
-
-    if anIO.nil?
-      result
-    else
-      anIO.write result
-      anIO
-    end
   end
 
   # Encodes string using String.encode.

data/lib/json/ext/generator/state.rb

@@ -47,6 +47,17 @@ module JSON
 
         alias_method :merge, :configure
 
+        # call-seq:
+        #   generate(obj) -> String
+        #   generate(obj, anIO) -> anIO
+        #
+        # Generates a valid JSON document from object +obj+ and returns the
+        # result. If no valid JSON document can be created this method raises a
+        # GeneratorError exception.
+        def generate(obj, io = nil)
+          _generate(obj, io)
+        end
+
         # call-seq: to_h
         #
         # Returns the configuration instance variables as a hash, that can be

data/lib/json/truffle_ruby/generator.rb

@@ -62,8 +62,8 @@ module JSON
         string
       end
 
-      def utf8_to_json_ascii(string, script_safe = false) # :nodoc:
-        string = string.b
+      def utf8_to_json_ascii(original_string, script_safe = false) # :nodoc:
+        string = original_string.b
         map = script_safe ? SCRIPT_SAFE_MAP : MAP
         string.gsub!(/[\/"\\\x0-\x1f]/n) { map[$&] || $& }
         string.gsub!(/(
@@ -74,7 +74,7 @@ module JSON
           )+ |
           [\x80-\xc1\xf5-\xff]       # invalid
         )/nx) { |c|
-          c.size == 1 and raise GeneratorError, "invalid utf8 byte: '#{c}'"
+          c.size == 1 and raise GeneratorError.new("invalid utf8 byte: '#{c}'", original_string)
           s = c.encode(::Encoding::UTF_16BE, ::Encoding::UTF_8).unpack('H*')[0]
           s.force_encoding(::Encoding::BINARY)
           s.gsub!(/.{4}/n, '\\\\u\&')
@@ -83,7 +83,7 @@ module JSON
         string.force_encoding(::Encoding::UTF_8)
         string
       rescue => e
-        raise GeneratorError.wrap(e)
+        raise GeneratorError.new(e.message, original_string)
       end
 
       def valid_utf8?(string)
@@ -96,8 +96,14 @@ module JSON
       # This class is used to create State instances, that are use to hold data
       # while generating a JSON text from a Ruby data structure.
       class State
-        def self.generate(obj, opts = nil)
-          new(opts).generate(obj)
+        def self.generate(obj, opts = nil, io = nil)
+          string = new(opts).generate(obj)
+          if io
+            io.write(string)
+            io
+          else
+            string
+          end
         end
 
         # Creates a State object from _opts_, which ought to be Hash to create
@@ -300,8 +306,10 @@ module JSON
           else
             result = obj.to_json(self)
           end
-          JSON::TruffleRuby::Generator.valid_utf8?(result) or raise GeneratorError,
-            "source sequence #{result.inspect} is illegal/malformed utf-8"
+          JSON::TruffleRuby::Generator.valid_utf8?(result) or raise GeneratorError.new(
+            "source sequence #{result.inspect} is illegal/malformed utf-8",
+            obj
+          )
           result
         end
 
@@ -358,10 +366,10 @@ module JSON
             begin
               string = string.encode(::Encoding::UTF_8)
             rescue Encoding::UndefinedConversionError => error
-              raise GeneratorError, error.message
+              raise GeneratorError.new(error.message, string)
             end
           end
-          raise GeneratorError, "source sequence is illegal/malformed utf-8" unless string.valid_encoding?
+          raise GeneratorError.new("source sequence is illegal/malformed utf-8", string) unless string.valid_encoding?
 
           if /["\\\x0-\x1f]/n.match?(string)
             buf << string.gsub(/["\\\x0-\x1f]/n, MAP)
@@ -397,7 +405,7 @@ module JSON
           # special method #to_json was defined for some object.
           def to_json(state = nil, *)
             if state && State.from_state(state).strict?
-              raise GeneratorError, "#{self.class} not allowed in JSON"
+              raise GeneratorError.new("#{self.class} not allowed in JSON", self)
             else
               to_s.to_json
             end
@@ -448,7 +456,7 @@ module JSON
 
               result = +"#{result}#{key_json}#{state.space_before}:#{state.space}"
               if state.strict? && !(false == value || true == value || nil == value || String === value || Array === value || Hash === value || Integer === value || Float === value)
-                raise GeneratorError, "#{value.class} not allowed in JSON"
+                raise GeneratorError.new("#{value.class} not allowed in JSON", value)
               elsif value.respond_to?(:to_json)
                 result << value.to_json(state)
               else
@@ -501,7 +509,7 @@ module JSON
               result << delim unless first
               result << state.indent * depth if indent
               if state.strict? && !(false == value || true == value || nil == value || String === value || Array === value || Hash === value || Integer === value || Float === value)
-                raise GeneratorError, "#{value.class} not allowed in JSON"
+                raise GeneratorError.new("#{value.class} not allowed in JSON", value)
               elsif value.respond_to?(:to_json)
                 result << value.to_json(state)
               else
@@ -530,13 +538,13 @@ module JSON
               if state.allow_nan?
                 to_s
               else
-                raise GeneratorError, "#{self} not allowed in JSON"
+                raise GeneratorError.new("#{self} not allowed in JSON", self)
               end
             when nan?
               if state.allow_nan?
                 to_s
               else
-                raise GeneratorError, "#{self} not allowed in JSON"
+                raise GeneratorError.new("#{self} not allowed in JSON", self)
               end
             else
               to_s
@@ -552,7 +560,7 @@ module JSON
             state = State.from_state(state)
             if encoding == ::Encoding::UTF_8
               unless valid_encoding?
-                raise GeneratorError, "source sequence is illegal/malformed utf-8"
+                raise GeneratorError.new("source sequence is illegal/malformed utf-8", self)
               end
               string = self
             else
@@ -564,7 +572,7 @@ module JSON
               %("#{JSON::TruffleRuby::Generator.utf8_to_json(string, state.script_safe)}")
             end
           rescue Encoding::UndefinedConversionError => error
-            raise ::JSON::GeneratorError, error.message
+            raise ::JSON::GeneratorError.new(error.message, self)
           end
 
           # Module that holds the extending methods if, the String module is

data/lib/json/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JSON
-  VERSION = '2.8.2'
+  VERSION = '2.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.9.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-14 00:00:00.000000000 Z
+date: 2024-12-03 00:00:00.000000000 Z
 dependencies: []
 description: This is a JSON implementation as a Ruby extension in C.
 email: flori@ping.de