Skip to content

Commit c34dc87

Browse files
committed
Prevent creation of unnecessary fieldset(mirror and revise changes from #2370)
Co-authored-by: https://github.com/abcang
1 parent 9fa9373 commit c34dc87

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

lib/active_model_serializers/adapter/attributes.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ module Adapter
55
class Attributes < Base
66
def initialize(*)
77
super
8-
instance_options[:fieldset] ||= ActiveModel::Serializer::Fieldset.new(fields_to_fieldset(instance_options.delete(:fields)))
8+
9+
instance_options[:fieldset] ||= begin
10+
fieldset = fields_to_fieldset(instance_options.delete(:fields))
11+
fieldset && ActiveModel::Serializer::Fieldset.new(fieldset)
12+
end
913
end
1014

1115
def serializable_hash(options = nil)

lib/active_model_serializers/adapter/json_api.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def self.fragment_cache(cached_hash, non_cached_hash, root = true)
5353
def initialize(serializer, options = {})
5454
super
5555
@include_directive = JSONAPI::IncludeDirective.new(options[:include], allow_wildcard: true)
56-
@fieldset = options[:fieldset] || ActiveModel::Serializer::Fieldset.new(options.delete(:fields))
56+
@fieldset = options[:fieldset] || ((option_fields = options.delete(:fields)) && ActiveModel::Serializer::Fieldset.new(option_fields))
5757
end
5858

5959
# {http://jsonapi.org/format/#crud Requests are transactional, i.e. success or failure}
@@ -348,7 +348,8 @@ def data_for(serializer, include_slice)
348348
data.tap do |resource_object|
349349
next if resource_object.nil?
350350
# NOTE(BF): the attributes are cached above, separately from the relationships, below.
351-
requested_associations = fieldset.fields_for(resource_object[:type]) || '*'
351+
requested_fields = fieldset && fieldset.fields_for(resource_object[:type])
352+
requested_associations = requested_fields || '*'
352353
relationships = relationships_for(serializer, requested_associations, include_slice)
353354
resource_object[:relationships] = relationships if relationships.any?
354355
end

0 commit comments

Comments
 (0)