Skip to content

Commit 144d487

Browse files
hidde-janlgebhardt
authored andcommitted
Filter nil values from include param
(cherry picked from commit 4b93707)
1 parent 6845212 commit 144d487

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

lib/jsonapi/request_parser.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ def parse_include_directives(raw_include)
226226

227227
return if included_resources.empty?
228228

229-
result = included_resources.map do |included_resource|
229+
result = included_resources.compact.map do |included_resource|
230230
check_include(@resource_klass, included_resource.partition('.'))
231231
unformat_key(included_resource).to_s
232232
end

test/controllers/controller_test.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3642,6 +3642,11 @@ def test_complex_includes_base
36423642
assert_response :success
36433643
end
36443644

3645+
def test_complex_includes_filters_nil_includes
3646+
assert_cacheable_get :index, params: {include: ',,'}
3647+
assert_response :success
3648+
end
3649+
36453650
def test_complex_includes_two_level
36463651
assert_cacheable_get :index, params: {include: 'things,things.user'}
36473652

0 commit comments

Comments
 (0)