File tree Expand file tree Collapse file tree 2 files changed +8
-9
lines changed
lib/active_model/serializer/adapter Expand file tree Collapse file tree 2 files changed +8
-9
lines changed Original file line number Diff line number Diff line change @@ -3,8 +3,7 @@ class Serializer
3
3
class Adapter
4
4
class FlattenJson < Json
5
5
def serializable_hash ( options = { } )
6
- super
7
- @result
6
+ super . each_value . first
8
7
end
9
8
10
9
private
Original file line number Diff line number Diff line change @@ -7,11 +7,11 @@ class Json < Adapter
7
7
def serializable_hash ( options = nil )
8
8
options ||= { }
9
9
if serializer . respond_to? ( :each )
10
- @ result = serializer . map { |s | FlattenJson . new ( s ) . serializable_hash ( options ) }
10
+ result = serializer . map { |s | FlattenJson . new ( s ) . serializable_hash ( options ) }
11
11
else
12
- @ hash = { }
12
+ hash = { }
13
13
14
- @ core = cache_check ( serializer ) do
14
+ core = cache_check ( serializer ) do
15
15
serializer . attributes ( options )
16
16
end
17
17
@@ -21,13 +21,13 @@ def serializable_hash(options = nil)
21
21
22
22
if serializer . respond_to? ( :each )
23
23
array_serializer = serializer
24
- @ hash[ association . key ] = array_serializer . map do |item |
24
+ hash [ association . key ] = array_serializer . map do |item |
25
25
cache_check ( item ) do
26
26
item . attributes ( opts )
27
27
end
28
28
end
29
29
else
30
- @ hash[ association . key ] =
30
+ hash [ association . key ] =
31
31
if serializer && serializer . object
32
32
cache_check ( serializer ) do
33
33
serializer . attributes ( options )
@@ -37,10 +37,10 @@ def serializable_hash(options = nil)
37
37
end
38
38
end
39
39
end
40
- @ result = @ core. merge @ hash
40
+ result = core . merge hash
41
41
end
42
42
43
- { root => @ result }
43
+ { root => result }
44
44
end
45
45
46
46
def fragment_cache ( cached_hash , non_cached_hash )
You can’t perform that action at this time.
0 commit comments