active_admin_import 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72a624e96a7c740179d82959a81d6eceee7987813a6dbed662a5113eb41e76d2
-  data.tar.gz: 07ddbc628d18fa4b3a006a2709858001146f86d94f487368eca2c6e247f03ece
+  metadata.gz: 7c8561a4c1622b426312994d56e93252fa2d6c96bd1d0e085e2a8873c3283d4b
+  data.tar.gz: 96a38edf7c6e7c7a787ba216b95922ed2ac7fe25d89b2d992617ad40b5209569
 SHA512:
-  metadata.gz: '08f7de1d997ace9ecb6e741e95f66be1a14bb1b044683f41d0c27d24ec4b1bd995f0a5e2feb2f20dca07704416e809a5735aa39dc153c7497bbbce650003db4b'
-  data.tar.gz: 8fc7ac974e5d03f6982fba484cc3ed2c54b9f5c9e3a38dd7a9ec1241100bb95e055639a75ffe79a9b3fffffbe06f3ab7c4a3ac162b8e63cd4316c7a73af2d7c8
+  metadata.gz: 7a6224751a88d24ff8ceda5d690a77990c893cd1a4d5bf3a0041d1002bb946d9a54a3f0d0a4294e9bab901bb3700692431066cbcd39456763335f7eea902e039
+  data.tar.gz: 110c86f4845a57550024732f881ad8afd9d14ffd569907972e5a0a0c94249fa1a3caa0dbe2cb3f10d266e8b16cb0806dc279d331adeaf5209cf658675faa1113

data/.travis.yml

@@ -1,8 +1,9 @@
 script: bundle exec rspec spec
 env:
   matrix:
-    - RAILS=5.0.0
-    - RAILS=5.1.0
+    - RAILS=5.1.6.2
+    - RAILS=5.2.2.1
 rvm:
-  - 2.2.5
-  - 2.3.1
+  - 2.3.8
+  - 2.4.5
+  - 2.5.5

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [4.1.1] - 2019-09-20
+- Fix column slicing #168 | @doredesign
+- Handle errors on base #163
+
 ## [4.1.0] - 2019-01-15
 - Upgrade dependencies: `activerecord-import` to >=0.27.1 | @jkowens
 

data/Gemfile

@@ -11,7 +11,7 @@ group :test do
   gem 'rails', rails_version
   gem 'rspec-rails'
   gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
-  gem 'sqlite3'
+  gem 'sqlite3',"~> 1.3.6"
   gem 'launchy'
   gem 'database_cleaner'
   gem 'capybara'

data/lib/active_admin_import/import_result.rb

@@ -33,7 +33,10 @@ module ActiveAdminImport
       limit = options[:limit] || failed.count
       failed.first(limit).map do |record|
         errors = record.errors
-        (errors.full_messages.zip errors.keys.map { |k| record.send k }).map { |ms| ms.join(' - ') }.join(', ')
+        failed_values = errors.keys.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
   end

data/lib/active_admin_import/importer.rb

@@ -70,7 +70,7 @@ module ActiveAdminImport
       end
     end
 
-    # Use it when CSV file contain redundant columns
+    # Use this method when CSV file contains unnecessary columns
     #
     # Example:
     #
@@ -81,16 +81,22 @@ module ActiveAdminImport
     # end
     #
     def batch_slice_columns(slice_columns)
-      use_indexes = []
-      headers.values.each_with_index do |val, index|
-        use_indexes << index if val.in?(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
-      return csv_lines if use_indexes.empty?
-      # slice CSV headers
-      @headers = headers.to_a.values_at(*use_indexes).to_h
+
       # slice CSV values
       csv_lines.map! do |line|
-        line.values_at(*use_indexes)
+        line.values_at(*@use_indexes)
       end
     end
 

data/lib/active_admin_import/version.rb

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

data/spec/fixtures/files/authors.csv

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

data/spec/import_result_spec.rb

@@ -5,17 +5,18 @@ describe ActiveAdminImport::ImportResult do
   context 'failed_message' do
     let(:import_result) { ActiveAdminImport::ImportResult.new }
 
-    before do
-      Author.create(name: 'John', last_name: 'Doe')
-      Author.create(name: 'Jane', last_name: 'Roe')
 
+    let(:failed_instances) do
+     [
+         Author.new(last_name: 'Doe').tap {|r| r.errors.add(:last_name,  :taken) },
+         Author.new(name: "", last_name: 'Doe').tap {|r| r.errors.add(:name,  :blank); r.errors.add(:last_name,  :taken)  },
+         Author.new.tap {|r| r.errors.add(:base,  'custom') }
+     ]
+    end
+
+    before do
       @result = double \
-        failed_instances: [
-          # {:last_name=>["has already been taken"]}
-          Author.create(name: 'Jim', last_name: 'Doe'),
-          # {:name=>["can't be blank"], :last_name=>["has already been taken"]}
-          Author.create(name: nil,   last_name: 'Doe')
-        ]
+        failed_instances: failed_instances
     end
 
     it 'should work without any failed instances' do
@@ -26,7 +27,7 @@ describe ActiveAdminImport::ImportResult do
       import_result.add(@result, 4)
       expect(import_result.failed_message)
         .to eq(
-          "Last name has already been taken - Doe ; Name can't be blank - , Last name has already been taken - Doe"
+          "Last name has already been taken - Doe ; Name can't be blank - , Last name has already been taken - Doe ; custom"
         )
     end
 

data/spec/import_spec.rb

@@ -434,11 +434,14 @@ describe 'import', type: :feature do
   end
 
   context "with slice_columns option" do
+    let(:batch_size) { 2 }
+
     before do
       add_author_resource template_object: ActiveAdminImport::Model.new,
                           before_batch_import: lambda { |importer|
                             importer.batch_slice_columns(slice_columns)
-                          }
+                          },
+                          batch_size: batch_size
       visit "/admin/authors/import"
       upload_file!(:authors)
     end
@@ -446,13 +449,23 @@ describe 'import', type: :feature do
     context "slice last column and superfluous column" do
       let(:slice_columns) { %w(name last_name not_existing_column) }
 
-      it "should not fill `birthday` column" do
-        expect(Author.pluck(:name, :last_name, :birthday)).to match_array(
-          [
-            ["Jane", "Roe", nil],
-            ["John", "Doe", nil]
-          ]
-        )
+      shared_examples_for "birthday column removed" do
+        it "should not fill `birthday` column" do
+          expect(Author.pluck(:name, :last_name, :birthday)).to match_array(
+            [
+              ["Jane", "Roe", nil],
+              ["John", "Doe", nil]
+            ]
+          )
+        end
+      end
+
+      it_behaves_like "birthday column removed"
+
+      context "when doing more than one batch" do
+        let(:batch_size) { 1 }
+
+        it_behaves_like "birthday column removed"
       end
     end
 

data/tasks/test.rake

@@ -3,5 +3,5 @@ desc 'Creates a test rails app for the specs to run against'
 task :setup do
   require 'rails/version'
   system('mkdir spec/rails') unless File.exist?('spec/rails')
-  system "bundle exec rails new spec/rails/rails-#{Rails::VERSION::STRING} -m spec/support/rails_template.rb --skip-spring  --skip-turbolinks"
+  system "bundle exec rails new spec/rails/rails-#{Rails::VERSION::STRING} -m spec/support/rails_template.rb --skip-spring  --skip-turbolinks  --skip-bootsnap"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_import
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Igor Fedoronchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -148,8 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: ActiveAdmin import based on activerecord-import gem.