diff --git a/lib/active_model/serializer/association/has_many.rb b/lib/active_model/serializer/association/has_many.rb index d1b8d8eb..52d66d26 100644 --- a/lib/active_model/serializer/association/has_many.rb +++ b/lib/active_model/serializer/association/has_many.rb @@ -5,7 +5,11 @@ module ActiveModel def initialize(name, *args) super @root_key = @embedded_key - @key ||= "#{name.to_s.singularize}_ids" + @key ||= case CONFIG.default_key_type + when :name then name.to_s.pluralize + else "#{name.to_s.singularize}_ids" + end + end def serializer_class(object, _) diff --git a/lib/active_model/serializer/association/has_one.rb b/lib/active_model/serializer/association/has_one.rb index 3b9acddf..38c8b9bc 100644 --- a/lib/active_model/serializer/association/has_one.rb +++ b/lib/active_model/serializer/association/has_one.rb @@ -5,7 +5,10 @@ module ActiveModel def initialize(name, *args) super @root_key = @embedded_key.to_s.pluralize - @key ||= "#{name}_id" + @key ||= case CONFIG.default_key_type + when :name then name.to_s.singularize + else "#{name}_id" + end end def serializer_class(object, options = {})