From 0f4547eb77abcbe96659ec0bebcf88c8d4ca64e8 Mon Sep 17 00:00:00 2001
From: Adrian Mugnolo and Santiago Pastorino <adrian+santiago@wyeworks.com>
Date: Tue, 17 Dec 2013 16:11:17 -0200
Subject: [PATCH] Rename method to serializable_object

---
 lib/active_model/array_serializer.rb        | 4 ++--
 lib/active_model/serializer.rb              | 4 ++--
 lib/active_model/serializer/associations.rb | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/active_model/array_serializer.rb b/lib/active_model/array_serializer.rb
index 1fce09e3..cc2f310d 100644
--- a/lib/active_model/array_serializer.rb
+++ b/lib/active_model/array_serializer.rb
@@ -35,12 +35,12 @@ module ActiveModel
       serializer_class.new(item, @options)
     end
 
-    def serializable_array
+    def serializable_object
       @object.map do |item|
         serializer_for(item).serializable_object
       end
     end
-    alias_method :serializable_object, :serializable_array
+    alias_method :serializable_array, :serializable_object
 
     def embedded_in_root_associations
       @object.each_with_object({}) do |item, hash|
diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index 5a46858b..fbf4623b 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -169,12 +169,12 @@ end
       end
     end
 
-    def serializable_hash(options={})
+    def serializable_object(options={})
       return nil if object.nil?
       hash = attributes
       hash.merge! associations
       @options[:_wrap_in_array] ? [hash] : hash
     end
-    alias_method :serializable_object, :serializable_hash
+    alias_method :serializable_hash, :serializable_object
   end
 end
diff --git a/lib/active_model/serializer/associations.rb b/lib/active_model/serializer/associations.rb
index 65e06259..91544721 100644
--- a/lib/active_model/serializer/associations.rb
+++ b/lib/active_model/serializer/associations.rb
@@ -13,7 +13,7 @@ module ActiveModel
 
         @name          = name.to_s
         @options       = options
-        self.embed     = options.fetch(:embed)   { CONFIG.embed }
+        self.embed     = options.fetch(:embed) { CONFIG.embed }
         @embed_in_root = options.fetch(:embed_in_root) { options.fetch(:include) { CONFIG.embed_in_root } }
         @embed_key     = options[:embed_key] || :id
         @key           = options[:key]