From 24608322364514008f10dbfebdded587ef9c18bc Mon Sep 17 00:00:00 2001 From: Adman65 Date: Mon, 12 Dec 2011 10:02:46 +0100 Subject: [PATCH] Use singular serializer name for default --- lib/active_model/serializer.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb index 14220ed0..00a5d591 100644 --- a/lib/active_model/serializer.rb +++ b/lib/active_model/serializer.rb @@ -138,10 +138,8 @@ module ActiveModel # to determine the serializer if options[:key] && !options[:serializer] options[:serializer] = const_get("#{options[:key].to_s.camelize.singularize}Serializer") - elsif !options[:serializer] && klass == Associations::HasMany - options[:serializer] = const_get("#{attr.to_s.camelize.singularize}Serializer") else - options[:serializer] ||= const_get("#{attr.to_s.camelize}Serializer") + options[:serializer] ||= const_get("#{attr.to_s.singularize.camelize}Serializer") end klass.new(attr, options)