Skip to content

Commit

Permalink
Add tests for the behavior of JSON.generate with base types subclasses
Browse files Browse the repository at this point in the history
Ref: #674
Ref: #668

The behavior on such case it quite unclear, the goal here is to
figure out whatever was the behavior on Cext version of `json 2.7.0`
and get all implementations to converge.

We can then decide to make them all behave differently if we so wish.
  • Loading branch information
byroot committed Nov 4, 2024
1 parent 2333912 commit 614921d
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 1 deletion.
6 changes: 5 additions & 1 deletion ext/json/ext/generator/generator.c
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,11 @@ json_object_i(VALUE key, VALUE val, VALUE _arg)
VALUE key_to_s;
switch(rb_type(key)) {
case T_STRING:
key_to_s = key;
if (RB_LIKELY(RBASIC_CLASS(key) == rb_cString)) {
key_to_s = key;
} else {
key_to_s = rb_funcall(key, i_to_s, 0);
}
break;
case T_SYMBOL:
key_to_s = rb_sym2str(key);
Expand Down
66 changes: 66 additions & 0 deletions test/json/json_generator_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,72 @@ def test_to_json_called_with_state_object
assert_instance_of JSON::State, argument
end

module CustomToJSON
def to_json(*)
%{"#{self.class.name}#to_json"}
end
end

module CustomToS
def to_s
"#{self.class.name}#to_s"
end
end

class ArrayWithToJSON < Array
include CustomToJSON
end

def test_array_subclass_with_to_json
assert_equal '["JSONGeneratorTest::ArrayWithToJSON#to_json"]', JSON.generate([ArrayWithToJSON.new])
assert_equal '{"[]":1}', JSON.generate(ArrayWithToJSON.new => 1)
end

class ArrayWithToS < Array
include CustomToS
end

def test_array_subclass_with_to_s
assert_equal '[[]]', JSON.generate([ArrayWithToS.new])
assert_equal '{"JSONGeneratorTest::ArrayWithToS#to_s":1}', JSON.generate(ArrayWithToS.new => 1)
end

class HashWithToJSON < Hash
include CustomToJSON
end

def test_hash_subclass_with_to_json
assert_equal '["JSONGeneratorTest::HashWithToJSON#to_json"]', JSON.generate([HashWithToJSON.new])
assert_equal '{"{}":1}', JSON.generate(HashWithToJSON.new => 1)
end

class HashWithToS < Hash
include CustomToS
end

def test_hash_subclass_with_to_s
assert_equal '[{}]', JSON.generate([HashWithToS.new])
assert_equal '{"JSONGeneratorTest::HashWithToS#to_s":1}', JSON.generate(HashWithToS.new => 1)
end

class StringWithToJSON < String
include CustomToJSON
end

def test_string_subclass_with_to_json
assert_equal '["JSONGeneratorTest::StringWithToJSON#to_json"]', JSON.generate([StringWithToJSON.new])
assert_equal '{"":1}', JSON.generate(StringWithToJSON.new => 1)
end

class StringWithToS < String
include CustomToS
end

def test_string_subclass_with_to_s
assert_equal '[""]', JSON.generate([StringWithToS.new])
assert_equal '{"JSONGeneratorTest::StringWithToS#to_s":1}', JSON.generate(StringWithToS.new => 1)
end

if defined?(JSON::Ext::Generator) and RUBY_PLATFORM != "java"
def test_valid_utf8_in_different_encoding
utf8_string = "€™"
Expand Down

0 comments on commit 614921d

Please sign in to comment.