active_admin_import 3.0.0.pre → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46875662660bbc61d8dce4fa218234229d0c94d7
-  data.tar.gz: ba7347ef7348492d137e459e52a3430d5607f051
+  metadata.gz: 1a7b928539df8bb150300b72b8b2a0971a31a2a9
+  data.tar.gz: 8144a8f48472cce96498a3fd5ce1a5b4c1b530ce
 SHA512:
-  metadata.gz: 390733a4c6297317e6ab84c0528d05a65e93b422c1ac84961cd38f302a3f859d5303852a937dbf88762e599a8b5d4d845f8597cdcfc50a9ed3f43e1125d86192
-  data.tar.gz: 459e49db7a02bdca7c5fa53d9cad1b7b8e2937ff2e223b479ee7551a8cd9b7e6993f5b4968c1a5c86e33f206467075afd9d7c7bb7c868906f4af050cae2b2754
+  metadata.gz: e04cb45397a7b3540d2c5302d99e154172cc08055dfb0a4f9d1311f48f56133c8928b5b85fe3d50a4d14f0c280f844e4e1b05c7f600b670c0e7dba7813ea0883
+  data.tar.gz: 175dc4931d433f53aedba0ec57d7a004c6e0c18f268ed1f8af711d70350e2e20e8e3e9cafa4c3c97a1df349036d3f54ecdb9b4fda964fd046376a8406e366a25

data/.rubocop.yml

@@ -0,0 +1,43 @@
+AllCops:
+  TargetRubyVersion: 2.3
+  Exclude:
+    - 'spec/fixtures/**/*'
+
+Style/IndentationWidth:
+  Width: 2
+
+Style/Documentation:
+  Enabled: false
+
+Style/Encoding:
+  Enabled: false
+
+Style/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
+Style/FirstParameterIndentation:
+  EnforcedStyle: special_for_inner_method_call_in_parentheses
+
+Metrics/AbcSize:
+  Max: 25
+
+Metrics/LineLength:
+  Max: 120
+
+Metrics/MethodLength:
+  Max: 40
+
+Metrics/ClassLength:
+  Max: 250
+
+Metrics/ModuleLength:
+  Max: 250
+
+Metrics/CyclomaticComplexity:
+  Max: 8
+
+Metrics/PerceivedComplexity:
+  Max: 8
+
+Rails:
+  Enabled: true

data/.travis.yml

@@ -1,9 +1,17 @@
 script: bundle exec rspec spec
+env:
+  matrix:
+    - RAILS=4.2.6
+    - RAILS=5.0.0
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.5
-  - 2.2.0
+  - 2.1.9
+  - 2.2.5
+  - 2.3.1
+matrix:
+  exclude:
+    - rvm: 2.1.9
+      env: RAILS=5.0.0 # Rails 5.0 requires Ruby 2.2.2 or newer
 before_install:
-  - gem update --system
-  - gem --version
+  - gem update --system # use the very latest Rubygems
+  - rvm @global do gem uninstall bundler -a -x
+  - rvm @global do gem install bundler -v 1.14.6 # latest version known to work

data/Gemfile

@@ -1,20 +1,20 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in active_admin_importable.gemspec
 gemspec
+
+
 group :test do
-  gem 'rails',  '4.1.9'
+  default_rails_version = '4.2.8'
+  rails_version = ENV['RAILS'] || default_rails_version
+  gem 'rails', rails_version
   gem 'rspec-rails'
-  gem 'activeadmin', github: 'activeadmin'  , ref: '54bede0558a99ab759f98f9b24e1b0144063a81e'
-
   gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
-
-  gem 'devise'
-  gem 'sass-rails'
   gem 'sqlite3'
   gem 'launchy'
   gem 'database_cleaner'
   gem 'capybara'
-  gem 'selenium-webdriver'
   gem 'poltergeist'
-end
+  gem 'jquery-ui-rails', '~> 5.0'
+end

data/README.md

@@ -1,18 +1,16 @@
-# ActiveAdminImport 
+# ActiveAdminImport
 [The most fastest and efficient CSV import for Active Admin
 with support of validations, bulk inserts and encodings handling](http://activeadmin-plugins.github.io/active_admin_import/)
- 
 
 
-[![Build Status](https://img.shields.io/travis/activeadmin-plugins/active_admin_import.svg)](https://travis-ci.org/activeadmin-pluginsl/active_admin_import)
+
+[![Build Status](https://img.shields.io/travis/activeadmin-plugins/active_admin_import.svg)](https://travis-ci.org/activeadmin-plugins/active_admin_import)
 [![Dependency Status](http://img.shields.io/gemnasium/activeadmin-plugins/active_admin_import.svg)](https://gemnasium.com/activeadmin-plugins/active_admin_import)
 [![Coverage Status](https://coveralls.io/repos/activeadmin-plugins/active_admin_import/badge.svg)](https://coveralls.io/r/activeadmin-plugins/active_admin_import)
-
-[![Code Climate](http://img.shields.io/codeclimate/github/activeadmin-plugins/active_admin_import.svg)](https://codeclimate.com/github/activeadmin-plugins/active_admin_import)
+[![Code Climate](https://codeclimate.com/github/activeadmin-plugins/active_admin_import/badges/gpa.svg)](https://codeclimate.com/github/activeadmin-plugins/active_admin_import)
 [![Gem Version](http://img.shields.io/gem/v/active_admin_import.svg)](https://rubygems.org/gems/active_admin_import)
 [![License](http://img.shields.io/:license-mit-blue.svg)](http://Fivell.mit-license.org)
 
-master can be used with AA 1.0.0 and Rails >= 4.1
 
 
 #Installation
@@ -20,7 +18,7 @@ master can be used with AA 1.0.0 and Rails >= 4.1
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "active_admin_import" , '2.1.2'
+gem "active_admin_import" , '3.0.0'
 
 ```
 or
@@ -47,7 +45,7 @@ And then execute:
   <li> and more...</li>
 </ol>
 
-   
+
 
 #### Basic usage
 
@@ -61,24 +59,26 @@ end
 #### Options
 Tool                    | Description
 ---------------------   | -----------
-:back					|resource action to redirect after processing
-:csv_options			|hash with column separator, row separator, etc 
-:validate				|bool means perform validations or not
-:batch_size				|integer value of max  record count inserted by 1 query/transaction
+:back                   |resource action to redirect after processing
+:csv_options            |hash with column separator, row separator, etc
+:validate               |bool means perform validations or not
+:batch_size             |integer value of max  record count inserted by 1 query/transaction
 :batch_transaction    |bool (false by default), if transaction is used when batch importing and works when :validate is set to true
-:before_import			|proc for before import action, hook called with  importer object
-:after_import			|proc for after import action, hook called with  importer object
-:before_batch_import	|proc for before each batch action, called with  importer object
-:after_batch_import		|proc for after each batch action, called with  importer object
-:on_duplicate_key_update|an Array or Hash, tells activerecord-import to use MySQL's ON DUPLICATE KEY UPDATE ability.
-:timestamps				|bool, tells activerecord-import to not add timestamps (if false) even if record timestamps is disabled in ActiveRecord::Base
-:ignore					|bool, tells activerecord-import toto use MySQL's INSERT IGNORE ability
-:template				|custom template rendering
-:template_object		|object passing to view
-:resource_class			|resource class name
-:resource_label			|resource label value
-:plural_resource_label	|pluralized resource label value (default config.plural_resource_label)
-:headers_rewrites		|hash with key (csv header) - value (db column name) rows mapping
+:before_import          |proc for before import action, hook called with  importer object
+:after_import           |proc for after import action, hook called with  importer object
+:before_batch_import    |proc for before each batch action, called with  importer object
+:after_batch_import     |proc for after each batch action, called with  importer object
+:on_duplicate_key_update|an Array or Hash, tells activerecord-import to use MySQL's ON DUPLICATE KEY UPDATE or Postgres 9.5+ ON CONFLICT DO UPDATE ability.
+:timestamps             |bool, tells activerecord-import to not add timestamps (if false) even if record timestamps is disabled in ActiveRecord::Base
+:ignore                 |bool, tells activerecord-import to use MySQL's INSERT IGNORE ability
+:template               |custom template rendering
+:template_object        |object passing to view
+:resource_class         |resource class name
+:resource_label         |resource label value
+:plural_resource_label  |pluralized resource label value (default config.plural_resource_label)
+:error_limit            |Limit the number of errors reported (default `5`, set to `nil` for all)
+:headers_rewrites       |hash with key (csv header) - value (db column name) rows mapping
+:if                     |Controls whether the 'Import' button is displayed. It supports a proc to be evaluated into a boolean value within the activeadmin render context.
 
 
 
@@ -104,11 +104,3 @@ Tool                  | Description
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
-
-
-
-
-
-
-
-

data/Rakefile

@@ -1,7 +1,8 @@
-require "bundler"
+# frozen_string_literal: true
+require 'bundler'
 require 'rake'
 Bundler.setup
 Bundler::GemHelper.install_tasks
 
 # Import all our rake tasks
-FileList['tasks/**/*.rake'].each { |task| import task }
+FileList['tasks/**/*.rake'].each { |task| import task }

data/active_admin_import.gemspec

@@ -1,25 +1,22 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 require File.expand_path('../lib/active_admin_import/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors = ["Igor Fedoronchuk"]
-  gem.email = ["fedoronchuk@gmail.com"]
-  gem.description = "The most efficient way to import for Active Admin"
-  gem.summary = "ActiveAdmin import based on activerecord-import gem."
-  gem.homepage = "http://github.com/Fivell/active_admin_import"
+  gem.authors = ['Igor Fedoronchuk']
+  gem.email = ['fedoronchuk@gmail.com']
+  gem.description = 'The most efficient way to import for Active Admin'
+  gem.summary = 'ActiveAdmin import based on activerecord-import gem.'
+  gem.homepage = 'http://github.com/Fivell/active_admin_import'
   gem.license = 'MIT'
-  gem.files = `git ls-files`.split($\)
+  gem.files = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
   gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name = "active_admin_import"
-  gem.require_paths = ["lib"]
-  gem.version = ActiveAdminImport::VERSION 
-
-
-  gem.add_runtime_dependency 'activerecord-import', '~> 0.8.0'
-  gem.add_runtime_dependency 'rchardet', '~> 1.5'
-
-  gem.add_runtime_dependency 'rubyzip', '~> 1.0', '>= 1.0.0'
-  gem.add_dependency "rails", ">= 4.0"
-
+  gem.name = 'active_admin_import'
+  gem.require_paths = ['lib']
+  gem.version = ActiveAdminImport::VERSION
+  gem.add_runtime_dependency 'activerecord-import', '~> 0.17.0'
+  gem.add_runtime_dependency 'rchardet', '~> 1.6'
+  gem.add_runtime_dependency 'rubyzip', '~> 1.2'
+  gem.add_dependency 'activeadmin', '~> 1.0'
 end

data/config/locales/fr.yml

@@ -0,0 +1,23 @@
+fr:
+  active_admin:
+    import: "Importer"
+  active_admin_import:
+    file: 'Fichier'
+    file_error: "Erreur: %{message}"
+    file_format_error: "Vous ne pouvez importer qu'un fichier csv valide"
+    file_empty_error: "Vous ne pouvez pas importer de ficher vide"
+    no_file_error: "Veuillez sélectionner un fichier"
+    details: "Veuillez sélectionner un fichier à importer"
+    imported:
+      one: "Importé 1 %{model} avec succès"
+      other: "Importé %{count} %{plural_model} avec succès"
+    failed:
+      one: "Impossible d'importer 1 %{model}: %{message}"
+      other: "Impossible d'importer %{count} %{plural_model}: %{message}"
+    import_model: "Importer %{plural_model}"
+    import_btn: "Importer"
+    import_btn_disabled: "Veuillez patienter..."
+    csv_options: "Options CSV"
+    col_sep: 'Sép de col'
+    row_sep: 'Sep de ligne'
+    quote_char: 'Guillemets'

data/config/locales/ja.yml

@@ -0,0 +1,24 @@
+ja:
+  active_admin:
+    import: "インポート"
+  active_admin_import:
+    file: "ファイル"
+    file_error: "エラー: %{message}"
+    file_format_error: "有効なCSVファイルでないとインポートできません"
+    file_empty_error: "空ファイルはインポートできません"
+    no_file_error: "インポートするファイルを選択してください"
+    details: "インポートするファイルを選択してください"
+    imported:
+      one: "1つの%{model}のインポートに成功しました"
+      other: "%{count}つの%{plural_model}のインポートに成功しました"
+    failed:
+      one: "1つの%{model}のインポートに失敗しました: %{message}"
+      other: "%{count}つの%{plural_model}のインポートに失敗しました: %{message}"
+    import_model: "%{plural_model}をインポートする"
+    import_btn: "インポート"
+    import_btn_disabled: "お待ちください..."
+    csv_options: "CSVオプション"
+    col_sep: "カラム区切り"
+    row_sep: "行区切り"
+    quote_char: "クォート文字"
+

data/config/locales/ko.yml

@@ -0,0 +1,23 @@
+ko:
+  active_admin:
+    import: "가져오기"
+  active_admin_import:
+    file: '파일'
+    file_error: "오류: %{message}"
+    file_format_error: "CSV 파일만 가져오기 할 수 있습니다"
+    file_empty_error: "파일을 추가해주세요"
+    no_file_error: "파일을 추가해주세요"
+    details: "가져오기할 파일을 추가해주세요"
+    imported:
+      one: "1개의 %{model}을 가져왔습니다"
+      other: "%{count}개의 %{plural_model}을 가져왔습니다"
+    failed:
+      one:   "1개의 %{model} 가져오기 실패 : %{message}"
+      other: "%{count}개의 %{plural_model} 가져오기 실패: %{message}"
+    import_model: "%{plural_model} 가져오기"
+    import_btn: "가져오기"
+    import_btn_disabled: "가져오는 중입니다..."
+    csv_options: "CSV 옵션"
+    col_sep: '열 sep'
+    row_sep: '행 sep'
+    quote_char: 'Quote char'

data/config/locales/pt-BR.yml

@@ -0,0 +1,23 @@
+pt-BR:
+  active_admin:
+    import: "Importar"
+  active_admin_import:
+    file: 'Arquivo'
+    file_error: "Error: %{message}"
+    file_format_error: "Você só pode importar arquivos csv válidos"
+    file_empty_error: "Você não pode importar arquivos vázios"
+    no_file_error: "Por favor, selecione o arquivo para importar"
+    details: "Por favor, selecione o arquivo para importar"
+    imported:
+      one: "Importado com sucesso 1 %{model}"
+      other: "Importado com sucesso %{count} %{plural_model}"
+    failed:
+      one:   "Não foi possível importar 1 %{model}: %{message}"
+      other: "Não foi possível importar %{count} %{plural_model}: %{message}"
+    import_model: "Importar %{plural_model}"
+    import_btn: "Importar"
+    import_btn_disabled: "Aguarde..."
+    csv_options: "opções CSV"
+    col_sep: 'Col sep'
+    row_sep: 'Row sep'
+    quote_char: 'Quote char'

data/config/locales/ru.yml

@@ -0,0 +1,27 @@
+ru:
+  active_admin:
+    import: "Импорт"
+  active_admin_import:
+    file: 'Файл'
+    file_error: "Ошибка: %{message}"
+    file_format_error: "Файл должен быть корректно сформатированным CSV-файлом"
+    file_empty_error: "Файл пуст"
+    no_file_error: "Выберите файл для импорта"
+    details: "Выберите файл для импорта"
+    imported:
+      one: "Успешно импортировано: 1 %{model}"
+      few: "Успешно импортировано: %{count} %{plural_model}"
+      many: "Успешно импортировано: %{count} %{plural_model}"
+      other: "Успешно импортировано: %{count} %{plural_model}"
+    failed:
+      one:   "Не удалось импортировать: 1 %{model}: %{message}"
+      few: "Не удалось импортировать: %{count} %{plural_model}: %{message}"
+      many: "Не удалось импортировать: %{count} %{plural_model}: %{message}"
+      other: "Не удалось импортировать: %{count} %{plural_model}: %{message}"
+    import_model: "Импорт %{plural_model}"
+    import_btn: "Импортировать"
+    import_btn_disabled: "Подождите..."
+    csv_options: "Параметры CSV"
+    col_sep: 'Разделитель колонок'
+    row_sep: 'Разделитель строк'
+    quote_char: 'Обособляющий символ'

data/config/locales/uk.yml

@@ -0,0 +1,27 @@
+uk:
+  active_admin:
+    import: "Імпорт"
+  active_admin_import:
+    file: "Файл"
+    file_error: "Помилка: %{message}"
+    file_format_error: "Файл повинен бути коректно форматованим CSV-файлом"
+    file_empty_error: "Файл порожній"
+    no_file_error: "Виберіть файл для імпорту"
+    details: "Виберіть файл для імпорту"
+    imported:
+      one: "Успішно імпортовано: 1 %{model}"
+      few: "Успішно імпортовано: %{count} %{plural_model}"
+      many: "Успішно імпортовано: %{count} %{plural_model}"
+      other: "Успішно імпортовано: %{count} %{plural_model}"
+    failed:
+      one:   "Не вдалося імпортувати: 1 %{model}: %{message}"
+      few: "Не вдалося імпортувати: %{count} %{plural_model}: %{message}"
+      many: "Не вдалося імпортувати: %{count} %{plural_model}: %{message}"
+      other: "Не вдалося імпортувати: %{count} %{plural_model}: %{message}"
+    import_model: "Імпорт %{plural_model}"
+    import_btn: "Імпортувати"
+    import_btn_disabled: "Зачекайте..."
+    csv_options: "Параметри CSV"
+    col_sep: "Роздільник колонок"
+    row_sep: "Роздільник рядків"
+    quote_char: "Відокремлювальний символ"

data/lib/active_admin_import.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'activerecord-import'
 require 'active_admin'
 require 'active_admin_import/version'
@@ -9,5 +10,3 @@ require 'active_admin_import/importer'
 require 'active_admin_import/model'
 require 'active_admin_import/authorization'
 ::ActiveAdmin::DSL.send(:include, ActiveAdminImport::DSL)
-
-

data/lib/active_admin_import/authorization.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdminImport
   # Default Authorization permission for ActiveAdminImport
   module Authorization

data/lib/active_admin_import/dsl.rb

@@ -1,48 +1,55 @@
+# frozen_string_literal: true
 module ActiveAdminImport
+  # Declares import functionality
+  #
+  # Options
+  # +back+:: resource action to redirect after processing
+  # +csv_options+:: hash to override default CSV options
+  # +batch_size+:: integer value of max  record count inserted by 1 query/transaction
+  # +batch_transaction+:: bool (false by default), if transaction is used when batch importing
+  #  and works when :validate is set to true
+  # +before_import+:: proc for before import action, hook called with  importer object
+  # +after_import+:: proc for after import action, hook called with  importer object
+  # +before_batch_import+:: proc for before each batch action, called with  importer object
+  # +after_batch_import+:: proc for after each batch action, called with  importer object
+  # +validate+:: true|false, means perform validations or not
+  # +on_duplicate_key_update+:: an Array or Hash, tells activerecord-import
+  # to use MySQL's ON DUPLICATE KEY UPDATE ability.
+  # +timestamps+::  true|false, tells activerecord-import to not add timestamps (if false)
+  #  even if record timestamps is disabled in ActiveRecord::Base
+  # +ignore+::  true|false, tells activerecord-import to use MySQL's INSERT IGNORE ability
+  # +template+:: custom template rendering
+  # +template_object+:: object passing to view
+  # +resource_class+:: resource class name, override to import to another table (default config.resource_class)
+  # +resource_label+:: resource label value (default config.resource_label)
+  # +plural_resource_label+:: pluralized resource label value (default config.plural_resource_label)
+  #
   module DSL
-
-
-    # Declares import functionality
-    #
-    # Options
-    # +back+:: resource action to redirect after processing
-    # +csv_options+:: hash to override default CSV options
-    # +batch_size+:: integer value of max  record count inserted by 1 query/transaction
-    # +batch_transaction+:: bool (false by default), if transaction is used when batch importing and works when :validate is set to true
-    # +before_import+:: proc for before import action, hook called with  importer object
-    # +after_import+:: proc for after import action, hook called with  importer object
-    # +before_batch_import+:: proc for before each batch action, called with  importer object
-    # +after_batch_import+:: proc for after each batch action, called with  importer object
-    # +validate+:: true|false, means perform validations or not
-    # +on_duplicate_key_update+:: an Array or Hash, tells activerecord-import to use MySQL's ON DUPLICATE KEY UPDATE ability.
-    # +timestamps+::  true|false, tells activerecord-import to not add timestamps (if false) even if record timestamps is disabled in ActiveRecord::Base
-    # +ignore+::  true|false, tells activerecord-import to use MySQL's INSERT IGNORE ability
-    # +template+:: custom template rendering
-    # +template_object+:: object passing to view
-    # +resource_class+:: resource class name, override to import to another table (default config.resource_class)
-    # +resource_label+:: resource label value (default config.resource_label)
-    # +plural_resource_label+:: pluralized resource label value (default config.plural_resource_label)
-    #
-
-
-    DEFAULT_RESULT_PROC =  ->(result, options) do
-
+    DEFAULT_RESULT_PROC = lambda do |result, options|
       model_name = options[:resource_label].downcase
       plural_model_name = options[:plural_resource_label].downcase
       if result.empty?
         flash[:warning] = I18n.t('active_admin_import.file_empty_error')
       else
-        if result.has_failed?
-          flash[:error] = I18n.t('active_admin_import.failed', count: result.failed.count, model: model_name, plural_model: plural_model_name, message: result.failed_message(limit: 5))
+        if result.failed?
+          flash[:error] = I18n.t(
+            'active_admin_import.failed',
+            count: result.failed.count,
+            model: model_name,
+            plural_model: plural_model_name,
+            message: result.failed_message(limit: options[:error_limit]))
           return if options[:batch_transaction]
         end
-        if result.has_imported?
-          flash[:notice] = I18n.t('active_admin_import.imported', count: result.imported_qty, model: model_name, plural_model: plural_model_name)
+        if result.imported?
+          flash[:notice] = I18n.t(
+            'active_admin_import.imported',
+            count: result.imported_qty,
+            model: model_name,
+            plural_model: plural_model_name)
         end
       end
     end
-
-
+    # rubocop:disable Metrics/AbcSize
     def active_admin_import(options = {}, &block)
       options.assert_valid_keys(*Options::VALID_OPTIONS)
 
@@ -55,35 +62,44 @@ module ActiveAdminImport
         render template: options[:template]
       end
 
-      action_item :import, only: :index do
+      action_item :import, only: :index, if: options[:if] do
         if authorized?(ActiveAdminImport::Auth::IMPORT, active_admin_config.resource_class)
-          link_to(I18n.t('active_admin_import.import_model', plural_model: options[:plural_resource_label]), action: :import)
+          link_to(
+            I18n.t('active_admin_import.import_model', plural_model: options[:plural_resource_label]),
+            action: :import
+          )
         end
       end
 
       collection_action :do_import, method: :post do
         authorize!(ActiveAdminImport::Auth::IMPORT, active_admin_config.resource_class)
-
+        _params = params.respond_to?(:to_unsafe_h) ? params.to_unsafe_h : params
+        params = ActiveSupport::HashWithIndifferentAccess.new _params
         @active_admin_import_model = options[:template_object]
         @active_admin_import_model.assign_attributes(params[params_key].try(:deep_symbolize_keys) || {})
-        #go back to form
+        # go back to form
         return render template: options[:template] unless @active_admin_import_model.valid?
-        @importer = Importer.new(options[:resource_class], @active_admin_import_model, options)
+        @importer = Importer.new(
+          options[:resource_class],
+          @active_admin_import_model,
+          options
+        )
         begin
           result = @importer.import
 
           if block_given?
-            instance_eval &block
+            instance_eval(&block)
           else
             instance_exec result, options, &DEFAULT_RESULT_PROC
           end
-        rescue ActiveRecord::Import::MissingColumnError, NoMethodError, ActiveRecord::StatementInvalid => e
+        rescue ActiveRecord::Import::MissingColumnError, NoMethodError, ActiveRecord::StatementInvalid, CSV::MalformedCSVError => e
           Rails.logger.error(I18n.t('active_admin_import.file_error', message: e.message))
+          Rails.logger.error(e.backtrace.join("\n"))
           flash[:error] = I18n.t('active_admin_import.file_error', message: e.message[0..200])
         end
         redirect_to options[:back]
       end
-
+      # rubocop:enable Metrics/AbcSize
     end
   end
 end