From 203887e6130965bc1199430bb151c185c56d79bb Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Thu, 16 Jan 2014 13:55:48 -0200
Subject: [PATCH] Move include stuff close to the deprecation warn for easier
 removal in future

---
 lib/active_model/serializer/associations.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/active_model/serializer/associations.rb b/lib/active_model/serializer/associations.rb
index a8306b80..dbf6dd2d 100644
--- a/lib/active_model/serializer/associations.rb
+++ b/lib/active_model/serializer/associations.rb
@@ -9,12 +9,13 @@ module ActiveModel
           ActiveSupport::Deprecation.warn <<-WARN
 ** Notice: include was renamed to embed_in_root. **
           WARN
+          options[:embed_in_root] = options.fetch(:embed_in_root) { options.delete(:include) }
         end
 
         @name          = name.to_s
         @options       = options
         self.embed     = options.fetch(:embed) { configuration.embed }
-        @embed_in_root = options.fetch(:embed_in_root) { options.fetch(:include) { configuration.embed_in_root } }
+        @embed_in_root = options.fetch(:embed_in_root) { configuration.embed_in_root }
         @embed_key     = options[:embed_key] || :id
         @key           = options[:key]
         @embedded_key  = options[:root] || name