From 32318f9daf31de885f8841d57c543ecec5427f1c Mon Sep 17 00:00:00 2001 From: Adrian Mugnolo and Santiago Pastorino Date: Mon, 13 Jan 2014 14:15:05 -0200 Subject: [PATCH] Move ActiveModel::Serializer.embed to DSL --- lib/active_model/serializer.rb | 7 +------ lib/active_model/serializer/dsl.rb | 5 +++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb index 260d3598..b8a1b5fa 100644 --- a/lib/active_model/serializer.rb +++ b/lib/active_model/serializer.rb @@ -17,11 +17,6 @@ module ActiveModel base._associations = (_associations || {}).dup end - def embed(type, options={}) - Configuration.global.embed = type - Configuration.global.embed_in_root = true if options[:embed_in_root] || options[:include] - end - if RUBY_VERSION >= '2.0' def serializer_for(resource) if resource.respond_to?(:to_ary) @@ -54,7 +49,7 @@ module ActiveModel extend Forwardable - def_delegators :dsl, :attributes, :has_one, :has_many + def_delegators :dsl, :attributes, :has_one, :has_many, :embed def configuration @configuration ||= Configuration.global.build diff --git a/lib/active_model/serializer/dsl.rb b/lib/active_model/serializer/dsl.rb index ce5bdf1d..1c55887d 100644 --- a/lib/active_model/serializer/dsl.rb +++ b/lib/active_model/serializer/dsl.rb @@ -25,6 +25,11 @@ module ActiveModel associate Association::HasMany, *names end + def embed(type, options = {}) + Configuration.global.embed = type + Configuration.global.embed_in_root = true if options[:embed_in_root] || options[:include] + end + private def associate(klass, *names)