active_admin_import 4.1.2 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78139a6f03fa2e8711cfb6c2e11077c786bea477b2eaf42b49d97523917a68bf
-  data.tar.gz: 9f4bf8ef249388f1dac80ef6d440b89d20ae2ecb0b446f0112c880e0e5ab116a
+  metadata.gz: de2d35b497f1bd3dc0ec315c01b54b414f33d17ae00ec1dd696dabda7f457d23
+  data.tar.gz: f384a6d7ee62080902c06ce1bc37dbc184313c7150af13af7f45d732da499cd5
 SHA512:
-  metadata.gz: 2dbe0057075b74c0f1b91ba06bc24c7c78aaf3e8bce320fc783d79185e0b6bf59ad9d172de0c41da586098545d90d924db7bfb2b214e63e3962853ab8f6a986b
-  data.tar.gz: 93685a6646b4e5b8d3ad813b43bc108c6c321087b1100267e957d02439c5a6f0b5bfda22a2080566f03c08cf484f87ff38ebd28bf662151b7681cb1284f6784a
+  metadata.gz: 4918c47b9cd9bfdc0d2e12733f00c7608999162e0d041b9c6414ca63aa3660dafb87e01d10eb52ffb106895c0cda44f1e89231c546be72bf94707253e71bb5da
+  data.tar.gz: 29d229496fc5e75e3d74b7b2f9312dde645dd29c44833d7c6315b01109410364262e9c90e16f49117b2fffe503077006bf602074b937963aa78b5cd4d4b90ac0

data/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+## [4.2.0] - 2020-02-05
+- generic exception for import added #175 | @linqueta
+
 ## [4.1.2] - 2019-12-16
 - allow application/octet-stream content-type #172 | @dmitry-sinina
 - Allow activerecord-import >= 0.27 #171 | @sagium 

data/lib/active_admin_import.rb

@@ -3,6 +3,7 @@ require 'activerecord-import'
 require 'active_admin'
 require 'active_admin_import/version'
 require 'active_admin_import/engine'
+require 'active_admin_import/exception'
 require 'active_admin_import/import_result'
 require 'active_admin_import/options'
 require 'active_admin_import/dsl'

data/lib/active_admin_import/dsl.rb

@@ -92,7 +92,11 @@ module ActiveAdminImport
           else
             instance_exec result, options, &DEFAULT_RESULT_PROC
           end
-        rescue ActiveRecord::Import::MissingColumnError, NoMethodError, ActiveRecord::StatementInvalid, CSV::MalformedCSVError => e
+        rescue ActiveRecord::Import::MissingColumnError,
+               NoMethodError,
+               ActiveRecord::StatementInvalid,
+               CSV::MalformedCSVError,
+               ActiveAdminImport::Exception => 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])

data/lib/active_admin_import/exception.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+module ActiveAdminImport
+  class Exception < StandardError
+  end
+end

data/lib/active_admin_import/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveAdminImport
-  VERSION = '4.1.2'
+  VERSION = '4.2.0'
 end

data/spec/import_spec.rb

@@ -430,6 +430,28 @@ describe 'import', type: :feature do
         upload_file!(:authors)
         expect(Author.count).to eq(2)
       end
+
+      context 'when the option before_import raises a ActiveAdminImport::Exception' do
+        let(:options) { { before_import: ->(_) { raise ActiveAdminImport::Exception, 'error message' } } }
+
+        before { upload_file!(:authors) }
+
+        it 'should show error' do
+          expect(page).to have_content I18n.t('active_admin_import.file_error', message: 'error message')
+          expect(Author.count).to eq(0)
+        end
+      end
+
+      context 'when the option before_batch_import raises a ActiveAdminImport::Exception' do
+        let(:options) { { before_batch_import: ->(_) { raise ActiveAdminImport::Exception, 'error message' } } }
+
+        before { upload_file!(:authors) }
+
+        it 'should show error' do
+          expect(page).to have_content I18n.t('active_admin_import.file_error', message: 'error message')
+          expect(Author.count).to eq(0)
+        end
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -20,6 +20,7 @@ system 'rake setup' unless File.exist?(ENV['RAILS_ROOT'])
 require 'active_model'
 # require ActiveRecord to ensure that Ransack loads correctly
 require 'active_record'
+require 'action_view'
 require 'active_admin'
 ActiveAdmin.application.load_paths = [ENV['RAILS_ROOT'] + '/app/admin']
 require ENV['RAILS_ROOT'] + '/config/environment.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_import
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.2.0
 platform: ruby
 authors:
 - Igor Fedoronchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2020-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -99,6 +99,7 @@ files:
 - lib/active_admin_import/authorization.rb
 - lib/active_admin_import/dsl.rb
 - lib/active_admin_import/engine.rb
+- lib/active_admin_import/exception.rb
 - lib/active_admin_import/import_result.rb
 - lib/active_admin_import/importer.rb
 - lib/active_admin_import/model.rb
@@ -148,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: ActiveAdmin import based on activerecord-import gem.