active_admin_import 7.0.0 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f72286b16c17763984dba1b9da29ada72f8f7be7e64e5ae64010a1dcd7926af3
-  data.tar.gz: 2f50c17a8aed4cf2f02d8f28e2e83976e1af4fb593d5fcd763339f4a221be7ca
+  metadata.gz: 819977aed599842eef5880ab33a1c266653ba87b940e622eb0f94d14441333db
+  data.tar.gz: aca4a062d3febdafe940182362fbd2405f2f9d7a38bd9bc0b7e8f482bbb14a99
 SHA512:
-  metadata.gz: 8921862e1b2de5bfa6d72f5655fe3cc0fc9d2ac7b4410d8ded785521443daf4b582d8e9b2978645c66bb0446b6d11478d7e72e452c70433274d118baa35e6127
-  data.tar.gz: 332150892d0732efeabf1b7a3de70fa81c9910e6f235ac08b83710eb993709281fb62aec6c21388f6ea9786cf7afb9791dffabdd7c651ac4275cd1ffebd57b3f
+  metadata.gz: '096418fa77f5de062e20f395d973edf6b342240bc050ebcf8a08abf616ce7aab293cac48d4cfb87d80a9a55f0dccf32534c28c3432c9c95f1281b215e3a7b670'
+  data.tar.gz: 706bb15939f91914f40965820296d27cb0db8cdef876882f6b2fe94c94c8ddf9d3decae457278d7e7a124910c5ba602337ea3eef2ac4a97a461011038077c256

data/README.md

@@ -225,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
@@ -235,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/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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_import
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 8.0.1
 platform: ruby
 authors:
 - Igor Fedoronchuk
@@ -78,14 +78,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/test.yml"
-- ".gitignore"
-- ".rubocop.yml"
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- active_admin_import.gemspec
 - app/views/admin/import.html.erb
 - config/locales/de.yml
 - config/locales/en.yml
@@ -109,36 +103,6 @@ files:
 - lib/active_admin_import/model.rb
 - lib/active_admin_import/options.rb
 - lib/active_admin_import/version.rb
-- spec/fixtures/files/author.csv
-- spec/fixtures/files/author_broken_header.csv
-- spec/fixtures/files/author_invalid.csv
-- spec/fixtures/files/author_invalid_format.txt
-- spec/fixtures/files/authors.csv
-- spec/fixtures/files/authors_bom.csv
-- 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
-- spec/fixtures/files/authors_with_tabs.tsv
-- spec/fixtures/files/empty.csv
-- spec/fixtures/files/only_headers.csv
-- spec/fixtures/files/post_comments.csv
-- spec/fixtures/files/posts.csv
-- spec/fixtures/files/posts_for_author.csv
-- spec/fixtures/files/posts_for_author_no_headers.csv
-- spec/import_result_spec.rb
-- spec/import_spec.rb
-- spec/model_spec.rb
-- 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:
 - MIT
@@ -150,14 +114,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.6.9
 specification_version: 4
 summary: ActiveAdmin import based on activerecord-import gem.
 test_files: []

data/.github/workflows/test.yml

@@ -1,211 +0,0 @@
-name: CI
-on:
-  pull_request:
-  push:
-    branches: [master]
-
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-jobs:
-  test:
-    name: Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / AA ${{ matrix.activeadmin }} / SQLite
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: ['3.2', '3.3', '3.4']
-        rails: ['7.1.0', '7.2.0', '8.0.0']
-        activeadmin: ['3.2.0', '3.3.0', '3.4.0', '3.5.1']
-        exclude:
-          - rails: '8.0.0'
-            activeadmin: '3.2.0'
-        include:
-          - ruby: '3.4'
-            rails: '7.2.0'
-            activeadmin: '4.0.0.beta22'
-          - ruby: '3.4'
-            rails: '8.0.0'
-            activeadmin: '4.0.0.beta22'
-    env:
-      RAILS: ${{ matrix.rails }}
-      AA: ${{ matrix.activeadmin }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
-        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:
-    name: Ruby 3.4 / Rails 8.0.0 / AA 3.5.1 / MySQL 8.0
-    runs-on: ubuntu-latest
-    env:
-      RAILS: '8.0.0'
-      AA: '3.5.1'
-      DB: mysql
-      DB_HOST: 127.0.0.1
-      DB_PORT: 3306
-      DB_USERNAME: root
-      DB_PASSWORD: root
-    services:
-      mysql:
-        image: mysql:8.0
-        env:
-          MYSQL_ROOT_PASSWORD: root
-          MYSQL_DATABASE: active_admin_import_test
-        ports:
-          - 3306:3306
-        options: >-
-          --health-cmd="mysqladmin ping -h localhost -uroot -proot"
-          --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: Run tests
-        run: bundle exec rspec spec
-  test-postgres:
-    name: Ruby 3.4 / Rails 8.0.0 / AA 3.5.1 / PostgreSQL 16
-    runs-on: ubuntu-latest
-    env:
-      RAILS: '8.0.0'
-      AA: '3.5.1'
-      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: 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
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.4'
-          bundler-cache: true
-      - name: Run tests with coverage
-        run: bundle exec rspec spec
-      - name: Upload coverage
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage
-          path: coverage/
-
-      - name: Generate badge.json
-        run: |
-          LAST_RUN="coverage/.last_run.json"
-          if [ ! -f "$LAST_RUN" ]; then
-            mkdir -p badge
-            echo '{"schemaVersion":1,"label":"coverage","message":"unknown","color":"lightgrey"}' > badge/badge.json
-            exit 0
-          fi
-          PERCENT=$(ruby -rjson -e "puts JSON.parse(File.read('$LAST_RUN')).dig('result','line').round(1)")
-          PERCENT_NUM=$(ruby -rjson -e "puts JSON.parse(File.read('$LAST_RUN')).dig('result','line')")
-          if ruby -e "exit(($PERCENT_NUM >= 90) ? 0 : 1)"; then COLOR="brightgreen"
-          elif ruby -e "exit(($PERCENT_NUM >= 75) ? 0 : 1)"; then COLOR="green"
-          elif ruby -e "exit(($PERCENT_NUM >= 60) ? 0 : 1)"; then COLOR="yellow"
-          else COLOR="red"; fi
-          mkdir -p badge
-          echo "{\"schemaVersion\":1,\"label\":\"coverage\",\"message\":\"${PERCENT}%\",\"color\":\"${COLOR}\"}" > badge/badge.json
-
-      - name: Upload badge artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage-badge
-          path: badge
-
-  deploy-coverage:
-    needs: coverage
-    if: github.ref == 'refs/heads/master' && github.event_name == 'push'
-    runs-on: ubuntu-latest
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    steps:
-      - name: Download coverage badge
-        uses: actions/download-artifact@v4
-        with:
-          name: coverage-badge
-          path: .
-      - name: Setup Pages
-        uses: actions/configure-pages@v5
-      - name: Upload Pages artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: .
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4

data/.gitignore

@@ -1,19 +0,0 @@
-*.rbc
-*.sassc
-.sass-cache
-capybara-*.html
-.rspec
-/.bundle
-/vendor/bundle
-/log/*
-/tmp/*
-/db/*.sqlite3
-/public/system/*
-/coverage/
-/spec/tmp/*
-**.orig
-rerun.txt
-pickle-email-*.html
-pkg
-spec/rails
-Gemfile.lock

data/.rubocop.yml

@@ -1,43 +0,0 @@
-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/Gemfile

@@ -1,37 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-default_rails_version = '7.1.0'
-default_activeadmin_version = '3.2.0'
-
-# `~> 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', "#{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
-  gem 'rspec-rails'
-  case ENV['DB']
-  when 'mysql'
-    gem 'mysql2'
-  when 'postgres', 'postgresql'
-    gem 'pg'
-  else
-    gem 'sqlite3', '~> 2.0'
-  end
-  gem 'database_cleaner'
-  gem 'capybara'
-end

data/Rakefile

@@ -1,5 +0,0 @@
-require "bundler"
-require 'rake'
-Bundler.setup
-Bundler::GemHelper.install_tasks
-FileList['tasks/**/*.rake'].each { |task| import task }

data/active_admin_import.gemspec

@@ -1,22 +0,0 @@
-# -*- 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 = 'https://github.com/activeadmin-plugins/active_admin_import'
-  gem.license = 'MIT'
-  gem.required_ruby_version = '>= 3.1.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'
-  gem.require_paths = ['lib']
-  gem.version = ActiveAdminImport::VERSION
-  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.1'
-end

data/spec/fixtures/files/author.csv

@@ -1,2 +0,0 @@
-Name,Last name,Birthday
-John,Doe,1986-05-01

data/spec/fixtures/files/author_broken_header.csv

@@ -1,2 +0,0 @@
-Name,Second name,Birthday
-John,Doe,1986-05-01

data/spec/fixtures/files/author_invalid.csv

@@ -1,2 +0,0 @@
-Name,Last name,Birthday
-,Doe,1986-05-01

data/spec/fixtures/files/author_invalid_format.txt

@@ -1,2 +0,0 @@
-Name,Last name,Birthday
-John,Doe,1986-05-01

data/spec/fixtures/files/authors.csv

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

data/spec/fixtures/files/authors_bom.csv

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

data/spec/fixtures/files/authors_invalid_db.csv

@@ -1,3 +0,0 @@
-Name,Last name,Birthday
-John,Doe,1986-05-01
-John,Doe,1986-05-01

data/spec/fixtures/files/authors_invalid_model.csv

@@ -1,3 +0,0 @@
-Name,Last name,Birthday
-Jim,Doe,1986-05-01
-Jane,Roe,1986-05-01

data/spec/fixtures/files/authors_no_headers.csv

@@ -1,2 +0,0 @@
-John,Doe,1986-05-01
-Jane,Roe,1988-11-16

data/spec/fixtures/files/authors_values_exceeded_headers.csv

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

data/spec/fixtures/files/authors_win1251_win_endline.csv

@@ -1,3 +0,0 @@
-Name,Last name,Birthday
-�������,���������,1986-05-01
-Jane,Roe,1988-11-16

data/spec/fixtures/files/authors_with_ids.csv

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

data/spec/fixtures/files/authors_with_semicolons.csv

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

data/spec/fixtures/files/authors_with_tabs.tsv

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

data/spec/fixtures/files/only_headers.csv

@@ -1 +0,0 @@
-Name,Last name,Birthday

data/spec/fixtures/files/post_comments.csv

@@ -1,3 +0,0 @@
-"Body"
-"First comment"
-"Second comment"

data/spec/fixtures/files/posts.csv

@@ -1,4 +0,0 @@
-"Title","Body","Author Name"
-"title1","some body","John"
-"title2","some body","Jane"
-

data/spec/fixtures/files/posts_for_author.csv

@@ -1,3 +0,0 @@
-"Title","Body"
-"title1","some body"
-"title2","some body"

data/spec/fixtures/files/posts_for_author_no_headers.csv

@@ -1,2 +0,0 @@
-"title1","some body"
-"title2","some body"