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

[flori/json] Overload kwargs in JSON.dump

Browse Source 
https://github.com/flori/json/commit/936f280f9f
This commit is contained in:
Takashi Kokubun 2023-12-01 09:53:44 -08:00 committed by Hiroshi SHIBATA
parent a22ed89438
commit e6b35e8a6d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -615,13 +615,17 @@ module JSON
if anIO and limit.nil? if anIO and limit.nil?
anIO = anIO.to_io if anIO.respond_to?(:to_io) anIO = anIO.to_io if anIO.respond_to?(:to_io)
unless anIO.respond_to?(:write) unless anIO.respond_to?(:write)
limit = anIO if kwargs.nil? and anIO.is_a?(Hash)
kwargs = anIO
else
limit = anIO
end
anIO = nil anIO = nil
end end
end end
opts = JSON.dump_default_options opts = JSON.dump_default_options
opts = opts.merge(:max_nesting => limit) if limit opts = opts.merge(:max_nesting => limit) if limit
merge_dump_options(opts, **kwargs) if kwargs opts = merge_dump_options(opts, **kwargs) if kwargs
result = generate(obj, opts) result = generate(obj, opts)
if anIO if anIO
anIO.write result anIO.write result
@ -641,7 +645,8 @@ module JSON
private private
def merge_dump_options(opts, strict: NOT_SET) def merge_dump_options(opts, strict: NOT_SET)
opts[:strict] = strict if NOT_SET != strict opts = opts.merge(strict: strict) if NOT_SET != strict
opts
end end
end end

4
test/json/json_generator_test.rb
View File

@ -66,6 +66,10 @@ EOT
assert_equal '{"a":1,"b":2}', dump(a: 1, b: 2) assert_equal '{"a":1,"b":2}', dump(a: 1, b: 2)
end end
def test_dump_strict
assert_equal '{}', dump({}, strict: true)
end
def test_generate_pretty def test_generate_pretty
json = pretty_generate({}) json = pretty_generate({})
assert_equal(<<'EOT'.chomp, json) assert_equal(<<'EOT'.chomp, json)