Skip to content

Commit f1a0eb2

Browse files
authored
Merge pull request #1 from Shelf-Life/ruby-3-compat
Add Ruby 3.0 compatibility
2 parents 1c7601f + 5eb0fcc commit f1a0eb2

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

Diff for: .travis.yml

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
script: bundle exec rspec spec
22
env:
33
matrix:
4-
- RAILS=5.2.4.3
5-
- RAILS=6.0.3.2
4+
- RAILS=5.2.4.6
5+
- RAILS=6.0.3.7
66
rvm:
7-
- 2.4.5
8-
- 2.5.5
9-
- 2.6.5
10-
- 2.7.0
11-
- 2.7.1
7+
- 2.4.10
8+
- 2.5.9
9+
- 2.6.7
10+
- 2.7.3
11+
- 3.0.1
1212
jobs:
1313
exclude:
14-
- rvm: 2.4.5
15-
env: RAILS=6.0.3.2
14+
- rvm: 2.4.10
15+
env: RAILS=6.0.3.7
16+
- rvm: 3.0.1
17+
env: RAILS=5.2.4.6

Diff for: Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ gemspec
88
group :test do
99
default_rails_version = "~> 5.2.4"
1010
rails_version = ENV['RAILS'] || default_rails_version
11+
gem 'sassc-rails'
1112
gem 'rails', rails_version
1213
gem 'rspec-rails'
1314
gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io

Diff for: lib/active_admin_import/importer.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def file
3737
end
3838

3939
def cycle(lines)
40-
@csv_lines = CSV.parse(lines.join, @csv_options)
40+
@csv_lines = CSV.parse(lines.join, **@csv_options)
4141
import_result.add(batch_import, lines.count)
4242
end
4343

@@ -115,7 +115,7 @@ def process_file
115115
batch_size = options[:batch_size].to_i
116116
File.open(file.path) do |f|
117117
# capture headers if not exist
118-
prepare_headers { CSV.parse(f.readline, @csv_options).first }
118+
prepare_headers { CSV.parse(f.readline, **@csv_options).first }
119119
f.each_line do |line|
120120
lines << line if line.present?
121121
if lines.size == batch_size || f.eof?

0 commit comments

Comments
 (0)