Merge pull request rails-api#1132 from beauby/fix-flatten-json

Get rid of unnecessary instance variables, and implied dependencies.

Author: NullVoxPopuli

lib/active_model/serializer/adapter/flatten_json.rb

@@ -1,7 +1,6 @@
 class ActiveModel::Serializer::Adapter::FlattenJson < ActiveModel::Serializer::Adapter::Json
         def serializable_hash(options = {})
-          super
-          @result
+          super.each_value.first
         end
 
         private

lib/active_model/serializer/adapter/json.rb

@@ -5,11 +5,11 @@ class ActiveModel::Serializer::Adapter::Json < ActiveModel::Serializer::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
 
@@ -19,13 +19,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)
@@ -35,10 +35,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)