Skip to content

Commit 14d4bf7

Browse files
committed
Remove @include in favor of only using @include_directive
1 parent 247a7ac commit 14d4bf7

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

lib/jsonapi/acts_as_resource_controller.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ def create_response_document(operation_results)
137137
operation_results,
138138
{
139139
primary_resource_klass: resource_klass,
140-
include: @request ? @request.include : nil,
141140
include_directives: @request ? @request.include_directives : nil,
142141
fields: @request ? @request.fields : nil,
143142
base_url: base_url,

lib/jsonapi/request.rb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ def initialize(params = nil, options = {})
1313
@errors = []
1414
@operations = []
1515
@fields = {}
16-
@include = []
1716
@filters = {}
1817
@sort_criteria = [{field: 'id', direction: :asc}]
1918
@source_klass = nil
@@ -199,13 +198,13 @@ def parse_include_directives(include)
199198
included_resources = CSV.parse_line(include)
200199
return if included_resources.nil?
201200

202-
@include = []
201+
include = []
203202
included_resources.each do |included_resource|
204203
check_include(@resource_klass, included_resource.partition('.'))
205-
@include.push(unformat_key(included_resource).to_s)
204+
include.push(unformat_key(included_resource).to_s)
206205
end
207206

208-
@include_directives = JSONAPI::IncludeDirectives.new(@include)
207+
@include_directives = JSONAPI::IncludeDirectives.new(include)
209208
end
210209

211210
def parse_filters(filters)

lib/jsonapi/response_document.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ def status
2929
def serializer
3030
@serializer ||= JSONAPI::ResourceSerializer.new(
3131
@options.fetch(:primary_resource_klass),
32-
include: @options.fetch(:include, []),
3332
include_directives: @options[:include_directives],
3433
fields: @options[:fields],
3534
base_url: @options.fetch(:base_url, ''),

0 commit comments

Comments
 (0)