active_admin_import 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba919b0429b44accf46af4dcdc52ef1ddcf691a446cddf1bc434b38982c6b0c2
-  data.tar.gz: b54c35f3d81a3b170a8a27b657f1c0b8137c49716fab6b1ba0717845f1b15649
+  metadata.gz: 84ba0d9c89bd483eef55da51f9a06ec6327c4bbfffa79abc8431e578bb347c26
+  data.tar.gz: 9c13aefd9dc6397c7fee814ca4f4f7251d9cfb8c399249570acf902b928eacab
 SHA512:
-  metadata.gz: d949ae03350ff838eb97856d4c34afb610708dde36bee45d32b56de0bd1bf48a5e0adb4e67aaa549e1e35393cca146be755258fbc213422ab9a91b299769688e
-  data.tar.gz: 4ddc52d5273f06837f54a3806e56ebdad52c2a60581aa452b196de25885697348b13af8f56e27716ed2234b3771072f3f93e365035cdfc02b1539e7aa8385fb1
+  metadata.gz: bad8987eeac221884549f9c36d28ced4afc5ed02ee6b65cbf68436053d1ac19644d270e3c20b10aa00b4eb7117289d030e8970036331e803716be6ac10a4bd8c
+  data.tar.gz: 3c8dd843c7fbdb989417a9a0a2611f0c66759f4662c02ed101d37bf36d51f15ecf4b88c49353599f4df5e978f6e19a36eab17cab8be4b65e985594665afc3080

data/.github/workflows/test.yml

@@ -0,0 +1,43 @@
+name: Test
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby_version:
+          - '2.6'
+          - '2.7'
+          - '3.0'
+        rails_version:
+          - '5.2.6'
+          - '6.0.4'
+          - '6.1.4'
+          - '7.0.0'
+        exclude:
+          - ruby_version: '3.0'
+            rails_version: '5.2.6'
+          - ruby_version: '2.6'
+            rails_version: '7.0.0'
+
+    name: Ruby ${{ matrix.ruby_version }} / Rails ${{ matrix.rails_version }}
+
+    env:
+      RAILS: ${{ matrix.rails_version }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+          bundler-cache: true
+
+      - name: Test
+        run: bundle exec rspec spec

data/README.md

@@ -1,6 +1,6 @@
 # ActiveAdminImport
 
-[![Travis Build   ][build_badge]][build_link]
+[![Build Status   ][build_badge]][build_link]
 [![Coverage Status][coveralls_badge]][coveralls_link]
 [![Code Climate   ][codeclimate_badge]][codeclimate_link]
 [![Gem Version    ][rubygems_badge]][rubygems_link]
@@ -91,8 +91,8 @@ Tool                  | Description
 [rchardet]: https://github.com/jmhodges/rchardet
 [activerecord-import]: https://github.com/zdennis/activerecord-import
 
-[build_badge]: https://travis-ci.org/activeadmin-plugins/active_admin_import.svg?branch=master
-[build_link]: https://travis-ci.org/activeadmin-plugins/active_admin_import
+[build_badge]: https://github.com/activeadmin-plugins/active_admin_import/actions/workflows/test.yml/badge.svg
+[build_link]: https://github.com/activeadmin-plugins/active_admin_import/actions
 [coveralls_badge]: https://coveralls.io/repos/activeadmin-plugins/active_admin_import/badge.svg
 [coveralls_link]: https://coveralls.io/github/activeadmin-plugins/active_admin_import
 [codeclimate_badge]: https://codeclimate.com/github/activeadmin-plugins/active_admin_import/badges/gpa.svg

data/lib/active_admin_import/dsl.rb

@@ -54,11 +54,14 @@ module ActiveAdminImport
       options.assert_valid_keys(*Options::VALID_OPTIONS)
 
       options = Options.options_for(config, options)
-      params_key = ActiveModel::Naming.param_key(options[:template_object])
 
       collection_action :import, method: :get do
         authorize!(ActiveAdminImport::Auth::IMPORT, active_admin_config.resource_class)
-        @active_admin_import_model = options[:template_object]
+        @active_admin_import_model = if options[:template_object].is_a?(Proc)
+                                       options[:template_object].call
+                                     else
+                                       options[:template_object]
+                                     end
         render template: options[:template]
       end
 
@@ -75,7 +78,12 @@ module ActiveAdminImport
         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 = if options[:template_object].is_a?(Proc)
+                                       options[:template_object].call
+                                     else
+                                       options[:template_object]
+                                     end
+        params_key = ActiveModel::Naming.param_key(@active_admin_import_model.class)
         @active_admin_import_model.assign_attributes(params[params_key].try(:deep_symbolize_keys) || {})
         # go back to form
         return render template: options[:template] unless @active_admin_import_model.valid?
@@ -94,6 +102,7 @@ module ActiveAdminImport
           end
         rescue ActiveRecord::Import::MissingColumnError,
                NoMethodError,
+               ArgumentError,
                ActiveRecord::StatementInvalid,
                CSV::MalformedCSVError,
                ActiveAdminImport::Exception => e

data/lib/active_admin_import/import_result.rb

@@ -33,11 +33,21 @@ module ActiveAdminImport
       limit = options[:limit] || failed.count
       failed.first(limit).map do |record|
         errors = record.errors
-        failed_values = errors.keys.map do |key|
+        failed_values = attribute_names_for(errors).map do |key|
           key == :base ? nil : record.public_send(key)
         end
         errors.full_messages.zip(failed_values).map { |ms| ms.compact.join(' - ') }.join(', ')
       end.join(' ; ')
     end
+
+    private
+
+    def attribute_names_for(errors)
+      if Gem::Version.new(Rails.version) >= Gem::Version.new('7.0')
+        errors.attribute_names
+      else
+        errors.keys
+      end
+    end
   end
 end

data/lib/active_admin_import/model.rb

@@ -103,6 +103,8 @@ module ActiveAdminImport
 
     def encode_file
       data = File.read(file_path)
+      return if data.empty?
+
       File.open(file_path, 'w') do |f|
         f.write(encode(data))
       end

data/lib/active_admin_import/options.rb

@@ -26,7 +26,7 @@ module ActiveAdminImport
 
     def self.options_for(config, options = {})
       unless options.key? :template_object
-        options[:template_object] = ActiveAdminImport::Model.new
+        options[:template_object] = -> { ActiveAdminImport::Model.new }
       end
 
       {

data/lib/active_admin_import/version.rb

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

data/spec/fixtures/files/authors_values_exceeded_headers.csv

@@ -0,0 +1,3 @@
+Birthday,Name,Last name
+1986-05-01,John,Doe
+1988-11-16,Jane,Roe, exceeded value

data/spec/import_spec.rb

@@ -96,6 +96,38 @@ describe 'import', type: :feature do
         end
         include_examples 'successful inserts for author'
       end
+
+      context 'when template object passed like proc' do
+        before do
+          add_post_resource(template_object: -> { ActiveAdminImport::Model.new(author_id: author.id) },
+                            validate: true,
+                            before_batch_import: lambda do |importer|
+                              importer.csv_lines.map! { |row| row << importer.model.author_id }
+                              importer.headers.merge!(:'Author Id' => :author_id)
+                            end
+          )
+
+          visit '/admin/posts/import'
+          upload_file!(:posts_for_author)
+        end
+
+        include_examples 'successful inserts for author'
+
+        context 'after successful import try without file' do
+          let(:after_successful_import_do!) do
+            # reload page
+            visit '/admin/posts/import'
+            # submit form without file
+            find_button('Import').click
+          end
+
+          it 'should render validation error' do
+            after_successful_import_do!
+
+            expect(page).to have_content I18n.t('active_admin_import.no_file_error')
+          end
+        end
+      end
     end
 
     context 'for csv with author name' do
@@ -424,6 +456,36 @@ describe 'import', type: :feature do
           expect(Author.count).to eq(2)
         end
       end
+
+      context 'with empty csv and auto detect encoding' do
+        let(:options) do
+          attributes = { force_encoding: :auto }
+          { template_object: ActiveAdminImport::Model.new(attributes) }
+        end
+
+        before do
+          upload_file!(:empty)
+        end
+
+        it 'should render warning' do
+          expect(page).to have_content I18n.t('active_admin_import.file_empty_error')
+          expect(Author.count).to eq(0)
+        end
+      end
+
+      context 'with csv which has exceeded values' do
+        before do
+          upload_file!(:authors_values_exceeded_headers)
+        end
+
+        it 'should render warning' do
+          # 5 columns: 'birthday, name, last_name, created_at, updated_at'
+          # 6 values: '"1988-11-16", "Jane", "Roe", " exceeded value", datetime, datetime'
+          msg = 'Number of values (6) exceeds number of columns (5)'
+          expect(page).to have_content I18n.t('active_admin_import.file_error', message: msg)
+          expect(Author.count).to eq(0)
+        end
+      end
     end
 
     context 'with callback procs options' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_import
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Igor Fedoronchuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2023-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -73,9 +73,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -113,6 +113,7 @@ files:
 - spec/fixtures/files/authors_invalid_db.csv
 - spec/fixtures/files/authors_invalid_model.csv
 - spec/fixtures/files/authors_no_headers.csv
+- spec/fixtures/files/authors_values_exceeded_headers.csv
 - spec/fixtures/files/authors_win1251_win_endline.csv
 - spec/fixtures/files/authors_with_ids.csv
 - spec/fixtures/files/authors_with_semicolons.csv
@@ -149,7 +150,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubyforge_project:
+rubygems_version: 2.7.6.2
 signing_key:
 specification_version: 4
 summary: ActiveAdmin import based on activerecord-import gem.
@@ -162,6 +164,7 @@ test_files:
 - spec/fixtures/files/authors_invalid_db.csv
 - spec/fixtures/files/authors_invalid_model.csv
 - spec/fixtures/files/authors_no_headers.csv
+- spec/fixtures/files/authors_values_exceeded_headers.csv
 - spec/fixtures/files/authors_win1251_win_endline.csv
 - spec/fixtures/files/authors_with_ids.csv
 - spec/fixtures/files/authors_with_semicolons.csv

data/.travis.yml

@@ -1,14 +0,0 @@
-script: bundle exec rspec spec
-env:
-  matrix:
-    - RAILS=5.2.6
-    - RAILS=6.0.4
-    - RAILS=6.1.4
-rvm:
-  - 2.6.7
-  - 2.7.4
-  - 3.0.2
-jobs:
-  exclude:
-    - rvm: 3.0.1
-      env: RAILS=5.2.6