From 0b9f69529f65bef0662502a96de7a19cc221fe06 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Tue, 14 May 2013 17:05:41 -0700
Subject: [PATCH] Add default_embed_options

---
 lib/active_model/serializer.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index 02a25c56..4fec41a5 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -377,9 +377,8 @@ module ActiveModel
           Associations::HasOne
         end
 
+      options = default_embed_options.merge!(options)
       options[:value] ||= send(name)
-      options[:embed] = _embed unless options.key?(:embed)
-      options[:include] = _root_embed unless options.key?(:include)
       association = association_class.new(name, options, self.options)
 
       if association.embed_ids?
@@ -452,6 +451,15 @@ module ActiveModel
       event_name = INSTRUMENT[name]
       ActiveSupport::Notifications.instrument(event_name, payload, &block)
     end
+
+    private
+
+    def default_embed_options
+      {
+        :embed   => _embed,
+        :include => _root_embed
+      }
+    end
   end
 
   # DefaultSerializer