Skip to content

Commit 886218e

Browse files
authored
Fix Rubocop offenses (#92)
* Rubocop fix: Use filter_map instead of map { ... }.compact Currently, builds are failing because of Rubocop complaining about these three lines. * Drop support for Ruby 2.6 Array#filter_map is only introduced in Ruby 2.7. This ensures we're still supporting the 2.x series, but drops support for the now pretty old Ruby 2.6.
1 parent c3b32db commit 886218e

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ jobs:
88

99
strategy:
1010
matrix:
11-
ruby: [2.6, '3.0', '3.1', 3.2]
11+
ruby: [2.7, '3.0', '3.1', 3.2]
1212
rails: [6, 7]
1313
exclude:
14-
- ruby: '2.6'
14+
- ruby: '2.7'
1515
rails: 7
1616
- ruby: 3.2
1717
rails: 6

lib/jsonapi/deserialization.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def jsonapi_deserialize(document, options = {})
6565
rel_name = jsonapi_inflector.singularize(assoc_name)
6666

6767
if assoc_data.is_a?(Array)
68-
parsed["#{rel_name}_ids"] = assoc_data.map { |ri| ri['id'] }.compact
68+
parsed["#{rel_name}_ids"] = assoc_data.filter_map { |ri| ri['id'] }
6969
next
7070
end
7171

lib/jsonapi/fetching.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def jsonapi_fields
1717
end
1818

1919
params[:fields].each do |k, v|
20-
extracted[k] = v.to_s.split(',').map(&:strip).compact
20+
extracted[k] = v.to_s.split(',').filter_map(&:strip)
2121
end
2222

2323
extracted
@@ -29,7 +29,7 @@ def jsonapi_fields
2929
#
3030
# @return [Array]
3131
def jsonapi_include
32-
params['include'].to_s.split(',').map(&:strip).compact
32+
params['include'].to_s.split(',').filter_map(&:strip)
3333
end
3434
end
3535
end

0 commit comments

Comments
 (0)