From a9d07cd68f0d2f3b5e3a33ba39a42ada6c5c25dd Mon Sep 17 00:00:00 2001
From: Lucas Hosseini <lucas.hosseini@gmail.com>
Date: Thu, 10 Sep 2015 04:02:06 +0200
Subject: [PATCH] Get rid of unnecessary instance variables, and implied
 dependencies.

---
 .../serializer/adapter/flatten_json.rb             |  3 +--
 lib/active_model/serializer/adapter/json.rb        | 14 +++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/active_model/serializer/adapter/flatten_json.rb b/lib/active_model/serializer/adapter/flatten_json.rb
index 7ed570349..e7bda1743 100644
--- a/lib/active_model/serializer/adapter/flatten_json.rb
+++ b/lib/active_model/serializer/adapter/flatten_json.rb
@@ -3,8 +3,7 @@ class Serializer
     class Adapter
       class FlattenJson < Json
         def serializable_hash(options = {})
-          super
-          @result
+          super.each_value.first
         end
 
         private
diff --git a/lib/active_model/serializer/adapter/json.rb b/lib/active_model/serializer/adapter/json.rb
index b3fa6e9c6..875326083 100644
--- a/lib/active_model/serializer/adapter/json.rb
+++ b/lib/active_model/serializer/adapter/json.rb
@@ -7,11 +7,11 @@ class Json < Adapter
         def serializable_hash(options = nil)
           options ||= {}
           if serializer.respond_to?(:each)
-            @result = serializer.map { |s| FlattenJson.new(s).serializable_hash(options) }
+            result = serializer.map { |s| FlattenJson.new(s).serializable_hash(options) }
           else
-            @hash = {}
+            hash = {}
 
-            @core = cache_check(serializer) do
+            core = cache_check(serializer) do
               serializer.attributes(options)
             end
 
@@ -21,13 +21,13 @@ def serializable_hash(options = nil)
 
               if serializer.respond_to?(:each)
                 array_serializer = serializer
-                @hash[association.key] = array_serializer.map do |item|
+                hash[association.key] = array_serializer.map do |item|
                   cache_check(item) do
                     item.attributes(opts)
                   end
                 end
               else
-                @hash[association.key] =
+                hash[association.key] =
                   if serializer && serializer.object
                     cache_check(serializer) do
                       serializer.attributes(options)
@@ -37,10 +37,10 @@ def serializable_hash(options = nil)
                   end
               end
             end
-            @result = @core.merge @hash
+            result = core.merge hash
           end
 
-          { root => @result }
+          { root => result }
         end
 
         def fragment_cache(cached_hash, non_cached_hash)