active_admin_import 4.2.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de2d35b497f1bd3dc0ec315c01b54b414f33d17ae00ec1dd696dabda7f457d23
-  data.tar.gz: f384a6d7ee62080902c06ce1bc37dbc184313c7150af13af7f45d732da499cd5
+  metadata.gz: 84ba0d9c89bd483eef55da51f9a06ec6327c4bbfffa79abc8431e578bb347c26
+  data.tar.gz: 9c13aefd9dc6397c7fee814ca4f4f7251d9cfb8c399249570acf902b928eacab
 SHA512:
-  metadata.gz: 4918c47b9cd9bfdc0d2e12733f00c7608999162e0d041b9c6414ca63aa3660dafb87e01d10eb52ffb106895c0cda44f1e89231c546be72bf94707253e71bb5da
-  data.tar.gz: 29d229496fc5e75e3d74b7b2f9312dde645dd29c44833d7c6315b01109410364262e9c90e16f49117b2fffe503077006bf602074b937963aa78b5cd4d4b90ac0
+  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/CHANGELOG.md

@@ -1,4 +1,11 @@
 # Changelog
+## [5.0.0] - 2021-11-16
+- Ruby 3 compatibility added #190  | @clinejj
+- Support for a non UTF-8 file when zip uploading #185| @naokirin 
+- Rails 6 supported #183 | @pnghai
+- Drop ruby 2.4 support #192 | @Fivell
+
+
 ## [4.2.0] - 2020-02-05
 - generic exception for import added #175 | @linqueta
 

data/Gemfile

@@ -6,12 +6,13 @@ gemspec
 
 
 group :test do
-  default_rails_version = "~> 5.1"
+  default_rails_version = "~> 5.2.4"
   rails_version = ENV['RAILS'] || default_rails_version
+  gem 'sassc-rails'
   gem 'rails', rails_version
   gem 'rspec-rails'
   gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
-  gem 'sqlite3',"~> 1.3.6"
+  gem "sqlite3", "~> 1.4.0"
   gem 'launchy'
   gem 'database_cleaner'
   gem 'capybara'

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/active_admin_import.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version = ActiveAdminImport::VERSION
   gem.add_runtime_dependency 'activerecord-import', '>= 0.27'
-  gem.add_runtime_dependency 'rchardet', '~> 1.6'
-  gem.add_runtime_dependency 'rubyzip', '~> 1.2'
-  gem.add_dependency 'activeadmin', '>= 1.0.0.pre2'
+  gem.add_runtime_dependency 'rchardet', '>= 1.6'
+  gem.add_runtime_dependency 'rubyzip', '>= 1.2'
+  gem.add_dependency 'activeadmin', '>= 1.0.0'
 end

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/importer.rb

@@ -37,7 +37,7 @@ module ActiveAdminImport
     end
 
     def cycle(lines)
-      @csv_lines = CSV.parse(lines.join, @csv_options)
+      @csv_lines = CSV.parse(lines.join, **@csv_options)
       import_result.add(batch_import, lines.count)
     end
 
@@ -115,7 +115,7 @@ module ActiveAdminImport
       batch_size = options[:batch_size].to_i
       File.open(file.path) do |f|
         # capture headers if not exist
-        prepare_headers { CSV.parse(f.readline, @csv_options).first }
+        prepare_headers { CSV.parse(f.readline, **@csv_options).first }
         f.each_line do |line|
           lines << line if line.present?
           if lines.size == batch_size || f.eof?

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
@@ -110,7 +112,7 @@ module ActiveAdminImport
 
     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

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 = '4.2.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
@@ -371,6 +403,20 @@ describe 'import', type: :feature do
             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
@@ -410,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: 4.2.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Igor Fedoronchuk
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2023-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -28,28 +28,28 @@ dependencies:
   name: rchardet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre2
+        version: 1.0.0
 description: The most efficient way to import for Active Admin
 email:
 - fedoronchuk@gmail.com
@@ -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
@@ -134,7 +135,7 @@ homepage: http://github.com/Fivell/active_admin_import
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -149,8 +150,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: ActiveAdmin import based on activerecord-import gem.
 test_files:
@@ -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,9 +0,0 @@
-script: bundle exec rspec spec
-env:
-  matrix:
-    - RAILS=5.1.6.2
-    - RAILS=5.2.2.1
-rvm:
-  - 2.3.8
-  - 2.4.5
-  - 2.5.5