From 2c240cf2e063251069ded14cc923125c858b0370 Mon Sep 17 00:00:00 2001
From: Adman65 <adman1965@gmail.com>
Date: Fri, 9 Dec 2011 16:16:09 +0100
Subject: [PATCH 1/3] Implicit detection for has_many serializer

---
 lib/active_model/serializer.rb |  2 ++
 test/serializer_test.rb        | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index ef68072c..14220ed0 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -138,6 +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")
           end
diff --git a/test/serializer_test.rb b/test/serializer_test.rb
index 3a65e1ab..b4e50161 100644
--- a/test/serializer_test.rb
+++ b/test/serializer_test.rb
@@ -211,6 +211,30 @@ class SerializerTest < ActiveModel::TestCase
     }, json)
   end
 
+  def test_implicit_serializer_for_has_many
+    blog_with_posts = Class.new(Blog) do
+      attr_accessor :posts
+    end
+
+    blog_serializer = Class.new(ActiveModel::Serializer) do
+      const_set(:PostSerializer, PostSerializer)
+      has_many :posts
+    end
+
+    user = User.new
+    blog = blog_with_posts.new
+    blog.posts = [Post.new(:title => 'test')]
+
+    json = blog_serializer.new(blog, user).as_json
+    assert_equal({
+     :posts => [{
+       :title => "test", 
+       :body => nil, 
+       :comments => []
+     }]
+    }, json)
+  end
+
   def test_overridden_associations
     author_serializer = Class.new(ActiveModel::Serializer) do
       attributes :first_name

From 24608322364514008f10dbfebdded587ef9c18bc Mon Sep 17 00:00:00 2001
From: Adman65 <adman1965@gmail.com>
Date: Mon, 12 Dec 2011 10:02:46 +0100
Subject: [PATCH 2/3] 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)

From 5e5c0213a771fb6a3f96ed2427bba07c620c92ea Mon Sep 17 00:00:00 2001
From: Adman65 <adman1965@gmail.com>
Date: Mon, 12 Dec 2011 10:30:20 +0100
Subject: [PATCH 3/3] Refactor serializer class detection

---
 lib/active_model/serializer.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index 00a5d591..474b2d9d 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -134,12 +134,9 @@ module ActiveModel
             class_eval "def #{attr}() object.#{attr} end", __FILE__, __LINE__
           end
 
-          # if :key is specified without :serializer, then use conventions
-          # to determine the serializer
-          if options[:key] && !options[:serializer]
-            options[:serializer] = const_get("#{options[:key].to_s.camelize.singularize}Serializer")
-          else
-            options[:serializer] ||= const_get("#{attr.to_s.singularize.camelize}Serializer")
+          options[:serializer] ||= begin
+            serializer_class = (options[:key] || attr).to_s.classify
+            const_get("#{serializer_class}Serializer")
           end
 
           klass.new(attr, options)