Skip to content

Support for a non UTF-8 file when zip uploading #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 10, 2020
Merged

Support for a non UTF-8 file when zip uploading #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/active_admin_import/model.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def encode_file

def unzip_file
Zip::File.open(file_path) do |zip_file|
self.file = Tempfile.new(CONST::TMP_FILE)
self.file = Tempfile.new(CONST::TMP_FILE, binmode: true)
data = zip_file.entries.select(&:file?).first.get_input_stream.read
file << data
file.close
Expand Down
14 changes: 14 additions & 0 deletions spec/import_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,20 @@ def upload_file!(name, ext = 'csv')
end
end
end

context 'when zipped with Win1251 file' do
let(:options) do
attributes = { force_encoding: :auto }
{ template_object: ActiveAdminImport::Model.new(attributes) }
end
it 'should import file' do
with_zipped_csv(:authors_win1251_win_endline) do
upload_file!(:authors_win1251_win_endline, :zip)
expect(page).to have_content 'Successfully imported 2 authors'
expect(Author.count).to eq(2)
end
end
end
end

context 'with different header attribute names' do
Expand Down