Skip to content

Commit ace6e5b

Browse files
authored
Merge pull request #974 from hidde-jan/filter-nil-includes
Filter nil values from include param
2 parents 76608bb + 4b93707 commit ace6e5b

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
@@ -352,7 +352,7 @@ def parse_include_directives(resource_klass, raw_include)
352352

353353
return if included_resources.nil?
354354

355-
result = included_resources.map do |included_resource|
355+
result = included_resources.compact.map do |included_resource|
356356
check_include(resource_klass, included_resource.partition('.'))
357357
unformat_key(included_resource).to_s
358358
end

test/controllers/controller_test.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3629,6 +3629,11 @@ def test_complex_includes_base
36293629
assert_response :success
36303630
end
36313631

3632+
def test_complex_includes_filters_nil_includes
3633+
assert_cacheable_get :index, params: {include: ',,'}
3634+
assert_response :success
3635+
end
3636+
36323637
def test_complex_includes_two_level
36333638
assert_cacheable_get :index, params: {include: 'things,things.user'}
36343639

0 commit comments

Comments
 (0)