ditkrg/active_model_serializers
5
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-25 07:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

add fields to adapter initialize function, pull in master, add tests using includes with fields

Browse Source
This commit is contained in:
Aaron Renoir
2014-11-05 18:10:37 -08:00
parent c9c58e31e5
commit fc1562c04a
7 changed files with 31 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,15 +7,20 @@ module ActiveModel
serializer.root = true
@hash = {}
@top = @options.fetch(:top) { @hash }
if fields = options.delete(:fields)
@fieldset = ActiveModel::Serializer::Fieldset.new(fields, serializer.json_key)
else
@fieldset = options[:fieldset]
end
end
def serializable_hash(options = {})
@root = (@options[:root] || serializer.json_key.to_s.pluralize).to_sym
@fieldset = options[:fieldset]
if serializer.respond_to?(:each)
@hash[@root] = serializer.map do |s|
self.class.new(s, @options.merge(top: @top)).serializable_hash[@root]
self.class.new(s, @options.merge(top: @top, fieldset: @fieldset)).serializable_hash[@root]
end
else
@hash[@root] = attributes_for_serializer(serializer, @options)
@@ -94,7 +99,6 @@ module ActiveModel
private
def attributes_for_serializer(serializer, options)
if fields = @fieldset && @fieldset.fields_for(serializer)
options[:fields] = fields
end