From 834e6aa666d806f247a9c1cb9545f213d8935751 Mon Sep 17 00:00:00 2001 From: jejacks0n Date: Mon, 8 Dec 2014 16:06:09 -0700 Subject: [PATCH] Fixes an issue with associations not passing options to ArraySerializer. - this simply allows ArraySerializer to determine what serializer to use if the option is passed. --- Gemfile | 2 +- lib/active_model/serializer.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 25b466ebf..25f6ce628 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' # Specify your gem's dependencies in active_model_serializers.gemspec gemspec -gem "minitest" +gem "minitest", "~> 5.1" version = ENV["RAILS_VERSION"] || "4.1" diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb index f2a34c350..96bc0a809 100644 --- a/lib/active_model/serializer.rb +++ b/lib/active_model/serializer.rb @@ -139,7 +139,7 @@ def each_association(&block) self.class._associations.dup.each do |name, options| association = object.send(name) serializer_class = ActiveModel::Serializer.serializer_for(association) - serializer = serializer_class.new(association) if serializer_class + serializer = serializer_class.new(association, options[:options]) if serializer_class if block_given? block.call(name, serializer, options[:options])