active_admin_import 6.0.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdc784c6f8a845b491b0dc93e44b073b548bccc182bb3cf6c26cb9f80e59b587
-  data.tar.gz: 798237101d7d4403ed8fb1d1d4ed466b4b78bc44740e20137887d2c8b6464e3f
+  metadata.gz: f6e8f38e5549666b0bc1cd0d996f53fc0bebdfa5449750434fa4dbeb2ec4bc3b
+  data.tar.gz: 47298769ad0b0c7dfae9b21b470cf78b1164e6978aeb374ee9d4991de037814e
 SHA512:
-  metadata.gz: '06639b5514e0c5af1f2cfd70f66f7de10b798fc22f9153b4870c0859b3f95fd372cf73f406b15b7df8b3e4d6fc350a911680248e09d15412479c55f092869a0d'
-  data.tar.gz: 1b49c36c911a6eae50d653eafa4063a139b5d901b81264b213ece4bb995158bf7685f62facce2d5d1a69b76fe2735483296a26f9f697f6fad802d562ca3deef5
+  metadata.gz: b45454513b6a1312b1dd0490ab0f34def99e0928177a3fc209220be9fcb7d6cb371b0c9d086818ef8318f62d97ef39f8f38264acdef32d5795af02c90d54332c
+  data.tar.gz: c8a7a5aa657e2e78f9678e5e4da6ab348af718473b5431bdbbd84393050b58da560970da80b4d81904e901ddc13e7ca1f98b63e5bcb2367c41c8f2aa023cc7d3

data/.github/workflows/test.yml

@@ -16,12 +16,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.2', '3.3', '3.4']
-        rails: ['7.1.0', '7.2.0', '8.0.0']
+        ruby: ['3.3', '3.4', '4.0']
+        rails: ['7.2.0', '8.0.0', '8.1.0']
         activeadmin: ['3.2.0', '3.3.0', '3.4.0', '3.5.1']
         exclude:
+          # ActiveAdmin 3.2.0 predates Rails 8 support.
           - rails: '8.0.0'
             activeadmin: '3.2.0'
+          - rails: '8.1.0'
+            activeadmin: '3.2.0'
+        include:
+          # ActiveAdmin 4 requires railties >= 7.2, so cover its floor and the
+          # newest supported Rails releases.
+          - ruby: '3.4'
+            rails: '7.2.0'
+            activeadmin: '4.0.0.beta22'
+          - ruby: '3.4'
+            rails: '8.0.0'
+            activeadmin: '4.0.0.beta22'
+          - ruby: '3.4'
+            rails: '8.1.0'
+            activeadmin: '4.0.0.beta22'
     env:
       RAILS: ${{ matrix.rails }}
       AA: ${{ matrix.activeadmin }}
@@ -31,6 +46,11 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
+      - name: AA v4 environment summary
+        if: matrix.activeadmin == '4.0.0.beta22'
+        run: |
+          bundle exec gem list activeadmin
+          bundle info activeadmin
       - name: Run tests
         run: bundle exec rspec spec
   test-mysql:
@@ -98,6 +118,43 @@ jobs:
           bundler-cache: true
       - name: Run tests
         run: bundle exec rspec spec
+  test-postgres-aa4:
+    name: Ruby 3.4 / Rails 8.0.0 / AA 4.0.0.beta22 / PostgreSQL 16
+    runs-on: ubuntu-latest
+    env:
+      RAILS: '8.0.0'
+      AA: '4.0.0.beta22'
+      DB: postgres
+      DB_HOST: 127.0.0.1
+      DB_PORT: 5432
+      DB_USERNAME: postgres
+      DB_PASSWORD: postgres
+    services:
+      postgres:
+        image: postgres:16
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: active_admin_import_test
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd="pg_isready -U postgres"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=10
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.4'
+          bundler-cache: true
+      - name: AA v4 environment summary
+        run: |
+          bundle exec gem list activeadmin
+          bundle info activeadmin
+      - name: Run tests
+        run: bundle exec rspec spec
   coverage:
     name: Coverage
     runs-on: ubuntu-latest

data/Gemfile

@@ -1,13 +1,25 @@
 source 'https://rubygems.org'
 gemspec
 
-default_rails_version = '7.1.0'
-default_activeadmin_version = '3.2.0'
+default_rails_version = '8.0.0'
+default_activeadmin_version = '3.5.1'
+
+# `~> 4.0.0.beta22` would admit 4.0.0 GA — pin prereleases exactly so the
+# CI cell tests the AA build it claims to test.
+aa_version = ENV['AA'] || default_activeadmin_version
+aa_op = aa_version.match?(/[a-z]/) ? '=' : '~>'
 
 gem 'rails', "~> #{ENV['RAILS'] || default_rails_version}"
-gem 'activeadmin', "~> #{ENV['AA'] || default_activeadmin_version}"
-gem 'sprockets-rails'
-gem 'sass-rails'
+gem 'activeadmin', "#{aa_op} #{aa_version}"
+
+if ENV['AA']&.start_with?('4')
+  # AA 4 uses Tailwind + importmap; sass-rails conflicts with Tailwind v4.
+  gem 'cssbundling-rails'
+  gem 'importmap-rails'
+else
+  gem 'sprockets-rails'
+  gem 'sass-rails'
+end
 
 group :test do
   gem 'simplecov', require: false
@@ -22,6 +34,4 @@ group :test do
   end
   gem 'database_cleaner'
   gem 'capybara'
-  gem 'cuprite'
-  gem 'webrick', require: false
 end

data/README.md

@@ -73,6 +73,7 @@ Tool                    | Description
 :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.
+:action_item_html_options |HTML options passed to the index-page "Import …" action_item link. Defaults to `{ class: 'action-item-button' }` so the link matches AA 4's built-in action_items; the class is a no-op on AA 3. Override to drop the class or add your own (`{ class: 'my-btn' }`, `{ class: '', data: { turbo: false } }`, etc.).
 
 
 
@@ -224,7 +225,43 @@ end
 
 ##### Update existing records by id
 
-Delete colliding rows just before each batch insert:
+Two strategies, depending on your database and whether you need validations.
+
+###### Native upsert (recommended where supported)
+
+On databases that support upserts (MySQL, PostgreSQL 9.5+, SQLite 3.24+),
+`:on_duplicate_key_update` updates colliding rows and inserts new ones in a
+single statement — no extra delete. The option is passed straight to
+`activerecord-import`, so its shape depends on the adapter:
+
+```ruby
+# PostgreSQL / SQLite
+on_duplicate_key_update: { conflict_target: [:id], columns: %i[name last_name birthday] }
+
+# MySQL (infers the key from the columns)
+on_duplicate_key_update: %i[name last_name birthday]
+```
+
+```ruby
+ActiveAdmin.register Author do
+  active_admin_import validate: false,
+                      on_duplicate_key_update: { conflict_target: [:id], columns: %i[name last_name birthday] }
+end
+```
+
+Notes:
+
+* Only the columns you list are updated; other columns on the existing row keep their values.
+* Use `validate: false` — `activerecord-import` runs uniqueness validations against the very rows the upsert is about to overwrite, so `validates_uniqueness_of` would otherwise reject the update.
+* Active Record callbacks are not fired for bulk imports.
+
+###### Delete-then-insert (any database)
+
+When you can't rely on upsert support — an older database, or you need your model
+validations to run — delete the colliding rows just before each batch insert.
+The old row is gone before the insert, so `validates_uniqueness_of` doesn't trip,
+at the cost of a second query and full-row **replacement** (columns absent from
+the CSV are reset, not preserved):
 
 ```ruby
 ActiveAdmin.register Post do
@@ -234,8 +271,6 @@ ActiveAdmin.register Post do
 end
 ```
 
-For databases that support upserts you can use `:on_duplicate_key_update` instead.
-
 ##### Tune batch size
 
 ```ruby

data/active_admin_import.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.summary = 'ActiveAdmin import based on activerecord-import gem.'
   gem.homepage = 'https://github.com/activeadmin-plugins/active_admin_import'
   gem.license = 'MIT'
-  gem.required_ruby_version = '>= 3.1.0'
+  gem.required_ruby_version = '>= 3.3.0'
   gem.files = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
   gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.name = 'active_admin_import'
@@ -18,5 +18,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'activerecord-import', '>= 2.0'
   gem.add_runtime_dependency 'rchardet', '>= 1.6'
   gem.add_runtime_dependency 'rubyzip', '>= 1.2'
-  gem.add_dependency 'activeadmin', '>= 3.0', '< 4.0'
+  gem.add_dependency 'activeadmin', '>= 3.0', '< 4.1'
 end

data/lib/active_admin_import/dsl.rb

@@ -27,6 +27,8 @@ module ActiveAdminImport
   module DSL
     CONTEXT_METHOD = :active_admin_import_context
 
+    ACTIVE_ADMIN_V4 = Gem::Version.new(ActiveAdmin::VERSION) >= Gem::Version.new('4.0.0.beta1')
+
     def self.prepare_import_model(template_object, controller, params: nil)
       model = template_object.is_a?(Proc) ? template_object.call : template_object
       if params
@@ -45,7 +47,7 @@ module ActiveAdminImport
       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')
+        flash[ACTIVE_ADMIN_V4 ? :alert : :warning] = I18n.t('active_admin_import.file_empty_error')
       else
         if result.failed?
           flash[:error] = I18n.t(
@@ -81,7 +83,8 @@ module ActiveAdminImport
         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
+            { action: :import },
+            options[:action_item_html_options]
           )
         end
       end

data/lib/active_admin_import/importer.rb

@@ -82,23 +82,15 @@ module ActiveAdminImport
     # end
     #
     def batch_slice_columns(slice_columns)
-      # Only set @use_indexes for the first batch so that @use_indexes are in correct
-      # position for subsequent batches
-      unless defined?(@use_indexes)
-        @use_indexes = []
-        headers.values.each_with_index do |val, index|
-          @use_indexes << index if val.in?(slice_columns)
-        end
-        return csv_lines if @use_indexes.empty?
-
-        # slice CSV headers
-        @headers = headers.to_a.values_at(*@use_indexes).to_h
-      end
+      columns = headers.values
+      indexes = columns.each_index.select { |i| columns[i].in?(slice_columns) }
+      return csv_lines if indexes.empty?
 
-      # slice CSV values
-      csv_lines.map! do |line|
-        line.values_at(*@use_indexes)
-      end
+      # @headers is reset to the full set at the start of every batch (see
+      # #batch_import), so each call narrows the previous call's result and every
+      # batch slices the same way — calling this more than once now composes (#186).
+      @headers = headers.to_a.values_at(*indexes).to_h
+      csv_lines.map! { |line| line.values_at(*indexes) }
     end
 
     def values_at(header_key)
@@ -129,10 +121,18 @@ module ActiveAdminImport
     end
 
     def prepare_headers
-      headers = self.headers.present? ? self.headers.map(&:to_s) : yield
-      @headers = Hash[headers.zip(headers.map { |el| el.underscore.gsub(/\s+/, '_') })].with_indifferent_access
-      @headers.merge!(options[:headers_rewrites].symbolize_keys.slice(*@headers.symbolize_keys.keys))
-      @headers
+      names = self.headers.present? ? self.headers : yield
+      blank_positions = names.each_index.select { |i| names[i].to_s.strip.empty? }
+      unless blank_positions.empty?
+        raise ActiveAdminImport::Exception,
+              "blank column header at column #{blank_positions.map { |i| i + 1 }.join(', ')}"
+      end
+
+      names = names.map(&:to_s)
+      # @source_headers is the complete parsed header row; batch_import copies it
+      # into the per-batch working @headers (see #batch_import).
+      @source_headers = Hash[names.zip(names.map { |el| el.underscore.gsub(/\s+/, '_') })].with_indifferent_access
+      @source_headers.merge!(options[:headers_rewrites].symbolize_keys.slice(*@source_headers.symbolize_keys.keys))
     end
 
     def run_callback(name)
@@ -141,6 +141,9 @@ module ActiveAdminImport
 
     def batch_import
       batch_result = nil
+      # Every batch re-parses full-width rows, so restore the full header set
+      # before slicing; batch_slice_columns then narrows this working copy.
+      @headers = @source_headers.dup
       @resource.transaction do
         run_callback(:before_batch_import)
         batch_result = resource.import(headers.values, csv_lines, import_options)

data/lib/active_admin_import/options.rb

@@ -22,7 +22,8 @@ module ActiveAdminImport
       :plural_resource_label,
       :error_limit,
       :headers_rewrites,
-      :if
+      :if,
+      :action_item_html_options
     ].freeze
 
     def self.options_for(config, options = {})
@@ -39,7 +40,10 @@ module ActiveAdminImport
         plural_resource_label: config.plural_resource_label,
         error_limit: 5,
         headers_rewrites: {},
-        if: true
+        if: true,
+        # AA 4's built-in action_items hardcode this class for Tailwind styling
+        # (lib/active_admin/resource/action_items.rb). It's a no-op on AA 3.
+        action_item_html_options: { class: 'action-item-button' }
       }.deep_merge(options)
     end
   end

data/lib/active_admin_import/version.rb

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

data/spec/fixtures/files/authors_blank_header_end.csv

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

data/spec/fixtures/files/authors_blank_header_middle.csv

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

data/spec/fixtures/files/authors_empty_header.csv

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

data/spec/fixtures/files/authors_many.csv

@@ -0,0 +1,6 @@
+Birthday,Name,Last name
+1986-05-01,John,Doe
+1988-11-16,Jane,Roe
+1990-01-01,Jack,Smith
+1991-02-02,Jill,Jones
+1992-03-03,Joe,Brown

data/spec/import_spec.rb

@@ -41,8 +41,8 @@ describe 'import', type: :feature do
   end
 
   def upload_file!(name, ext = 'csv')
-    attach_file('active_admin_import_model_file', File.expand_path("./spec/fixtures/files/#{name}.#{ext}"))
-    find_button('Import').click
+    attach_file(ImportFormSelectors.file_input_id, File.expand_path("./spec/fixtures/files/#{name}.#{ext}"))
+    find_button(ImportFormSelectors.import_button_text).click
   end
 
   context 'posts index' do
@@ -118,7 +118,7 @@ describe 'import', type: :feature do
             # reload page
             visit '/admin/posts/import'
             # submit form without file
-            find_button('Import').click
+            find_button(ImportFormSelectors.import_button_text).click
           end
 
           it 'should render validation error' do
@@ -171,7 +171,7 @@ describe 'import', type: :feature do
       # TODO: removing this causes  undefined method `ransack' for #<ActiveRecord::Relation []>
       allow_any_instance_of(Admin::AuthorsController).to receive(:find_collection).and_return(Author.all)
       visit '/admin/authors'
-      find_link('Import Authors').click
+      find_link(ImportFormSelectors.import_link_text).click
       expect(current_path).to eq('/admin/authors/import')
     end
   end
@@ -190,6 +190,36 @@ describe 'import', type: :feature do
     end
   end
 
+  # Issue #197: a CSV with an empty header cell used to crash with
+  # `undefined method 'underscore' for nil`, wherever the blank sits.
+  context 'with a blank column header' do
+    shared_examples 'a rejected blank header' do |fixture, column|
+      before do
+        add_author_resource
+        visit '/admin/authors/import'
+        upload_file!(fixture)
+      end
+
+      it 'reports a clear error and imports nothing' do
+        expect(page).to have_content "blank column header at column #{column}"
+        expect(page).to have_no_content 'undefined method'
+        expect(Author.count).to eq(0)
+      end
+    end
+
+    context 'at the beginning' do
+      it_behaves_like 'a rejected blank header', :authors_empty_header, 1
+    end
+
+    context 'in the middle' do
+      it_behaves_like 'a rejected blank header', :authors_blank_header_middle, 2
+    end
+
+    context 'at the end' do
+      it_behaves_like 'a rejected blank header', :authors_blank_header_end, 4
+    end
+  end
+
   context 'authors already exist' do
     before do
       Author.create!(id: 1, name: 'Jane', last_name: 'Roe')
@@ -217,6 +247,51 @@ describe 'import', type: :feature do
         expect(Author.find(2).name).to eq('Jane')
       end
     end
+
+    # Issue #187: update existing records by id without a delete_all workaround.
+    # On databases that support upserts, :on_duplicate_key_update lets a single
+    # import update colliding rows and insert new ones in one pass.
+    context 'upserting authors by id via :on_duplicate_key_update' do
+      before do
+        # Existing row shares its id with the first CSV row but carries a stale
+        # birthday; the second CSV row (id 2) has no match and must be inserted.
+        Author.delete_all
+        Author.create!(id: 1, name: 'John', last_name: 'Doe', birthday: '1900-01-01')
+
+        # The option shape is adapter-specific: MySQL infers the conflicting key
+        # and only wants the column list, while PostgreSQL/SQLite need an explicit
+        # :conflict_target (see README).
+        on_duplicate_key_update =
+          if ActiveRecord::Base.connection.adapter_name.match?(/mysql/i)
+            %i[name last_name birthday]
+          else
+            { conflict_target: [:id], columns: %i[name last_name birthday] }
+          end
+
+        add_author_resource(
+          # Uniqueness validation runs against the rows the upsert is about to
+          # overwrite, so it must be off for an id-based upsert (see README).
+          validate: false,
+          on_duplicate_key_update: on_duplicate_key_update
+        )
+        visit '/admin/authors/import'
+        upload_file!(:authors_with_ids)
+      end
+
+      it 'reports every row as imported' do
+        expect(page).to have_content 'Successfully imported 2 authors'
+      end
+
+      it 'updates the existing author instead of duplicating it' do
+        expect(Author.count).to eq(2)
+        expect(Author.find(1).birthday).to eq(Date.new(1986, 5, 1))
+      end
+
+      it 'inserts the non-colliding author' do
+        expect(Author.find(2).name).to eq('Jane')
+        expect(Author.find(2).last_name).to eq('Roe')
+      end
+    end
   end
 
   context 'with valid options' do
@@ -228,14 +303,14 @@ describe 'import', type: :feature do
     end
 
     it 'has valid form' do
-      form = find('#new_active_admin_import_model')
+      form = find(ImportFormSelectors.form_css)
       expect(form['action']).to eq('/admin/authors/do_import')
       expect(form['enctype']).to eq('multipart/form-data')
-      file_input = form.find('input#active_admin_import_model_file')
+      file_input = form.find(ImportFormSelectors.file_input_css)
       expect(file_input[:type]).to eq('file')
       expect(file_input.value).to be_blank
-      submit_input = form.find('#active_admin_import_model_submit_action input')
-      expect(submit_input[:value]).to eq('Import')
+      submit_input = form.find(ImportFormSelectors.submit_css)
+      expect(submit_input[:value]).to eq(ImportFormSelectors.import_button_text)
       expect(submit_input[:type]).to eq('submit')
     end
 
@@ -261,7 +336,7 @@ describe 'import', type: :feature do
 
       context 'when no file' do
         it 'should render error' do
-          find_button('Import').click
+          find_button(ImportFormSelectors.import_button_text).click
           expect(Author.count).to eq(0)
           expect(page).to have_content I18n.t('active_admin_import.no_file_error')
         end
@@ -581,6 +656,56 @@ describe 'import', type: :feature do
     end
   end
 
+  # Issue #186: each call must slice the result of the previous one, not re-apply
+  # the first call's indices to an already-sliced row.
+  context "with successive batch_slice_columns calls" do
+    before do
+      # validate: false isolates the slicing behaviour from the model's
+      # uniqueness validation, which would otherwise reject a later batch's
+      # author for sharing a NULL last_name with an earlier one.
+      add_author_resource template_object: ActiveAdminImport::Model.new,
+                          validate: false,
+                          before_batch_import: lambda { |importer|
+                            importer.batch_slice_columns(%w(name last_name))
+                            importer.batch_slice_columns(%w(name))
+                          },
+                          batch_size: batch_size
+      visit "/admin/authors/import"
+      upload_file!(fixture)
+    end
+
+    context "within a single batch" do
+      let(:batch_size) { 2 } # authors.csv has 2 rows -> 1 batch
+      let(:fixture) { :authors }
+
+      it "narrows the columns progressively" do
+        expect(Author.pluck(:name, :last_name, :birthday)).to match_array(
+          [
+            ["Jane", nil, nil],
+            ["John", nil, nil]
+          ]
+        )
+      end
+    end
+
+    context "across several batches" do
+      let(:batch_size) { 2 } # authors_many.csv has 5 rows -> 3 batches
+      let(:fixture) { :authors_many }
+
+      it "narrows the columns progressively in every batch" do
+        expect(Author.pluck(:name, :last_name, :birthday)).to match_array(
+          [
+            ["John", nil, nil],
+            ["Jane", nil, nil],
+            ["Jack", nil, nil],
+            ["Jill", nil, nil],
+            ["Joe", nil, nil]
+          ]
+        )
+      end
+    end
+  end
+
   context 'with invalid options' do
     let(:options) { { invalid_option: :invalid_value } }
 
@@ -605,7 +730,7 @@ describe 'import', type: :feature do
 
       # Second submission without selecting a file
       expect do
-        find_button('Import').click
+        find_button(ImportFormSelectors.import_button_text).click
         expect(page).to have_content(I18n.t('active_admin_import.no_file_error'))
       end.not_to change { Author.count }
     end

data/spec/spec_helper.rb

@@ -12,9 +12,9 @@ Bundler.setup
 
 ENV['RAILS_ENV'] = 'test'
 require 'rails'
+require 'test_app_paths'
 ENV['RAILS'] = Rails.version
-ENV['DB'] ||= 'sqlite'
-ENV['RAILS_ROOT'] = File.expand_path("../rails/rails-#{ENV['RAILS']}-#{ENV['DB']}", __FILE__)
+ENV['RAILS_ROOT'] = TestAppPaths.app_root
 system 'rake setup' unless File.exist?(ENV['RAILS_ROOT'])
 
 require 'active_model'
@@ -28,16 +28,13 @@ ActiveAdmin.application.current_user_method = false
 
 require 'rspec/rails'
 require 'support/admin'
+require 'support/import_form_selectors'
 require 'capybara/rails'
 require 'capybara/rspec'
-require 'capybara/cuprite'
 
-Capybara.server = :webrick
-Capybara.register_driver :cuprite do |app|
-  Capybara::Cuprite::Driver.new(app, headless: true, window_size: [1280, 800])
-end
-Capybara.javascript_driver = :cuprite
-Capybara.default_max_wait_time = 5
+# Specs exercise ActiveAdmin through Capybara's default rack_test driver — no
+# JavaScript or real browser is needed, so no Cuprite/Chrome or app server.
+Capybara.default_driver = :rack_test
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = false

data/spec/support/import_form_selectors.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# Formtastic 6 (AA 4) keeps the same DOM IDs as Formtastic 4 (AA 3) for this
+# form, so one selector set serves both — branch here if a future AA shifts an ID.
+module ImportFormSelectors
+  module_function
+
+  SELECTORS = {
+    form_id: 'new_active_admin_import_model',
+    file_input_id: 'active_admin_import_model_file',
+    file_input_css: 'input#active_admin_import_model_file',
+    submit_css: '#active_admin_import_model_submit_action input',
+    import_button_text: 'Import',
+    import_link_text: 'Import Authors'
+  }.freeze
+
+  def form_id            = SELECTORS[:form_id]
+  def form_css           = "##{form_id}"
+  def file_input_id      = SELECTORS[:file_input_id]
+  def file_input_css     = SELECTORS[:file_input_css]
+  def submit_css         = SELECTORS[:submit_css]
+  def import_button_text = SELECTORS[:import_button_text]
+  def import_link_text   = SELECTORS[:import_link_text]
+end

data/spec/support/rails_template.rb

@@ -50,8 +50,19 @@ gsub_file "config/environment.rb",
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
+aa_v4 = ENV['AA']&.start_with?('4')
+
 generate :'active_admin:install --skip-users'
-generate :'formtastic:install'
+
+if aa_v4
+  # `active_admin:assets` swaps AA 3's Sprockets SCSS/JS for AA 4's Tailwind CSS
+  # stub. We don't compile it — specs assert on DOM and flash text, not styling,
+  # so the stub suffices and no Node is needed. `builds/` satisfies cssbundling-rails.
+  generate :'active_admin:assets'
+  run 'mkdir -p app/assets/builds'
+else
+  generate :'formtastic:install'
+end
 
 run 'rm -rf test'
 route "root :to => 'admin/dashboard#index'"

data/spec/support/test_app_paths.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module TestAppPaths
+  module_function
+
+  def app_dir_name
+    "rails-#{Rails::VERSION::STRING}-#{ENV['DB'] || 'sqlite'}-aa#{ENV['AA'] || 'default'}"
+  end
+
+  # Absolute path under spec/rails/, used as RAILS_ROOT.
+  def app_root
+    File.expand_path("../rails/#{app_dir_name}", __dir__)
+  end
+end

data/tasks/test.rake

@@ -1,3 +1,5 @@
+require_relative '../spec/support/test_app_paths'
+
 desc "Creates a test rails app for the specs to run against"
 task :setup do
   require 'rails/version'
@@ -8,6 +10,9 @@ task :setup do
              when 'postgres', 'postgresql' then 'postgresql'
              else 'sqlite3'
              end
+  aa_v4 = ENV['AA']&.start_with?('4')
+
+  puts "[setup] ActiveAdmin: #{ENV['AA'] || '(Gemfile default)'} / Rails: #{Rails::VERSION::STRING} / DB: #{rails_db}"
 
   rails_new_opts = %W(
     --skip-turbolinks
@@ -17,5 +22,18 @@ task :setup do
     -m
     spec/support/rails_template.rb
   )
-  system "bundle exec rails new spec/rails/rails-#{Rails::VERSION::STRING}-#{db} #{rails_new_opts.join(' ')}"
+  # v4 drops sprockets-rails (see Gemfile), so skip the asset pipeline to
+  # avoid the auto-generated `config/initializers/assets.rb` crashing at boot.
+  if aa_v4
+    rails_new_opts.unshift('--skip-asset-pipeline')
+  else
+    # Rails 8.1 wires importmap-rails into the generated ApplicationController
+    # (`stale_when_importmap_changes`). The AA 3 app uses Sprockets, not
+    # importmap, so that gem is absent and the controller raises NameError at
+    # boot. Skip JavaScript so the macro is never generated — the specs run on
+    # rack_test and never execute JS anyway.
+    rails_new_opts.unshift('--skip-javascript')
+  end
+
+  system "bundle exec rails new spec/rails/#{TestAppPaths.app_dir_name} #{rails_new_opts.join(' ')}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_import
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Igor Fedoronchuk
@@ -60,7 +60,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -70,7 +70,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 description: The most efficient way to import for Active Admin
 email:
 - fedoronchuk@gmail.com
@@ -114,9 +114,13 @@ files:
 - spec/fixtures/files/author_invalid.csv
 - spec/fixtures/files/author_invalid_format.txt
 - spec/fixtures/files/authors.csv
+- spec/fixtures/files/authors_blank_header_end.csv
+- spec/fixtures/files/authors_blank_header_middle.csv
 - spec/fixtures/files/authors_bom.csv
+- spec/fixtures/files/authors_empty_header.csv
 - spec/fixtures/files/authors_invalid_db.csv
 - spec/fixtures/files/authors_invalid_model.csv
+- spec/fixtures/files/authors_many.csv
 - spec/fixtures/files/authors_no_headers.csv
 - spec/fixtures/files/authors_values_exceeded_headers.csv
 - spec/fixtures/files/authors_win1251_win_endline.csv
@@ -135,7 +139,9 @@ files:
 - spec/spec_helper.rb
 - spec/support/active_model_lint.rb
 - spec/support/admin.rb
+- spec/support/import_form_selectors.rb
 - spec/support/rails_template.rb
+- spec/support/test_app_paths.rb
 - tasks/test.rake
 homepage: https://github.com/activeadmin-plugins/active_admin_import
 licenses:
@@ -148,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="