ditkrg/active_model_serializers
5
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-25 07:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make embed use serializer configuration

Browse Source
This commit is contained in:
Adrian Mugnolo and Santiago Pastorino
2014-01-13 14:26:52 -02:00
committed by Santiago Pastorino
parent 32318f9daf
commit 3db2fcec6c
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/active_model/serializer/associations.rb
View File

@@ -4,7 +4,7 @@ require 'active_model/serializer'
module ActiveModel
class Serializer
class Association
def initialize(name, options = {})
def initialize(name, options = {}, configuration = nil)
if options.has_key?(:include)
ActiveSupport::Deprecation.warn <<-WARN
** Notice: include was renamed to embed_in_root. **
@@ -13,8 +13,8 @@ module ActiveModel
@name = name.to_s
@options = options
self.embed = options.fetch(:embed) { Configuration.global.embed }
@embed_in_root = options.fetch(:embed_in_root) { options.fetch(:include) { Configuration.global.embed_in_root } }
self.embed = options.fetch(:embed) { configuration.embed }
@embed_in_root = options.fetch(:embed_in_root) { options.fetch(:include) { configuration.embed_in_root } }
@embed_key = options[:embed_key] || :id
@key = options[:key]
@embedded_key = options[:root] || name