From 4976837c316b962e7666538b0268298fab9c5616 Mon Sep 17 00:00:00 2001 From: Lucas Hosseini Date: Mon, 21 Sep 2015 07:11:30 +0200 Subject: [PATCH] Fix options passing in Json and Attributes adapters. --- lib/active_model/serializer/adapter/attributes.rb | 2 +- lib/active_model/serializer/adapter/json.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/active_model/serializer/adapter/attributes.rb b/lib/active_model/serializer/adapter/attributes.rb index 4331f579..79cf58dc 100644 --- a/lib/active_model/serializer/adapter/attributes.rb +++ b/lib/active_model/serializer/adapter/attributes.rb @@ -10,7 +10,7 @@ module ActiveModel def serializable_hash(options = nil) options ||= {} if serializer.respond_to?(:each) - result = serializer.map { |s| Attributes.new(s).serializable_hash(options) } + result = serializer.map { |s| Attributes.new(s, instance_options).serializable_hash(options) } else hash = {} diff --git a/lib/active_model/serializer/adapter/json.rb b/lib/active_model/serializer/adapter/json.rb index 4e5fd29f..ab81f571 100644 --- a/lib/active_model/serializer/adapter/json.rb +++ b/lib/active_model/serializer/adapter/json.rb @@ -7,7 +7,7 @@ module ActiveModel def serializable_hash(options = nil) options ||= {} - { root => Attributes.new(serializer).serializable_hash(options) } + { root => Attributes.new(serializer, instance_options).serializable_hash(options) } end private