1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/json] JSON.load_file: explictly load the file as UTF-8

Browse Source 
Fix: https://github.com/ruby/json/issues/697

This way even if `Encoding.default_external` is set to a weird value
the document will be parsed just fine.

https://github.com/ruby/json/commit/3a8505a8fa
This commit is contained in:
Jean Boussier 2024-11-07 17:22:10 +01:00 committed by Hiroshi SHIBATA
parent 58317328b6
commit 1b6a26e23a
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/json/lib/json/common.rb
View File

@ -1,4 +1,5 @@
#frozen_string_literal: true # frozen_string_literal: true
require 'json/version' require 'json/version'
module JSON module JSON
@ -230,8 +231,8 @@ module JSON
# parse(File.read(path), opts) # parse(File.read(path), opts)
# #
# See method #parse. # See method #parse.
def load_file(filespec, opts = {}) def load_file(filespec, opts = nil)
parse(File.read(filespec), opts) parse(File.read(filespec, encoding: Encoding::UTF_8), opts)
end end
# :call-seq: # :call-seq:
@ -242,7 +243,7 @@ module JSON
# #
# See method #parse! # See method #parse!
def load_file!(filespec, opts = {}) def load_file!(filespec, opts = {})
parse!(File.read(filespec), opts) parse!(File.read(filespec, encoding: Encoding::UTF_8), opts)
end end
# :call-seq: # :call-seq:

23
test/json/json_common_interface_test.rb
View File

@ -1,4 +1,5 @@
# frozen_string_literal: true # frozen_string_literal: true
require_relative 'test_helper' require_relative 'test_helper'
require 'stringio' require 'stringio'
require 'tempfile' require 'tempfile'
@ -189,8 +190,30 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase
test_load_file_with_option_shared(:load_file!) test_load_file_with_option_shared(:load_file!)
end end
def test_load_file_with_bad_default_external_encoding
data = { "key" => "€" }
temp_file_containing(JSON.dump(data)) do |path|
loaded_data = with_external_encoding(Encoding::US_ASCII) do
JSON.load_file(path)
end
assert_equal data, loaded_data
end
end
private private
def with_external_encoding(encoding)
verbose = $VERBOSE
$VERBOSE = nil
previous_encoding = Encoding.default_external
Encoding.default_external = encoding
yield
ensure
verbose = $VERBOSE
Encoding.default_external = previous_encoding
$VERBOSE = verbose
end
def test_load_shared(method_name) def test_load_shared(method_name)
temp_file_containing(@json) do |filespec| temp_file_containing(@json) do |filespec|
assert_equal JSON.public_send(method_name, filespec), @hash assert_equal JSON.public_send(method_name, filespec), @hash