json 1.8.2 → 2.3.1

data/lib/json/ext.rb

@@ -1,9 +1,3 @@
-if ENV['SIMPLECOV_COVERAGE'].to_i == 1
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter "/tests/"
-  end
-end
 require 'json/common'
 
 module JSON

data/lib/json/generic_object.rb

@@ -1,3 +1,4 @@
+#frozen_string_literal: false
 require 'ostruct'
 
 module JSON
@@ -48,12 +49,12 @@ module JSON
     end
 
     def [](name)
-      table[name.to_sym]
-    end
+      __send__(name)
+    end unless method_defined?(:[])
 
     def []=(name, value)
-      __send__ "#{name}=", value
-    end
+      __send__("#{name}=", value)
+    end unless method_defined?(:[]=)
 
     def |(other)
       self.class[other.to_hash.merge(to_hash)]

data/lib/json/pure.rb

@@ -1,17 +1,11 @@
-if ENV['SIMPLECOV_COVERAGE'].to_i == 1
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter "/tests/"
-  end
-end
 require 'json/common'
-require 'json/pure/parser'
-require 'json/pure/generator'
 
 module JSON
   # This module holds all the modules/classes that implement JSON's
   # functionality in pure ruby.
   module Pure
+    require 'json/pure/parser'
+    require 'json/pure/generator'
     $DEBUG and warn "Using Pure library for JSON."
     JSON.parser = Parser
     JSON.generator = Generator

data/lib/json/pure/generator.rb

@@ -1,3 +1,4 @@
+#frozen_string_literal: false
 module JSON
   MAP = {
     "\x0" => '\u0000',
@@ -38,85 +39,45 @@ module JSON
 
   # Convert a UTF8 encoded Ruby string _string_ to a JSON string, encoded with
   # UTF16 big endian characters as \u????, and return it.
-  if defined?(::Encoding)
-    def utf8_to_json(string) # :nodoc:
-      string = string.dup
-      string.force_encoding(::Encoding::ASCII_8BIT)
-      string.gsub!(/["\\\x0-\x1f]/) { MAP[$&] }
-      string.force_encoding(::Encoding::UTF_8)
-      string
-    end
-
-    def utf8_to_json_ascii(string) # :nodoc:
-      string = string.dup
-      string.force_encoding(::Encoding::ASCII_8BIT)
-      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 = JSON.iconv('utf-16be', 'utf-8', c).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 valid_utf8?(string)
-      encoding = string.encoding
-      (encoding == Encoding::UTF_8 || encoding == Encoding::ASCII) &&
-        string.valid_encoding?
-    end
-    module_function :valid_utf8?
-  else
-    def utf8_to_json(string) # :nodoc:
-      string.gsub(/["\\\x0-\x1f]/n) { MAP[$&] }
-    end
+  def utf8_to_json(string) # :nodoc:
+    string = string.dup
+    string.force_encoding(::Encoding::ASCII_8BIT)
+    string.gsub!(/["\\\x0-\x1f]/) { MAP[$&] }
+    string.force_encoding(::Encoding::UTF_8)
+    string
+  end
 
-    def utf8_to_json_ascii(string) # :nodoc:
-      string = string.gsub(/["\\\x0-\x1f]/) { 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 = JSON.iconv('utf-16be', 'utf-8', c).unpack('H*')[0]
-        s.gsub!(/.{4}/n, '\\\\u\&')
-      }
-      string
-    rescue => e
-      raise GeneratorError.wrap(e)
-    end
+  def utf8_to_json_ascii(string) # :nodoc:
+    string = string.dup
+    string.force_encoding(::Encoding::ASCII_8BIT)
+    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 = JSON.iconv('utf-16be', 'utf-8', c).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 valid_utf8?(string)
-      string =~
-         /\A( [\x09\x0a\x0d\x20-\x7e]         # ASCII
-         | [\xc2-\xdf][\x80-\xbf]             # non-overlong 2-byte
-         |  \xe0[\xa0-\xbf][\x80-\xbf]        # excluding overlongs
-         | [\xe1-\xec\xee\xef][\x80-\xbf]{2}  # straight 3-byte
-         |  \xed[\x80-\x9f][\x80-\xbf]        # excluding surrogates
-         |  \xf0[\x90-\xbf][\x80-\xbf]{2}     # planes 1-3
-         | [\xf1-\xf3][\x80-\xbf]{3}          # planes 4-15
-         |  \xf4[\x80-\x8f][\x80-\xbf]{2}     # plane 16
-        )*\z/nx
-    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?
 
-
   module Pure
     module Generator
       # This class is used to create State instances, that are use to hold data
@@ -154,8 +115,6 @@ 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.
-        # * *quirks_mode*: Enables quirks_mode for parser, that is for example
-        #   generating single JSON values instead of documents is possible.
         def initialize(opts = {})
           @indent                = ''
           @space                 = ''
@@ -164,7 +123,6 @@ module JSON
           @array_nl              = ''
           @allow_nan             = false
           @ascii_only            = false
-          @quirks_mode           = false
           @buffer_initial_length = 1024
           configure opts
         end
@@ -190,10 +148,6 @@ module JSON
         # the generated JSON, max_nesting = 0 if no maximum is checked.
         attr_accessor :max_nesting
 
-        # If this attribute is set to true, quirks mode is enabled, otherwise
-        # it's disabled.
-        attr_accessor :quirks_mode
-
         # :stopdoc:
         attr_reader :buffer_initial_length
 
@@ -233,11 +187,6 @@ module JSON
           @ascii_only
         end
 
-        # Returns true, if quirks mode is enabled. Otherwise returns false.
-        def quirks_mode?
-          @quirks_mode
-        end
-
         # Configure this State instance with the Hash _opts_, and return
         # itself.
         def configure(opts)
@@ -259,7 +208,6 @@ module JSON
           @allow_nan             = !!opts[:allow_nan] if opts.key?(:allow_nan)
           @ascii_only            = opts[:ascii_only] if opts.key?(:ascii_only)
           @depth                 = opts[:depth] || 0
-          @quirks_mode           = opts[:quirks_mode] if opts.key?(:quirks_mode)
           @buffer_initial_length ||= opts[:buffer_initial_length]
 
           if !opts.key?(:max_nesting) # defaults to 100
@@ -286,20 +234,14 @@ module JSON
 
         alias to_hash to_h
 
-        # Generates a valid JSON document from object +obj+ and returns the
-        # result. If no valid JSON document can be created this method raises a
+        # 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)
           result = obj.to_json(self)
           JSON.valid_utf8?(result) or raise GeneratorError,
             "source sequence #{result.inspect} is illegal/malformed utf-8"
-          unless @quirks_mode
-            unless result =~ /\A\s*\[/ && result =~ /\]\s*\Z/ ||
-              result =~ /\A\s*\{/ && result =~ /\}\s*\Z/
-            then
-              raise GeneratorError, "only generation of JSON objects or arrays allowed"
-            end
-          end
           result
         end
 
@@ -308,7 +250,8 @@ module JSON
           if respond_to?(name)
             __send__(name)
           else
-            instance_variable_get("@#{name}")
+            instance_variable_get("@#{name}") if
+              instance_variables.include?("@#{name}".to_sym) # avoid warning
           end
         end
 
@@ -363,7 +306,11 @@ module JSON
               result << state.space_before
               result << ':'
               result << state.space
-              result << value.to_json(state)
+              if value.respond_to?(:to_json)
+                result << value.to_json(state)
+              else
+                result << %{"#{String(value)}"}
+              end
               first = false
             }
             depth = state.depth -= 1
@@ -398,7 +345,11 @@ module JSON
             each { |value|
               result << delim unless first
               result << state.indent * depth if indent
-              result << value.to_json(state)
+              if value.respond_to?(:to_json)
+                result << value.to_json(state)
+              else
+                result << %{"#{String(value)}"}
+              end
               first = false
             }
             depth = state.depth -= 1
@@ -437,38 +388,24 @@ module JSON
         end
 
         module String
-          if defined?(::Encoding)
-            # This string should be encoded with UTF-8 A call to this method
-            # returns a JSON string encoded with UTF16 big endian characters as
-            # \u????.
-            def to_json(state = nil, *args)
-              state = State.from_state(state)
-              if encoding == ::Encoding::UTF_8
-                string = self
-              else
-                string = encode(::Encoding::UTF_8)
-              end
-              if state.ascii_only?
-                '"' << JSON.utf8_to_json_ascii(string) << '"'
-              else
-                '"' << JSON.utf8_to_json(string) << '"'
-              end
+          # This string should be encoded with UTF-8 A call to this method
+          # returns a JSON string encoded with UTF16 big endian characters as
+          # \u????.
+          def to_json(state = nil, *args)
+            state = State.from_state(state)
+            if encoding == ::Encoding::UTF_8
+              string = self
+            else
+              string = encode(::Encoding::UTF_8)
             end
-          else
-            # This string should be encoded with UTF-8 A call to this method
-            # returns a JSON string encoded with UTF16 big endian characters as
-            # \u????.
-            def to_json(state = nil, *args)
-              state = State.from_state(state)
-              if state.ascii_only?
-                '"' << JSON.utf8_to_json_ascii(self) << '"'
-              else
-                '"' << JSON.utf8_to_json(self) << '"'
-              end
+            if state.ascii_only?
+              '"' << JSON.utf8_to_json_ascii(string) << '"'
+            else
+              '"' << JSON.utf8_to_json(string) << '"'
             end
           end
 
-          # Module that holds the extinding methods if, the String module is
+          # Module that holds the extending methods if, the String module is
           # included.
           module Extend
             # Raw Strings are JSON Objects (the raw bytes are stored in an

data/lib/json/pure/parser.rb

@@ -1,3 +1,4 @@
+#frozen_string_literal: false
 require 'strscan'
 
 module JSON
@@ -48,7 +49,7 @@ module JSON
         )+
       )mx
 
-      UNPARSED = Object.new
+      UNPARSED = Object.new.freeze
 
       # Creates a new JSON::Pure::Parser instance for the string _source_.
       #
@@ -58,23 +59,23 @@ module JSON
       #   structures. Disable depth checking with :max_nesting => false|nil|0,
       #   it defaults to 100.
       # * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
-      #   defiance of RFC 4627 to be parsed by the Parser. This option defaults
+      #   defiance of RFC 7159 to be parsed by the Parser. This option defaults
       #   to false.
       # * *symbolize_names*: If set to true, returns symbols for the names
-      #   (keys) in a JSON object. Otherwise strings are returned, which is also
-      #   the default.
+      #   (keys) in a JSON object. Otherwise strings are returned, which is
+      #   also the default. It's not possible to use this option in
+      #   conjunction with the *create_additions* option.
       # * *create_additions*: If set to true, the Parser creates
-      #   additions when if a matching class and create_id was found. This
+      #   additions when a matching class and create_id are found. This
       #   option defaults to false.
       # * *object_class*: Defaults to Hash
       # * *array_class*: Defaults to Array
-      # * *quirks_mode*: Enables quirks_mode for parser, that is for example
-      #   parsing single JSON values instead of documents is possible.
+      # * *decimal_class*: Specifies which class to use instead of the default
+      #    (Float) when parsing decimal numbers. This class must accept a single
+      #    string argument in its constructor.
       def initialize(source, opts = {})
         opts ||= {}
-        unless @quirks_mode = opts[:quirks_mode]
-          source = convert_encoding source
-        end
+        source = convert_encoding source
         super source
         if !opts.key?(:max_nesting) # defaults to 100
           @max_nesting = 100
@@ -90,56 +91,38 @@ module JSON
         else
           @create_additions = false
         end
+        @symbolize_names && @create_additions and raise ArgumentError,
+          'options :symbolize_names and :create_additions cannot be used '\
+          'in conjunction'
         @create_id = @create_additions ? JSON.create_id : nil
         @object_class = opts[:object_class] || Hash
         @array_class  = opts[:array_class] || Array
+        @decimal_class = opts[:decimal_class]
         @match_string = opts[:match_string]
       end
 
       alias source string
 
-      def quirks_mode?
-        !!@quirks_mode
-      end
-
       def reset
         super
         @current_nesting = 0
       end
 
-      # Parses the current JSON string _source_ and returns the complete data
-      # structure as a result.
+      # Parses the current JSON string _source_ and returns the
+      # complete data structure as a result.
       def parse
         reset
         obj = nil
-        if @quirks_mode
-          while !eos? && skip(IGNORE)
-          end
-          if eos?
-            raise ParserError, "source did not contain any JSON!"
-          else
-            obj = parse_value
-            obj == UNPARSED and raise ParserError, "source did not contain any JSON!"
-          end
+        while !eos? && skip(IGNORE) do end
+        if eos?
+          raise ParserError, "source is not valid JSON!"
         else
-          until eos?
-            case
-            when scan(OBJECT_OPEN)
-              obj and raise ParserError, "source '#{peek(20)}' not in JSON!"
-              @current_nesting = 1
-              obj = parse_object
-            when scan(ARRAY_OPEN)
-              obj and raise ParserError, "source '#{peek(20)}' not in JSON!"
-              @current_nesting = 1
-              obj = parse_array
-            when skip(IGNORE)
-              ;
-            else
-              raise ParserError, "source '#{peek(20)}' not in JSON!"
-            end
-          end
-          obj or raise ParserError, "source did not contain any JSON!"
+          obj = parse_value
+          UNPARSED.equal?(obj) and raise ParserError,
+            "source is not valid JSON!"
         end
+        while !eos? && skip(IGNORE) do end
+        eos? or raise ParserError, "source is not valid JSON!"
         obj
       end
 
@@ -149,43 +132,12 @@ module JSON
         if source.respond_to?(:to_str)
           source = source.to_str
         else
-          raise TypeError, "#{source.inspect} is not like a string"
+          raise TypeError,
+            "#{source.inspect} is not like a string"
         end
-        if defined?(::Encoding)
-          if source.encoding == ::Encoding::ASCII_8BIT
-            b = source[0, 4].bytes.to_a
-            source =
-              case
-              when b.size >= 4 && b[0] == 0 && b[1] == 0 && b[2] == 0
-                source.dup.force_encoding(::Encoding::UTF_32BE).encode!(::Encoding::UTF_8)
-              when b.size >= 4 && b[0] == 0 && b[2] == 0
-                source.dup.force_encoding(::Encoding::UTF_16BE).encode!(::Encoding::UTF_8)
-              when b.size >= 4 && b[1] == 0 && b[2] == 0 && b[3] == 0
-                source.dup.force_encoding(::Encoding::UTF_32LE).encode!(::Encoding::UTF_8)
-              when b.size >= 4 && b[1] == 0 && b[3] == 0
-                source.dup.force_encoding(::Encoding::UTF_16LE).encode!(::Encoding::UTF_8)
-              else
-                source.dup
-              end
-          else
-            source = source.encode(::Encoding::UTF_8)
-          end
+        if source.encoding != ::Encoding::ASCII_8BIT
+          source = source.encode(::Encoding::UTF_8)
           source.force_encoding(::Encoding::ASCII_8BIT)
-        else
-          b = source
-          source =
-            case
-            when b.size >= 4 && b[0] == 0 && b[1] == 0 && b[2] == 0
-              JSON.iconv('utf-8', 'utf-32be', b)
-            when b.size >= 4 && b[0] == 0 && b[2] == 0
-              JSON.iconv('utf-8', 'utf-16be', b)
-            when b.size >= 4 && b[1] == 0 && b[2] == 0 && b[3] == 0
-              JSON.iconv('utf-8', 'utf-32le', b)
-            when b.size >= 4 && b[1] == 0 && b[3] == 0
-              JSON.iconv('utf-8', 'utf-16le', b)
-            else
-              b
-            end
         end
         source
       end
@@ -245,7 +197,15 @@ module JSON
       def parse_value
         case
         when scan(FLOAT)
-          Float(self[1])
+          if @decimal_class then
+            if @decimal_class == BigDecimal then
+              BigDecimal(self[1])
+            else
+              @decimal_class.new(self[1]) || Float(self[1])
+            end
+          else
+            Float(self[1])
+          end
         when scan(INTEGER)
           Integer(self[1])
         when scan(TRUE)
@@ -254,7 +214,7 @@ module JSON
           false
         when scan(NULL)
           nil
-        when (string = parse_string) != UNPARSED
+        when !UNPARSED.equal?(string = parse_string)
           string
         when scan(ARRAY_OPEN)
           @current_nesting += 1
@@ -284,7 +244,7 @@ module JSON
         delim = false
         until eos?
           case
-          when (value = parse_value) != UNPARSED
+          when !UNPARSED.equal?(value = parse_value)
             delim = false
             result << value
             skip(IGNORE)
@@ -316,13 +276,13 @@ module JSON
         delim = false
         until eos?
           case
-          when (string = parse_string) != UNPARSED
+          when !UNPARSED.equal?(string = parse_string)
             skip(IGNORE)
             unless scan(PAIR_DELIMITER)
               raise ParserError, "expected ':' in object at '#{peek(20)}'!"
             end
             skip(IGNORE)
-            unless (value = parse_value).equal? UNPARSED
+            unless UNPARSED.equal?(value = parse_value)
               result[@symbolize_names ? string.to_sym : string] = value
               delim = false
               skip(IGNORE)