active_admin_import 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1a7b928539df8bb150300b72b8b2a0971a31a2a9
-  data.tar.gz: 8144a8f48472cce96498a3fd5ce1a5b4c1b530ce
+SHA256:
+  metadata.gz: 0752ed26da2e640bbef43504a32bb98550d230d4f3c8cab9c1ff3fc6cd8f8eee
+  data.tar.gz: 441866fbf6ba23fdf49f1232f56ca5545f9ee1c1f1f71402be42261d8c2df72d
 SHA512:
-  metadata.gz: e04cb45397a7b3540d2c5302d99e154172cc08055dfb0a4f9d1311f48f56133c8928b5b85fe3d50a4d14f0c280f844e4e1b05c7f600b670c0e7dba7813ea0883
-  data.tar.gz: 175dc4931d433f53aedba0ec57d7a004c6e0c18f268ed1f8af711d70350e2e20e8e3e9cafa4c3c97a1df349036d3f54ecdb9b4fda964fd046376a8406e366a25
+  metadata.gz: 5ca717644add0b286d26eb6f97f4be627954576cd9cb4153f5f97e9e849719495c266add21a033ca906636e2373c42b2452350586c52af95ee1dbb8acc1a7696
+  data.tar.gz: 00e6d0d6c689254eadd789a987d7aec3d6742f1988aec2f3373b867af3ac5bdf6e2077f272ba80cbae847750cc996d1ac5b7e08fc7ed664991ffd38733779066

data/.travis.yml

@@ -11,7 +11,3 @@ matrix:
   exclude:
     - rvm: 2.1.9
       env: RAILS=5.0.0 # Rails 5.0 requires Ruby 2.2.2 or newer
-before_install:
-  - gem update --system # use the very latest Rubygems
-  - rvm @global do gem uninstall bundler -a -x
-  - rvm @global do gem install bundler -v 1.14.6 # latest version known to work

data/active_admin_import.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'activerecord-import', '~> 0.17.0'
   gem.add_runtime_dependency 'rchardet', '~> 1.6'
   gem.add_runtime_dependency 'rubyzip', '~> 1.2'
-  gem.add_dependency 'activeadmin', '~> 1.0'
+  gem.add_dependency 'activeadmin', '>= 1.0.0.pre2'
 end

data/config/locales/tr.yml

@@ -0,0 +1,23 @@
+tr:
+  active_admin:
+    import: "İçe aktar"
+  active_admin_import:
+    file: 'Dosya'
+    file_error: "Hata: %{message}"
+    file_format_error: "Sadece geçerli csv dosyasını içe aktarabilirsiniz"
+    file_empty_error: "Boş dosyayı içe aktaramazsın"
+    no_file_error: "Lütfen, içe aktarmak için dosya seçin"
+    details: "Lütfen, içe aktarmak için dosya seçin"
+    imported:
+      one: "Başarıyla 1 %{model} içe aktarıldı."
+      other: "Başarıyla %{count} %{plural_model} içe aktarıldı."
+    failed:
+      one:   "1 %{model} içe aktarılamadı: %{message}"
+      other: "%{count} %{plural_model} içe aktarılamadı: %{message}"
+    import_model: "İçe aktar %{plural_model}"
+    import_btn: "İçe aktar"
+    import_btn_disabled: "Bekleyin..."
+    csv_options: "CSV seçenekleri"
+    col_sep: 'Sutün ayracı'
+    row_sep: 'Satır ayracı'
+    quote_char: 'Alıntı karakteri'

data/lib/active_admin_import/importer.rb

@@ -60,6 +60,30 @@ module ActiveAdminImport
       end
     end
 
+    # Use it when CSV file contain redundant columns
+    #
+    # Example:
+    #
+    # ActiveAdmin.register Post
+    #   active_admin_import before_batch_import: lambda { |importer|
+    #                         importer.batch_slice_columns(['name', 'birthday'])
+    #                       }
+    # 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)
+      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)
+      end
+    end
+
     def values_at(header_key)
       csv_lines.collect { |line| line[header_index(header_key)] }.uniq
     end

data/lib/active_admin_import/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveAdminImport
-  VERSION = '3.0.0'
+  VERSION = "3.1.0"
 end

data/spec/import_spec.rb

@@ -433,6 +433,43 @@ describe 'import', type: :feature do
     end
   end
 
+  context "with slice_columns option" do
+    before do
+      add_author_resource template_object: ActiveAdminImport::Model.new,
+                          before_batch_import: lambda { |importer|
+                            importer.batch_slice_columns(slice_columns)
+                          }
+      visit "/admin/authors/import"
+      upload_file!(:authors)
+    end
+
+    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]
+          ]
+        )
+      end
+    end
+
+    context "slice column from the middle" do
+      let(:slice_columns) { %w(name birthday) }
+
+      it "should not fill `last_name` column" do
+        expect(Author.pluck(:name, :last_name, :birthday)).to match_array(
+          [
+            ["Jane", nil, "1988-11-16".to_date],
+            ["John", nil, "1986-05-01".to_date]
+          ]
+        )
+      end
+    end
+  end
+
   context 'with invalid options' do
     let(:options) { { invalid_option: :invalid_value } }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_import
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Igor Fedoronchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -56,16 +56,16 @@ dependencies:
   name: activeadmin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0.pre2
 description: The most efficient way to import for Active Admin
 email:
 - fedoronchuk@gmail.com
@@ -90,6 +90,7 @@ files:
 - config/locales/ko.yml
 - config/locales/pt-BR.yml
 - config/locales/ru.yml
+- config/locales/tr.yml
 - config/locales/uk.yml
 - config/locales/zh-CN.yml
 - lib/active_admin_import.rb
@@ -146,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ActiveAdmin import based on activerecord-import gem.