Skip to content

Call super in included hook #486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hsbt merged 1 commit into from
May 10, 2023
Merged

Call super in included hook #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ext/json/ext/generator/generator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,7 @@ static VALUE mFloat_to_json(int argc, VALUE *argv, VALUE self)
*/
static VALUE mString_included_s(VALUE self, VALUE modul) {
VALUE result = rb_funcall(modul, i_extend, 1, mString_Extend);
rb_call_super(1, &modul);
return result;
}

Expand Down
23 changes: 23 additions & 0 deletions tests/json_generator_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,29 @@ def to_s; self; end
end
end

if defined?(JSON::Ext::Generator)
def test_string_ext_included_calls_super
included = false

Module.alias_method(:included_orig, :included)
Module.define_method(:included) do |base|
included_orig(base)
included = true
end

Class.new(String) do
include JSON::Ext::Generator::GeneratorMethods::String
end

assert included
ensure
if Module.private_method_defined?(:included_orig)
Module.alias_method(:included, :included_orig)
Module.remove_method(:included_orig)
end
end
end

if defined?(Encoding)
def test_nonutf8_encoding
assert_equal("\"5\u{b0}\"", "5\xb0".force_encoding("iso-8859-1").to_json)
Expand Down