json 2.21.2 → 3.0.2

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

@@ -71,33 +71,6 @@ module JSON
         end
 
         alias_method :to_hash, :to_h
-
-        # call-seq: [](name)
-        #
-        # Returns the value returned by method +name+.
-        def [](name)
-          ::JSON.deprecation_warning("JSON::State#[] is deprecated and will be removed in json 3.0.0")
-
-          if respond_to?(name)
-            __send__(name)
-          else
-            instance_variable_get("@#{name}") if
-              instance_variables.include?("@#{name}".to_sym) # avoid warning
-          end
-        end
-
-        # call-seq: []=(name, value)
-        #
-        # Sets the attribute name to value.
-        def []=(name, value)
-          ::JSON.deprecation_warning("JSON::State#[]= is deprecated and will be removed in json 3.0.0")
-
-          if respond_to?(name_writer = "#{name}=")
-            __send__ name_writer, value
-          else
-            instance_variable_set "@#{name}", value
-          end
-        end
       end
     end
   end

data/lib/json/ext.rb

@@ -66,6 +66,4 @@ module JSON
       end
     end
   end
-
-  JSON_LOADED = true unless defined?(JSON::JSON_LOADED)
 end

data/lib/json/truffle_ruby/generator.rb

@@ -167,7 +167,8 @@ module JSON
           @strict                = false
           @max_nesting           = 100
           @sort_keys             = false
-          configure(opts) if opts
+          @allow_duplicate_key   = false
+          _configure(**opts) if opts
         end
 
         # This string is used to indent levels in the JSON text.
@@ -289,65 +290,48 @@ module JSON
 
         # Configure this State instance with the Hash _opts_, and return
         # itself.
-        def configure(opts)
-          if opts.respond_to?(:to_hash)
-            opts = opts.to_hash
-          elsif opts.respond_to?(:to_h)
-            opts = opts.to_h
-          else
-            raise TypeError, "can't convert #{opts.class} into Hash"
-          end
-
-          if opts[:depth]&.negative?
-            raise ArgumentError, "depth must be >= 0 (got #{opts[:depth]})"
-          end
-
-          opts.each do |key, value|
-            instance_variable_set "@#{key}", value
+        def configure(options)
+          unless Hash == options
+            if options.respond_to?(:to_hash)
+              options = options.to_hash
+            elsif options.respond_to?(:to_h)
+              options = options.to_h
+            end
           end
+          _configure(**options)
+        end
+        alias merge configure
 
-          # 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)
-          @as_json               = opts[:as_json].to_proc     if opts[:as_json]
-          @ascii_only            = opts[:ascii_only]          if opts.key?(:ascii_only)
-          self.sort_keys         = opts[:sort_keys]           if opts.key?(:sort_keys)
-          @depth                 = opts[:depth] || 0
-          @buffer_initial_length ||= opts[:buffer_initial_length]
-
-          @script_safe = if opts.key?(:script_safe)
-            !!opts[:script_safe]
-          elsif opts.key?(:escape_slash)
-            !!opts[:escape_slash]
-          else
-            false
+        private def _configure(
+          indent: '', space: '', space_before: '', object_nl: '', array_nl: '', allow_nan: false,
+          as_json: false, ascii_only: false, sort_keys: false, depth: 0, buffer_initial_length: 1024,
+          allow_duplicate_key: false, script_safe: false, strict: false, max_nesting: 100
+        )
+          if depth.negative?
+            raise ArgumentError, "depth must be >= 0 (got #{depth})"
           end
 
-          if opts.key?(:allow_duplicate_key)
-            @allow_duplicate_key = !!opts[:allow_duplicate_key]
-          else
-            @allow_duplicate_key = nil # nil is deprecation
+          if max_nesting && !(Integer === max_nesting)
+            raise TypeError, ":max_nesting must be `false` or an Integer, got: #{max_nesting.class}"
           end
 
-          @strict                = !!opts[:strict] if opts.key?(:strict)
-
-          if !opts.key?(:max_nesting) # defaults to 100
-            @max_nesting = 100
-          elsif opts[:max_nesting]
-            unless opts[:max_nesting].is_a?(Integer)
-              raise TypeError, ":max_nesting must be an Integer, got: #{opts[:max_nesting].class}"
-            end
-            @max_nesting = opts[:max_nesting]
-          else
-            @max_nesting = 0
-          end
+          @indent = indent || ''
+          @space = space || ''
+          @space_before = space_before || ''
+          @object_nl = object_nl || ''
+          @array_nl = array_nl || ''
+          @allow_nan = allow_nan || false
+          @as_json = as_json || false
+          @ascii_only = ascii_only || false
+          self.sort_keys = sort_keys
+          @depth = depth
+          @buffer_initial_length = buffer_initial_length
+          @allow_duplicate_key = allow_duplicate_key
+          @script_safe = script_safe
+          @strict = strict
+          @max_nesting = max_nesting || 0
           self
         end
-        alias merge configure
 
         def allow_duplicate_key? # :nodoc:
           @allow_duplicate_key
@@ -362,10 +346,6 @@ module JSON
             result[key.to_sym] = instance_variable_get(iv)
           end
 
-          if result[:allow_duplicate_key].nil?
-            result.delete(:allow_duplicate_key)
-          end
-
           result
         end
 
@@ -416,7 +396,7 @@ module JSON
               else
                 if key_type && !@allow_duplicate_key && key_type != k.class
                   key_type = nil # stop checking
-                  JSON.send(:on_mixed_keys_hash, obj, !@allow_duplicate_key.nil?)
+                  JSON.send(:on_mixed_keys_hash, obj)
                 end
                 buf << ','
               end
@@ -483,28 +463,6 @@ module JSON
           end
           buf << '"'
         end
-
-        # Return the value returned by method +name+.
-        def [](name)
-          ::JSON.deprecation_warning("JSON::State#[] is deprecated and will be removed in json 3.0.0")
-
-          if respond_to?(name)
-            __send__(name)
-          else
-            instance_variable_get("@#{name}") if
-              instance_variables.include?("@#{name}".to_sym) # avoid warning
-          end
-        end
-
-        def []=(name, value)
-          ::JSON.deprecation_warning("JSON::State#[]= is deprecated and will be removed in json 3.0.0")
-
-          if respond_to?(name_writer = "#{name}=")
-            __send__ name_writer, value
-          else
-            instance_variable_set "@#{name}", value
-          end
-        end
       end
 
       module GeneratorMethods
@@ -569,7 +527,7 @@ module JSON
               else
                 if key_type && !state.allow_duplicate_key? && key_type != key.class
                   key_type = nil # stop checking
-                  JSON.send(:on_mixed_keys_hash, self, state.allow_duplicate_key? == false)
+                  JSON.send(:on_mixed_keys_hash, self)
                 end
                 result << delim
               end

data/lib/json/version.rb

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