json 2.7.6-java → 2.8.0-java

data/lib/json/{pure → truffle_ruby}/generator.rb

@@ -1,101 +1,105 @@
 # frozen_string_literal: true
 module JSON
-  MAP = {
-    "\x0" => '\u0000',
-    "\x1" => '\u0001',
-    "\x2" => '\u0002',
-    "\x3" => '\u0003',
-    "\x4" => '\u0004',
-    "\x5" => '\u0005',
-    "\x6" => '\u0006',
-    "\x7" => '\u0007',
-    "\b"  =>  '\b',
-    "\t"  =>  '\t',
-    "\n"  =>  '\n',
-    "\xb" => '\u000b',
-    "\f"  =>  '\f',
-    "\r"  =>  '\r',
-    "\xe" => '\u000e',
-    "\xf" => '\u000f',
-    "\x10" => '\u0010',
-    "\x11" => '\u0011',
-    "\x12" => '\u0012',
-    "\x13" => '\u0013',
-    "\x14" => '\u0014',
-    "\x15" => '\u0015',
-    "\x16" => '\u0016',
-    "\x17" => '\u0017',
-    "\x18" => '\u0018',
-    "\x19" => '\u0019',
-    "\x1a" => '\u001a',
-    "\x1b" => '\u001b',
-    "\x1c" => '\u001c',
-    "\x1d" => '\u001d',
-    "\x1e" => '\u001e',
-    "\x1f" => '\u001f',
-    '"'   =>  '\"',
-    '\\'  =>  '\\\\',
-  }.freeze # :nodoc:
-
-  ESCAPE_PATTERN = /[\/"\\\x0-\x1f]/n # :nodoc:
-
-  SCRIPT_SAFE_MAP = MAP.merge(
-    '/'  =>  '\\/',
-    "\u2028".b => '\u2028',
-    "\u2029".b => '\u2029',
-  ).freeze
-
-  SCRIPT_SAFE_ESCAPE_PATTERN = Regexp.union(ESCAPE_PATTERN, "\u2028".b, "\u2029".b)
-
-  # Convert a UTF8 encoded Ruby string _string_ to a JSON string, encoded with
-  # UTF16 big endian characters as \u????, and return it.
-  def utf8_to_json(string, script_safe = false) # :nodoc:
-    string = string.b
-    if script_safe
-      string.gsub!(SCRIPT_SAFE_ESCAPE_PATTERN) { SCRIPT_SAFE_MAP[$&] || $& }
-    else
-      string.gsub!(ESCAPE_PATTERN) { MAP[$&] || $& }
-    end
-    string.force_encoding(::Encoding::UTF_8)
-    string
-  end
+  module TruffleRuby
+    module Generator
+      MAP = {
+        "\x0" => '\u0000',
+        "\x1" => '\u0001',
+        "\x2" => '\u0002',
+        "\x3" => '\u0003',
+        "\x4" => '\u0004',
+        "\x5" => '\u0005',
+        "\x6" => '\u0006',
+        "\x7" => '\u0007',
+        "\b"  =>  '\b',
+        "\t"  =>  '\t',
+        "\n"  =>  '\n',
+        "\xb" => '\u000b',
+        "\f"  =>  '\f',
+        "\r"  =>  '\r',
+        "\xe" => '\u000e',
+        "\xf" => '\u000f',
+        "\x10" => '\u0010',
+        "\x11" => '\u0011',
+        "\x12" => '\u0012',
+        "\x13" => '\u0013',
+        "\x14" => '\u0014',
+        "\x15" => '\u0015',
+        "\x16" => '\u0016',
+        "\x17" => '\u0017',
+        "\x18" => '\u0018',
+        "\x19" => '\u0019',
+        "\x1a" => '\u001a',
+        "\x1b" => '\u001b',
+        "\x1c" => '\u001c',
+        "\x1d" => '\u001d',
+        "\x1e" => '\u001e',
+        "\x1f" => '\u001f',
+        '"'   =>  '\"',
+        '\\'  =>  '\\\\',
+      }.freeze # :nodoc:
+
+      ESCAPE_PATTERN = /[\/"\\\x0-\x1f]/n # :nodoc:
+
+      SCRIPT_SAFE_MAP = MAP.merge(
+        '/'  =>  '\\/',
+        "\u2028".b => '\u2028',
+        "\u2029".b => '\u2029',
+      ).freeze
+
+      SCRIPT_SAFE_ESCAPE_PATTERN = Regexp.union(ESCAPE_PATTERN, "\u2028".b, "\u2029".b)
+
+      # Convert a UTF8 encoded Ruby string _string_ to a JSON string, encoded with
+      # UTF16 big endian characters as \u????, and return it.
+      def utf8_to_json(string, script_safe = false) # :nodoc:
+        string = string.b
+        if script_safe
+          string.gsub!(SCRIPT_SAFE_ESCAPE_PATTERN) { SCRIPT_SAFE_MAP[$&] || $& }
+        else
+          string.gsub!(ESCAPE_PATTERN) { MAP[$&] || $& }
+        end
+        string.force_encoding(::Encoding::UTF_8)
+        string
+      end
 
-  def utf8_to_json_ascii(string, script_safe = false) # :nodoc:
-    string = string.b
-    map = script_safe ? SCRIPT_SAFE_MAP : MAP
-    string.gsub!(/[\/"\\\x0-\x1f]/n) { map[$&] || $& }
-    string.gsub!(/(
-      (?:
-       [\xc2-\xdf][\x80-\xbf]    |
-       [\xe0-\xef][\x80-\xbf]{2} |
-       [\xf0-\xf4][\x80-\xbf]{3}
-      )+ |
-      [\x80-\xc1\xf5-\xff]       # invalid
-    )/nx) { |c|
-      c.size == 1 and raise GeneratorError, "invalid utf8 byte: '#{c}'"
-      s = c.encode(::Encoding::UTF_16BE, ::Encoding::UTF_8).unpack('H*')[0]
-      s.force_encoding(::Encoding::ASCII_8BIT)
-      s.gsub!(/.{4}/n, '\\\\u\&')
-      s.force_encoding(::Encoding::UTF_8)
-    }
-    string.force_encoding(::Encoding::UTF_8)
-    string
-  rescue => e
-    raise GeneratorError.wrap(e)
-  end
+      def utf8_to_json_ascii(string, script_safe = false) # :nodoc:
+        string = string.b
+        map = script_safe ? SCRIPT_SAFE_MAP : MAP
+        string.gsub!(/[\/"\\\x0-\x1f]/n) { map[$&] || $& }
+        string.gsub!(/(
+          (?:
+           [\xc2-\xdf][\x80-\xbf]    |
+           [\xe0-\xef][\x80-\xbf]{2} |
+           [\xf0-\xf4][\x80-\xbf]{3}
+          )+ |
+          [\x80-\xc1\xf5-\xff]       # invalid
+        )/nx) { |c|
+          c.size == 1 and raise GeneratorError, "invalid utf8 byte: '#{c}'"
+          s = c.encode(::Encoding::UTF_16BE, ::Encoding::UTF_8).unpack('H*')[0]
+          s.force_encoding(::Encoding::BINARY)
+          s.gsub!(/.{4}/n, '\\\\u\&')
+          s.force_encoding(::Encoding::UTF_8)
+        }
+        string.force_encoding(::Encoding::UTF_8)
+        string
+      rescue => e
+        raise GeneratorError.wrap(e)
+      end
 
-  def valid_utf8?(string)
-    encoding = string.encoding
-    (encoding == Encoding::UTF_8 || encoding == Encoding::ASCII) &&
-      string.valid_encoding?
-  end
-  module_function :utf8_to_json, :utf8_to_json_ascii, :valid_utf8?
+      def valid_utf8?(string)
+        encoding = string.encoding
+        (encoding == Encoding::UTF_8 || encoding == Encoding::ASCII) &&
+          string.valid_encoding?
+      end
+      module_function :utf8_to_json, :utf8_to_json_ascii, :valid_utf8?
 
-  module Pure
-    module Generator
       # 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)
+        end
+
         # Creates a State object from _opts_, which ought to be Hash to create
         # a new State instance configured by _opts_, something else to create
         # an unconfigured instance. If _opts_ is a State object, it is just
@@ -130,7 +134,7 @@ module JSON
         # * *allow_nan*: true if NaN, Infinity, and -Infinity should be
         #   generated, otherwise an exception is thrown, if these values are
         #   encountered. This options defaults to false.
-        def initialize(opts = {})
+        def initialize(opts = nil)
           @indent                = ''
           @space                 = ''
           @space_before          = ''
@@ -138,10 +142,12 @@ module JSON
           @array_nl              = ''
           @allow_nan             = false
           @ascii_only            = false
-          @script_safe          = false
-          @strict                = false
+          @depth                 = 0
           @buffer_initial_length = 1024
-          configure opts
+          @script_safe           = false
+          @strict                = false
+          @max_nesting           = 100
+          configure(opts) if opts
         end
 
         # This string is used to indent levels in the JSON text.
@@ -294,27 +300,25 @@ module JSON
           else
             result = obj.to_json(self)
           end
-          JSON.valid_utf8?(result) or raise GeneratorError,
+          JSON::TruffleRuby::Generator.valid_utf8?(result) or raise GeneratorError,
             "source sequence #{result.inspect} is illegal/malformed utf-8"
           result
         end
 
         # Handles @allow_nan, @buffer_initial_length, other ivars must be the default value (see above)
         private def generate_json(obj, buf)
-          klass = obj.class
-          if klass == Hash
+          case obj
+          when Hash
             buf << '{'
             first = true
             obj.each_pair do |k,v|
               buf << ',' unless first
 
               key_str = k.to_s
-              if key_str.is_a?(::String)
-                if key_str.class == ::String
-                  fast_serialize_string(key_str, buf)
-                else
-                  generate_json(key_str, buf)
-                end
+              if key_str.class == String
+                fast_serialize_string(key_str, buf)
+              elsif key_str.is_a?(String)
+                generate_json(key_str, buf)
               else
                 raise TypeError, "#{k.class}#to_s returns an instance of #{key_str.class}, expected a String"
               end
@@ -324,7 +328,7 @@ module JSON
               first = false
             end
             buf << '}'
-          elsif klass == Array
+          when Array
             buf << '['
             first = true
             obj.each do |e|
@@ -333,9 +337,13 @@ module JSON
               first = false
             end
             buf << ']'
-          elsif klass == String
-            fast_serialize_string(obj, buf)
-          elsif klass == Integer
+          when String
+            if obj.class == String
+              fast_serialize_string(obj, buf)
+            else
+              buf << obj.to_json(self)
+            end
+          when Integer
             buf << obj.to_s
           else
             # Note: Float is handled this way since Float#to_s is slow anyway
@@ -344,24 +352,23 @@ module JSON
         end
 
         # Assumes !@ascii_only, !@script_safe
-        if Regexp.method_defined?(:match?)
-          private def fast_serialize_string(string, buf) # :nodoc:
-            buf << '"'
-            string = string.encode(::Encoding::UTF_8) unless string.encoding == ::Encoding::UTF_8
-            raise GeneratorError, "source sequence is illegal/malformed utf-8" unless string.valid_encoding?
-
-            if /["\\\x0-\x1f]/n.match?(string)
-              buf << string.gsub(/["\\\x0-\x1f]/n, MAP)
-            else
-              buf << string
+        private def fast_serialize_string(string, buf) # :nodoc:
+          buf << '"'
+          unless string.encoding == ::Encoding::UTF_8
+            begin
+              string = string.encode(::Encoding::UTF_8)
+            rescue Encoding::UndefinedConversionError => error
+              raise GeneratorError, error.message
             end
-            buf << '"'
           end
-        else
-          # Ruby 2.3 compatibility
-          private def fast_serialize_string(string, buf) # :nodoc:
-            buf << string.to_json(self)
+          raise GeneratorError, "source sequence is illegal/malformed utf-8" unless string.valid_encoding?
+
+          if /["\\\x0-\x1f]/n.match?(string)
+            buf << string.gsub(/["\\\x0-\x1f]/n, MAP)
+          else
+            buf << string
           end
+          buf << '"'
         end
 
         # Return the value returned by method +name+.
@@ -417,9 +424,15 @@ module JSON
           end
 
           def json_transform(state)
+            depth = state.depth += 1
+
+            if empty?
+              state.depth -= 1
+              return '{}'
+            end
+
             delim = ",#{state.object_nl}"
             result = +"{#{state.object_nl}"
-            depth = state.depth += 1
             first = true
             indent = !state.object_nl.empty?
             each { |key, value|
@@ -427,8 +440,8 @@ module JSON
               result << state.indent * depth if indent
 
               key_str = key.to_s
-              key_json = if key_str.is_a?(::String)
-                key_str = key_str.to_json(state)
+              if key_str.is_a?(String)
+                key_json = key_str.to_json(state)
               else
                 raise TypeError, "#{key.class}#to_s returns an instance of #{key_str.class}, expected a String"
               end
@@ -467,6 +480,13 @@ module JSON
           private
 
           def json_transform(state)
+            depth = state.depth += 1
+
+            if empty?
+              state.depth -= 1
+              return '[]'
+            end
+
             result = '['.dup
             if state.array_nl.empty?
               delim = ","
@@ -474,7 +494,7 @@ module JSON
               result << state.array_nl
               delim = ",#{state.array_nl}"
             end
-            depth = state.depth += 1
+
             first = true
             indent = !state.array_nl.empty?
             each { |value|
@@ -539,10 +559,12 @@ module JSON
               string = encode(::Encoding::UTF_8)
             end
             if state.ascii_only?
-              %("#{JSON.utf8_to_json_ascii(string, state.script_safe)}")
+              %("#{JSON::TruffleRuby::Generator.utf8_to_json_ascii(string, state.script_safe)}")
             else
-              %("#{JSON.utf8_to_json(string, state.script_safe)}")
+              %("#{JSON::TruffleRuby::Generator.utf8_to_json(string, state.script_safe)}")
             end
+          rescue Encoding::UndefinedConversionError => error
+            raise ::JSON::GeneratorError, error.message
           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.7.6'
+  VERSION = '2.8.0'
 end

data/lib/json.rb

@@ -378,13 +378,13 @@ require 'json/common'
 #   json1 = JSON.generate(ruby)
 #   ruby1 = JSON.parse(json1, create_additions: true)
 #   # Make a nice display.
-#   display = <<EOT
-#   Generated JSON:
-#     Without addition:  #{json0} (#{json0.class})
-#     With addition:     #{json1} (#{json1.class})
-#   Parsed JSON:
-#     Without addition:  #{ruby0.inspect} (#{ruby0.class})
-#     With addition:     #{ruby1.inspect} (#{ruby1.class})
+#   display = <<~EOT
+#     Generated JSON:
+#       Without addition:  #{json0} (#{json0.class})
+#       With addition:     #{json1} (#{json1.class})
+#     Parsed JSON:
+#       Without addition:  #{ruby0.inspect} (#{ruby0.class})
+#       With addition:     #{ruby1.inspect} (#{ruby1.class})
 #   EOT
 #   puts display
 #
@@ -562,13 +562,13 @@ require 'json/common'
 #   json1 = JSON.generate(foo1)
 #   obj1 = JSON.parse(json1, create_additions: true)
 #   #   Make a nice display.
-#   display = <<EOT
-#   Generated JSON:
-#     Without custom addition:  #{json0} (#{json0.class})
-#     With custom addition:     #{json1} (#{json1.class})
-#   Parsed JSON:
-#     Without custom addition:  #{obj0.inspect} (#{obj0.class})
-#     With custom addition:     #{obj1.inspect} (#{obj1.class})
+#   display = <<~EOT
+#     Generated JSON:
+#       Without custom addition:  #{json0} (#{json0.class})
+#       With custom addition:     #{json1} (#{json1.class})
+#     Parsed JSON:
+#       Without custom addition:  #{obj0.inspect} (#{obj0.class})
+#       With custom addition:     #{obj1.inspect} (#{obj1.class})
 #   EOT
 #   puts display
 #
@@ -583,10 +583,5 @@ require 'json/common'
 #
 module JSON
   require 'json/version'
-
-  begin
-    require 'json/ext'
-  rescue LoadError
-    require 'json/pure'
-  end
+  require 'json/ext'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json
 version: !ruby/object:Gem::Version
-  version: 2.7.6
+  version: 2.8.0
 platform: java
 authors:
 - Daniel Luz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-04 00:00:00.000000000 Z
+date: 2024-11-06 00:00:00.000000000 Z
 dependencies: []
 description: A JSON implementation as a JRuby extension.
 email: dev+ruby@mernen.com
@@ -42,9 +42,7 @@ files:
 - lib/json/ext.rb
 - lib/json/ext/generator/state.rb
 - lib/json/generic_object.rb
-- lib/json/pure.rb
-- lib/json/pure/generator.rb
-- lib/json/pure/parser.rb
+- lib/json/truffle_ruby/generator.rb
 - lib/json/version.rb
 homepage: https://ruby.github.io/json
 licenses:
@@ -68,7 +66,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="