json_pure 2.7.4 → 2.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '088e992126b90dfedd6384a72ef625d2ba88fc512d53c456d6dace2e47113f74'
-  data.tar.gz: 56f1c68c346faea122ebfd5883ee23231d773a395ffa12a73992fe7e848ae4f6
+  metadata.gz: dc10fe68c32c66130244c95986e80f41d17b72ed2d8311fde09c1d82dd8fa154
+  data.tar.gz: 3a9cd865c6b542d9ae199bac464d96d4f0116aee65eb35f7b4acfa1ab97a4f83
 SHA512:
-  metadata.gz: 0fd7d0ff4b86c5be76e3556b5568ec03eb4dd33f07349945b13ed91fd46766c24cb0251d9abc821519ae2a5e99659e90ce67cda3749564a09a53779acd2478c1
-  data.tar.gz: 814eb2de2b847e014cac1115b8c41c40267d13f377afedcaa28443aa08c3dbf3f8b965167e53c360d8061743fb6a95999a3f8b2aea87b5b0d041055c8e23bc99
+  metadata.gz: 87ba58d3641b73445fc3b07ba70197b05efd2e319410530c946c8b3733c7ff2b5b3c8db61e482d3c3c52930d544d7637ee442a53670796b7cb7b5dbb9ecea0c0
+  data.tar.gz: 2f35def657dcae3cbbe4593f25513c4340bfbbc1b2ec7b7accec7914007893abf333e2aed047a92cdd24f13d85d03622518f07bad8cbf61caef17c0211235239

data/CHANGES.md

@@ -1,5 +1,15 @@
 # Changes
 
+### 2024-11-04 (2.7.6)
+
+* Fix a regression in JSON.generate when dealing with Hash keys that are string subclasses, call `to_json` on them.
+
+### 2024-10-25 (2.7.5)
+
+* Fix a memory leak when `#to_json` methods raise an exception.
+* Gracefully handle formatting configs being set to `nil` instead of `""`.
+* Workaround another issue caused by conflicting versions of both `json_pure` and `json` being loaded.
+
 ### 2024-10-25 (2.7.4)
 
 * Workaround a bug in 3.4.8 and older https://github.com/rubygems/rubygems/pull/6490.

data/lib/json/common.rb

@@ -219,7 +219,12 @@ module JSON
     if opts.nil?
       Parser.new(source).parse
     else
-      Parser.new(source, opts).parse
+      # NB: The ** shouldn't be required, but we have to deal with
+      # different versions of the `json` and `json_pure` gems being
+      # loaded concurrently.
+      # Prior to 2.7.3, `JSON::Ext::Parser` would only take kwargs.
+      # Ref: https://github.com/ruby/json/issues/650
+      Parser.new(source, **opts).parse
     end
   end
 

data/lib/json/pure/generator.rb

@@ -239,13 +239,13 @@ module JSON
           end
 
           # NOTE: If adding new instance variables here, check whether #generate should check them for #generate_json
-          @indent                = opts[:indent] if opts.key?(:indent)
-          @space                 = opts[:space] if opts.key?(:space)
-          @space_before          = opts[:space_before] if opts.key?(:space_before)
-          @object_nl             = opts[:object_nl] if opts.key?(:object_nl)
-          @array_nl              = opts[:array_nl] if opts.key?(:array_nl)
-          @allow_nan             = !!opts[:allow_nan] if opts.key?(:allow_nan)
-          @ascii_only            = opts[:ascii_only] if opts.key?(:ascii_only)
+          @indent                = opts[:indent]        || '' if opts.key?(:indent)
+          @space                 = opts[:space]         || '' if opts.key?(:space)
+          @space_before          = opts[:space_before]  || '' if opts.key?(:space_before)
+          @object_nl             = opts[:object_nl]     || '' if opts.key?(:object_nl)
+          @array_nl              = opts[:array_nl]      || '' if opts.key?(:array_nl)
+          @allow_nan             = !!opts[:allow_nan]         if opts.key?(:allow_nan)
+          @ascii_only            = opts[:ascii_only]          if opts.key?(:ascii_only)
           @depth                 = opts[:depth] || 0
           @buffer_initial_length ||= opts[:buffer_initial_length]
 
@@ -301,19 +301,30 @@ module JSON
 
         # Handles @allow_nan, @buffer_initial_length, other ivars must be the default value (see above)
         private def generate_json(obj, buf)
-          case obj
-          when Hash
+          klass = obj.class
+          if klass == Hash
             buf << '{'
             first = true
             obj.each_pair do |k,v|
               buf << ',' unless first
-              fast_serialize_string(k.to_s, buf)
+
+              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
+              else
+                raise TypeError, "#{k.class}#to_s returns an instance of #{key_str.class}, expected a String"
+              end
+
               buf << ':'
               generate_json(v, buf)
               first = false
             end
             buf << '}'
-          when Array
+          elsif klass == Array
             buf << '['
             first = true
             obj.each do |e|
@@ -322,9 +333,9 @@ module JSON
               first = false
             end
             buf << ']'
-          when String
+          elsif klass == String
             fast_serialize_string(obj, buf)
-          when Integer
+          elsif klass == Integer
             buf << obj.to_s
           else
             # Note: Float is handled this way since Float#to_s is slow anyway
@@ -414,7 +425,15 @@ module JSON
             each { |key, value|
               result << delim unless first
               result << state.indent * depth if indent
-              result = +"#{result}#{key.to_s.to_json(state)}#{state.space_before}:#{state.space}"
+
+              key_str = key.to_s
+              key_json = if key_str.is_a?(::String)
+                key_str = key_str.to_json(state)
+              else
+                raise TypeError, "#{key.class}#to_s returns an instance of #{key_str.class}, expected a String"
+              end
+
+              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"
               elsif value.respond_to?(:to_json)

data/lib/json/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_pure
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.7.6
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-25 00:00:00.000000000 Z
+date: 2024-11-04 00:00:00.000000000 Z
 dependencies: []
 description: This is a JSON implementation in pure Ruby.
 email: flori@ping.de