json_pure 2.0.4 → 2.4.0

data/lib/json/pure/generator.rb

@@ -37,20 +37,26 @@ module JSON
     '\\'  =>  '\\\\',
   } # :nodoc:
 
+  ESCAPE_SLASH_MAP = MAP.merge(
+    '/'  =>  '\\/',
+  )
+
   # 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) # :nodoc:
+  def utf8_to_json(string, escape_slash = false) # :nodoc:
     string = string.dup
     string.force_encoding(::Encoding::ASCII_8BIT)
-    string.gsub!(/["\\\x0-\x1f]/) { MAP[$&] }
+    map = escape_slash ? ESCAPE_SLASH_MAP : MAP
+    string.gsub!(/[\/"\\\x0-\x1f]/) { map[$&] || $& }
     string.force_encoding(::Encoding::UTF_8)
     string
   end
 
-  def utf8_to_json_ascii(string) # :nodoc:
+  def utf8_to_json_ascii(string, escape_slash = false) # :nodoc:
     string = string.dup
     string.force_encoding(::Encoding::ASCII_8BIT)
-    string.gsub!(/["\\\x0-\x1f]/n) { MAP[$&] }
+    map = escape_slash ? ESCAPE_SLASH_MAP : MAP
+    string.gsub!(/[\/"\\\x0-\x1f]/n) { map[$&] || $& }
     string.gsub!(/(
       (?:
        [\xc2-\xdf][\x80-\xbf]    |
@@ -109,6 +115,7 @@ module JSON
         # * *space_before*: a string that is put before a : pair delimiter (default: ''),
         # * *object_nl*: a string that is put at the end of a JSON object (default: ''),
         # * *array_nl*: a string that is put at the end of a JSON array (default: ''),
+        # * *escape_slash*: true if forward slash (/) should be escaped (default: false)
         # * *check_circular*: is deprecated now, use the :max_nesting option instead,
         # * *max_nesting*: sets the maximum level of data structure nesting in
         #   the generated JSON, max_nesting = 0 if no maximum should be checked.
@@ -123,6 +130,7 @@ module JSON
           @array_nl              = ''
           @allow_nan             = false
           @ascii_only            = false
+          @escape_slash          = false
           @buffer_initial_length = 1024
           configure opts
         end
@@ -148,6 +156,10 @@ module JSON
         # the generated JSON, max_nesting = 0 if no maximum is checked.
         attr_accessor :max_nesting
 
+        # If this attribute is set to true, forward slashes will be escaped in
+        # all json strings.
+        attr_accessor :escape_slash
+
         # :stopdoc:
         attr_reader :buffer_initial_length
 
@@ -187,6 +199,11 @@ module JSON
           @ascii_only
         end
 
+        # Returns true, if forward slashes are escaped. Otherwise returns false.
+        def escape_slash?
+          @escape_slash
+        end
+
         # Configure this State instance with the Hash _opts_, and return
         # itself.
         def configure(opts)
@@ -209,6 +226,7 @@ module JSON
           @ascii_only            = opts[:ascii_only] if opts.key?(:ascii_only)
           @depth                 = opts[:depth] || 0
           @buffer_initial_length ||= opts[:buffer_initial_length]
+          @escape_slash          = !!opts[:escape_slash] if opts.key?(:escape_slash)
 
           if !opts.key?(:max_nesting) # defaults to 100
             @max_nesting = 100
@@ -250,7 +268,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
 
@@ -313,8 +332,10 @@ module JSON
               first = false
             }
             depth = state.depth -= 1
-            result << state.object_nl
-            result << state.indent * depth if indent
+            unless first
+              result << state.object_nl
+              result << state.indent * depth if indent
+            end
             result << '}'
             result
           end
@@ -398,13 +419,13 @@ module JSON
               string = encode(::Encoding::UTF_8)
             end
             if state.ascii_only?
-              '"' << JSON.utf8_to_json_ascii(string) << '"'
+              '"' << JSON.utf8_to_json_ascii(string, state.escape_slash) << '"'
             else
-              '"' << JSON.utf8_to_json(string) << '"'
+              '"' << JSON.utf8_to_json(string, state.escape_slash) << '"'
             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

@@ -49,7 +49,7 @@ module JSON
         )+
       )mx
 
-        UNPARSED = Object.new.freeze
+      UNPARSED = Object.new.freeze
 
       # Creates a new JSON::Pure::Parser instance for the string _source_.
       #
@@ -61,15 +61,20 @@ module JSON
       # * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
       #   defiance of RFC 7159 to be parsed by the Parser. This option defaults
       #   to false.
+      # * *freeze*: If set to true, all parsed objects will be frozen. Parsed
+      #   string will be deduplicated if possible.
       # * *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. 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
+      # * *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 ||= {}
         source = convert_encoding source
@@ -83,6 +88,7 @@ module JSON
         end
         @allow_nan = !!opts[:allow_nan]
         @symbolize_names = !!opts[:symbolize_names]
+        @freeze = !!opts[:freeze]
         if opts.key?(:create_additions)
           @create_additions = !!opts[:create_additions]
         else
@@ -94,6 +100,7 @@ module JSON
         @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
 
@@ -116,6 +123,7 @@ module JSON
           obj = parse_value
           UNPARSED.equal?(obj) and raise ParserError,
             "source is not valid JSON!"
+          obj.freeze if @freeze
         end
         while !eos? && skip(IGNORE) do end
         eos? or raise ParserError, "source is not valid JSON!"
@@ -157,6 +165,7 @@ module JSON
         EMPTY_8BIT_STRING.force_encoding Encoding::ASCII_8BIT
       end
 
+      STR_UMINUS = ''.respond_to?(:-@)
       def parse_string
         if scan(STRING)
           return '' if self[1].empty?
@@ -176,6 +185,15 @@ module JSON
           if string.respond_to?(:force_encoding)
             string.force_encoding(::Encoding::UTF_8)
           end
+
+          if @freeze
+            if STR_UMINUS
+              string = -string
+            else
+              string.freeze
+            end
+          end
+
           if @create_additions and @match_string
             for (regexp, klass) in @match_string
               klass.json_creatable? or next
@@ -193,7 +211,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)
@@ -230,8 +256,10 @@ module JSON
           @max_nesting.nonzero? && @current_nesting > @max_nesting
         result = @array_class.new
         delim = false
-        until eos?
+        loop do
           case
+          when eos?
+            raise ParserError, "unexpected end of string while parsing array"
           when !UNPARSED.equal?(value = parse_value)
             delim = false
             result << value
@@ -262,8 +290,10 @@ module JSON
           @max_nesting.nonzero? && @current_nesting > @max_nesting
         result = @object_class.new
         delim = false
-        until eos?
+        loop do
           case
+          when eos?
+            raise ParserError, "unexpected end of string while parsing object"
           when !UNPARSED.equal?(string = parse_string)
             skip(IGNORE)
             unless scan(PAIR_DELIMITER)

data/lib/json/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 module JSON
   # JSON version
-  VERSION         = '2.0.4'
+  VERSION         = '2.3.1'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/tests/json_addition_test.rb

@@ -5,6 +5,7 @@ require 'json/add/complex'
 require 'json/add/rational'
 require 'json/add/bigdecimal'
 require 'json/add/ostruct'
+require 'json/add/set'
 require 'date'
 
 class JSONAdditionTest < Test::Unit::TestCase
@@ -190,4 +191,9 @@ class JSONAdditionTest < Test::Unit::TestCase
     o.foo = { 'bar' => true }
     assert_equal o, parse(JSON(o), :create_additions => true)
   end
+
+  def test_set
+    s = Set.new([:a, :b, :c, :a])
+    assert_equal s, JSON.parse(JSON(s), :create_additions => true)
+  end
 end

data/tests/json_common_interface_test.rb

@@ -27,15 +27,15 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase
   end
 
   def test_parser
-    assert_match /::Parser\z/, JSON.parser.name
+    assert_match(/::Parser\z/, JSON.parser.name)
   end
 
   def test_generator
-    assert_match /::Generator\z/, JSON.generator.name
+    assert_match(/::Generator\z/, JSON.generator.name)
   end
 
   def test_state
-    assert_match /::Generator::State\z/, JSON.state.name
+    assert_match(/::Generator::State\z/, JSON.state.name)
   end
 
   def test_create_id
@@ -56,7 +56,7 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase
   end
 
   def test_parse_bang
-    assert_equal [ 1, NaN, 3, ], JSON.parse!('[ 1, NaN, 3 ]')
+    assert_equal [ 1, Infinity, 3, ], JSON.parse!('[ 1, Infinity, 3 ]')
   end
 
   def test_generate
@@ -123,4 +123,47 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase
     assert_equal @json, JSON(@hash)
     assert_equal @hash, JSON(@json)
   end
+
+  def test_load_file
+    test_load_shared(:load_file)
+  end
+
+  def test_load_file!
+    test_load_shared(:load_file!)
+  end
+
+  def test_load_file_with_option
+    test_load_file_with_option_shared(:load_file)
+  end
+
+  def test_load_file_with_option!
+    test_load_file_with_option_shared(:load_file!)
+  end
+
+  private
+
+  def test_load_shared(method_name)
+    temp_file_containing(@json) do |filespec|
+      assert_equal JSON.public_send(method_name, filespec), @hash
+    end
+  end
+
+  def test_load_file_with_option_shared(method_name)
+    temp_file_containing(@json) do |filespec|
+      parsed_object = JSON.public_send(method_name, filespec, symbolize_names: true)
+      key_classes = parsed_object.keys.map(&:class)
+      assert_include(key_classes, Symbol)
+      assert_not_include(key_classes, String)
+    end
+  end
+
+  def temp_file_containing(text, file_prefix = '')
+    raise "This method must be called with a code block." unless block_given?
+
+    Tempfile.create(file_prefix) do |file|
+      file << text
+      file.close
+      yield file.path
+    end
+  end
 end

data/tests/json_encoding_test.rb

@@ -79,8 +79,8 @@ class JSONEncodingTest < Test::Unit::TestCase
     json = '["\ud840\udc01"]'
     assert_equal json, generate(utf8, :ascii_only => true)
     assert_equal utf8, parse(json)
-    assert_raises(JSON::ParserError) { parse('"\u"') }
-    assert_raises(JSON::ParserError) { parse('"\ud800"') }
+    assert_raise(JSON::ParserError) { parse('"\u"') }
+    assert_raise(JSON::ParserError) { parse('"\ud800"') }
   end
 
   def test_chars

data/tests/json_fixtures_test.rb

@@ -3,13 +3,14 @@ require 'test_helper'
 
 class JSONFixturesTest < Test::Unit::TestCase
   def setup
-    fixtures = File.join(File.dirname(__FILE__), 'fixtures/{fail,pass}.json')
+    fixtures = File.join(File.dirname(__FILE__), 'fixtures/{fail,pass}*.json')
     passed, failed = Dir[fixtures].partition { |f| f['pass'] }
     @passed = passed.inject([]) { |a, f| a << [ f, File.read(f) ] }.sort
     @failed = failed.inject([]) { |a, f| a << [ f, File.read(f) ] }.sort
   end
 
   def test_passing
+    verbose_bak, $VERBOSE = $VERBOSE, nil
     for name, source in @passed
       begin
         assert JSON.parse(source),
@@ -19,6 +20,8 @@ class JSONFixturesTest < Test::Unit::TestCase
         raise e
       end
     end
+  ensure
+    $VERBOSE = verbose_bak
   end
 
   def test_failing
@@ -29,4 +32,9 @@ class JSONFixturesTest < Test::Unit::TestCase
       end
     end
   end
+
+  def test_sanity
+    assert(@passed.size > 5)
+    assert(@failed.size > 20)
+  end
 end

data/tests/json_generator_test.rb

@@ -40,6 +40,43 @@ class JSONGeneratorTest < Test::Unit::TestCase
 EOT
   end
 
+  def silence
+    v = $VERBOSE
+    $VERBOSE = nil
+    yield
+  ensure
+    $VERBOSE = v
+  end
+
+  def test_remove_const_segv
+    stress = GC.stress
+    const = JSON::SAFE_STATE_PROTOTYPE.dup
+
+    bignum_too_long_to_embed_as_string = 1234567890123456789012345
+    expect = bignum_too_long_to_embed_as_string.to_s
+    GC.stress = true
+
+    10.times do |i|
+      tmp = bignum_too_long_to_embed_as_string.to_json
+      raise "'\#{expect}' is expected, but '\#{tmp}'" unless tmp == expect
+    end
+
+    silence do
+      JSON.const_set :SAFE_STATE_PROTOTYPE, nil
+    end
+
+    10.times do |i|
+      assert_raise TypeError do
+        bignum_too_long_to_embed_as_string.to_json
+      end
+    end
+  ensure
+    GC.stress = stress
+    silence do
+      JSON.const_set :SAFE_STATE_PROTOTYPE, const
+    end
+  end if JSON.const_defined?("Ext") && RUBY_ENGINE != 'jruby'
+
   def test_generate
     json = generate(@hash)
     assert_equal(parse(@json2), parse(json))
@@ -55,6 +92,11 @@ EOT
   end
 
   def test_generate_pretty
+    json = pretty_generate({})
+    assert_equal(<<'EOT'.chomp, json)
+{
+}
+EOT
     json = pretty_generate(@hash)
     # hashes aren't (insertion) ordered on every ruby implementation
     # assert_equal(@json3, json)
@@ -136,6 +178,7 @@ EOT
       :ascii_only            => false,
       :buffer_initial_length => 1024,
       :depth                 => 0,
+      :escape_slash          => false,
       :indent                => "  ",
       :max_nesting           => 100,
       :object_nl             => "\n",
@@ -152,6 +195,7 @@ EOT
       :ascii_only            => false,
       :buffer_initial_length => 1024,
       :depth                 => 0,
+      :escape_slash          => false,
       :indent                => "",
       :max_nesting           => 100,
       :object_nl             => "",
@@ -168,6 +212,7 @@ EOT
       :ascii_only            => false,
       :buffer_initial_length => 1024,
       :depth                 => 0,
+      :escape_slash          => false,
       :indent                => "",
       :max_nesting           => 0,
       :object_nl             => "",
@@ -356,6 +401,10 @@ EOT
     json = '["/"]'
     assert_equal json, generate(data)
     #
+    data = [ '/' ]
+    json = '["\/"]'
+    assert_equal json, generate(data, :escape_slash => true)
+    #
     data = ['"']
     json = '["\""]'
     assert_equal json, generate(data)
@@ -374,4 +423,10 @@ EOT
       assert_equal '["foo"]', JSON.generate([s.new('foo')])
     end
   end
+
+  if defined?(Encoding)
+    def test_nonutf8_encoding
+      assert_equal("\"5\u{b0}\"", "5\xb0".force_encoding("iso-8859-1").to_json)
+    end
+  end
 end