From 71a43a432ae064729d2debe90388647399d53ff8 Mon Sep 17 00:00:00 2001
From: Tema Bolshakov and Dmitry Myaskovskiy <tweekane+b+m@gmail.com>
Date: Fri, 29 Aug 2014 20:16:11 +0400
Subject: [PATCH] Pass options to associations

---
 lib/active_model/serializer.rb                  | 10 +++++++---
 lib/active_model/serializer/adapter/json.rb     |  9 +++++----
 lib/active_model/serializer/adapter/json_api.rb | 16 +++++++++-------
 test/serializers/associations_test.rb           | 12 ++++++++++--
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index 44954ed4..05a79900 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -99,11 +99,15 @@ module ActiveModel
       end
     end
 
-    def associations(options = {})
-      self.class._associations.dup.each_with_object({}) do |(name, value), hash|
+    def each_association(&block)
+      self.class._associations.dup.each do |name, options|
         association = object.send(name)
         serializer_class = ActiveModel::Serializer.serializer_for(association)
-        hash[name] = serializer_class.new(association)
+        serializer = serializer_class.new(association)
+
+        if block_given?
+          block.call(name, serializer, options[:options])
+        end
       end
     end
   end
diff --git a/lib/active_model/serializer/adapter/json.rb b/lib/active_model/serializer/adapter/json.rb
index 970de04b..f37fc8d4 100644
--- a/lib/active_model/serializer/adapter/json.rb
+++ b/lib/active_model/serializer/adapter/json.rb
@@ -3,13 +3,14 @@ module ActiveModel
     class Adapter
       class Json < Adapter
         def serializable_hash(options = {})
-          @hash = serializer.attributes
+          @hash = serializer.attributes(options)
 
-          serializer.associations.each do |name, association|
+          serializer.each_association do |name, association, options|
             if association.respond_to?(:each)
-              @hash[name] = association.map(&:attributes)
+              array_serializer = association
+              @hash[name] = array_serializer.map { |item| item.attributes(options) }
             else
-              @hash[name] = association.attributes
+              @hash[name] = association.attributes(options)
             end
           end
           @hash
diff --git a/lib/active_model/serializer/adapter/json_api.rb b/lib/active_model/serializer/adapter/json_api.rb
index 22b44f89..a4f516dc 100644
--- a/lib/active_model/serializer/adapter/json_api.rb
+++ b/lib/active_model/serializer/adapter/json_api.rb
@@ -5,31 +5,33 @@ module ActiveModel
         def serializable_hash(options = {})
           @hash = serializer.attributes
 
-          serializer.associations.each do |name, association|
+          serializer.each_association do |name, association, options|
             @hash[:links] ||= {}
             @hash[:linked] ||= {}
+
             if association.respond_to?(:each)
-              add_links(name, association)
+              add_links(name, association, options)
             else
-              add_link(name, association)
+              add_link(name, association, options)
             end
           end
+
           @hash
         end
 
-        def add_links(name, serializers)
+        def add_links(name, serializers, options)
           @hash[:links][name] ||= []
           @hash[:linked][name] ||= []
           @hash[:links][name] += serializers.map(&:id)
-          @hash[:linked][name] += serializers.map(&:attributes)
+          @hash[:linked][name] += serializers.map { |item| item.attributes(options) }
         end
 
-        def add_link(name, serializer)
+        def add_link(name, serializer, options)
           plural_name = name.to_s.pluralize.to_sym
           @hash[:linked][plural_name] ||= []
 
           @hash[:links][name] = serializer.id
-          @hash[:linked][plural_name].push serializer.attributes
+          @hash[:linked][plural_name].push serializer.attributes(options)
         end
       end
     end
diff --git a/test/serializers/associations_test.rb b/test/serializers/associations_test.rb
index 56603b2c..6d69b563 100644
--- a/test/serializers/associations_test.rb
+++ b/test/serializers/associations_test.rb
@@ -36,12 +36,20 @@ module ActiveModel
 
       def test_has_many
         assert_equal({comments: {type: :has_many, options: {}}}, @post_serializer.class._associations)
-        assert_kind_of(ActiveModel::Serializer::ArraySerializer, @post_serializer.associations[:comments])
+        @post_serializer.each_association do |name, serializer, options|
+          assert_equal(:comments, name)
+          assert_equal({}, options)
+          assert_kind_of(ActiveModel::Serializer.config.array_serializer, serializer)
+        end
       end
 
       def test_has_one
         assert_equal({post: {type: :belongs_to, options: {}}}, @comment_serializer.class._associations)
-        assert_kind_of(PostSerializer, @comment_serializer.associations[:post])
+        @comment_serializer.each_association do |name, serializer, options|
+          assert_equal(:post, name)
+          assert_equal({}, options)
+          assert_kind_of(PostSerializer, serializer)
+        end
       end
     end
   end