ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-23 06:16:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Get rid of unnecessary instance variables, and implied dependencies.
This commit is contained in:
L. Preston Sego III 2015-09-12 11:51:38 -04:00
commit b594d1487b
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/active_model/serializer/adapter/flatten_json.rb
View File

@ -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

14
lib/active_model/serializer/adapter/json.rb
View File

@ -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 @@ class ActiveModel::Serializer::Adapter::Json < ActiveModel::Serializer::Adapter
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 @@ class ActiveModel::Serializer::Adapter::Json < ActiveModel::Serializer::Adapter
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)