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

Fix style.

Browse Source
This commit is contained in:
Lucas Hosseini 2015-09-06 19:18:36 +02:00
parent 070a2e63bd
commit f27f13ccc1
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/active_model/serializer/adapter/json_api.rb
View File

@ -14,7 +14,8 @@ module ActiveModel
@options[:include] = @options[:include].split(',')
end
if fields = options.delete(:fields)
fields = options.delete(:fields)
if fields
@fieldset = ActiveModel::Serializer::Fieldset.new(fields, serializer.json_key)
else
@fieldset = options[:fieldset]
@ -48,7 +49,7 @@ module ActiveModel
def fragment_cache(cached_hash, non_cached_hash)
root = false if @options.include?(:include)
JsonApi::FragmentCache.new().fragment_cache(root, cached_hash, non_cached_hash)
JsonApi::FragmentCache.new.fragment_cache(root, cached_hash, non_cached_hash)
end
private
@ -103,8 +104,6 @@ module ActiveModel
options[:virtual_value]
elsif serializer && serializer.object
resource_identifier_for(serializer)
else
nil
end
end
end
@ -121,8 +120,8 @@ module ActiveModel
if serializer.respond_to?(:each)
serializer.flat_map { |s| _included_for(resource_name, s, parent) }.uniq
else
return [] unless serializer && serializer.object
result = []
if serializer && serializer.object
resource_path = [parent, resource_name].compact.join('.')
if include_assoc?(resource_path)
@ -133,14 +132,13 @@ module ActiveModel
end
if include_nested_assoc?(resource_path)
serializer.associations.each do |association|
if association.serializer
non_empty_associations = serializer.associations.select(&:serializer)
non_empty_associations.each do |association|
result.concat(_included_for(association.key, association.serializer, resource_path))
result.uniq!
end
end
end
end
result
end
end
@ -160,9 +158,7 @@ module ActiveModel
def add_links(options)
links = @hash.fetch(:links) { {} }
collection = serializer.object
if is_paginated?(collection)
@hash[:links] = add_pagination_links(links, collection, options)
end
@hash[:links] = add_pagination_links(links, collection, options) if paginated?(collection)
end
def add_pagination_links(links, collection, options)
@ -170,7 +166,7 @@ module ActiveModel
links.update(pagination_links)
end
def is_paginated?(collection)
def paginated?(collection)
collection.respond_to?(:current_page) &&
collection.respond_to?(:total_pages) &&
collection.respond_to?(:size)