Get rid of unnecessary instance variables, and implied dependencies.

This commit is contained in:
Lucas Hosseini 2015-09-10 04:02:06 +02:00
parent c03427dc5c
commit a9d07cd68f
2 changed files with 8 additions and 9 deletions

View File

@ -3,8 +3,7 @@ module ActiveModel
class Adapter class Adapter
class FlattenJson < Json class FlattenJson < Json
def serializable_hash(options = {}) def serializable_hash(options = {})
super super.each_value.first
@result
end end
private private

View File

@ -7,11 +7,11 @@ module ActiveModel
def serializable_hash(options = nil) def serializable_hash(options = nil)
options ||= {} options ||= {}
if serializer.respond_to?(:each) 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 else
@hash = {} hash = {}
@core = cache_check(serializer) do core = cache_check(serializer) do
serializer.attributes(options) serializer.attributes(options)
end end
@ -21,13 +21,13 @@ module ActiveModel
if serializer.respond_to?(:each) if serializer.respond_to?(:each)
array_serializer = serializer array_serializer = serializer
@hash[association.key] = array_serializer.map do |item| hash[association.key] = array_serializer.map do |item|
cache_check(item) do cache_check(item) do
item.attributes(opts) item.attributes(opts)
end end
end end
else else
@hash[association.key] = hash[association.key] =
if serializer && serializer.object if serializer && serializer.object
cache_check(serializer) do cache_check(serializer) do
serializer.attributes(options) serializer.attributes(options)
@ -37,10 +37,10 @@ module ActiveModel
end end
end end
end end
@result = @core.merge @hash result = core.merge hash
end end
{ root => @result } { root => result }
end end
def fragment_cache(cached_hash, non_cached_hash) def fragment_cache(cached_hash, non_cached_hash)