diff --git a/lib/active_model/serializer/belongs_to_reflection.rb b/lib/active_model/serializer/belongs_to_reflection.rb index a014b7a5..67dbe79a 100644 --- a/lib/active_model/serializer/belongs_to_reflection.rb +++ b/lib/active_model/serializer/belongs_to_reflection.rb @@ -1,7 +1,7 @@ module ActiveModel class Serializer # @api private - class BelongsToReflection < SingularReflection + class BelongsToReflection < Reflection end end end diff --git a/lib/active_model/serializer/collection_reflection.rb b/lib/active_model/serializer/collection_reflection.rb deleted file mode 100644 index 3436becf..00000000 --- a/lib/active_model/serializer/collection_reflection.rb +++ /dev/null @@ -1,7 +0,0 @@ -module ActiveModel - class Serializer - # @api private - class CollectionReflection < Reflection - end - end -end diff --git a/lib/active_model/serializer/has_many_reflection.rb b/lib/active_model/serializer/has_many_reflection.rb index aab67a4f..99f6f63c 100644 --- a/lib/active_model/serializer/has_many_reflection.rb +++ b/lib/active_model/serializer/has_many_reflection.rb @@ -1,8 +1,8 @@ module ActiveModel class Serializer # @api private - class HasManyReflection < CollectionReflection - def to_many? + class HasManyReflection < Reflection + def collection? true end end diff --git a/lib/active_model/serializer/has_one_reflection.rb b/lib/active_model/serializer/has_one_reflection.rb index bf41b1d1..a385009b 100644 --- a/lib/active_model/serializer/has_one_reflection.rb +++ b/lib/active_model/serializer/has_one_reflection.rb @@ -1,7 +1,7 @@ module ActiveModel class Serializer # @api private - class HasOneReflection < SingularReflection + class HasOneReflection < Reflection end end end diff --git a/lib/active_model/serializer/reflection.rb b/lib/active_model/serializer/reflection.rb index d4f96390..12b7fcaf 100644 --- a/lib/active_model/serializer/reflection.rb +++ b/lib/active_model/serializer/reflection.rb @@ -121,7 +121,7 @@ module ActiveModel :nil end - def to_many? + def collection? false end @@ -235,7 +235,7 @@ module ActiveModel end def build_serializer!(association_value, serializer_class, parent_serializer, parent_serializer_options) - if to_many? + if collection? build_association_collection_serializer(parent_serializer, parent_serializer_options, association_value, serializer_class) else build_association_serializer(parent_serializer, parent_serializer_options, association_value, serializer_class) diff --git a/lib/active_model/serializer/singular_reflection.rb b/lib/active_model/serializer/singular_reflection.rb deleted file mode 100644 index f90ecc21..00000000 --- a/lib/active_model/serializer/singular_reflection.rb +++ /dev/null @@ -1,7 +0,0 @@ -module ActiveModel - class Serializer - # @api private - class SingularReflection < Reflection - end - end -end