active_admin_import 4.2.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de2d35b497f1bd3dc0ec315c01b54b414f33d17ae00ec1dd696dabda7f457d23
-  data.tar.gz: f384a6d7ee62080902c06ce1bc37dbc184313c7150af13af7f45d732da499cd5
+  metadata.gz: ba919b0429b44accf46af4dcdc52ef1ddcf691a446cddf1bc434b38982c6b0c2
+  data.tar.gz: b54c35f3d81a3b170a8a27b657f1c0b8137c49716fab6b1ba0717845f1b15649
 SHA512:
-  metadata.gz: 4918c47b9cd9bfdc0d2e12733f00c7608999162e0d041b9c6414ca63aa3660dafb87e01d10eb52ffb106895c0cda44f1e89231c546be72bf94707253e71bb5da
-  data.tar.gz: 29d229496fc5e75e3d74b7b2f9312dde645dd29c44833d7c6315b01109410364262e9c90e16f49117b2fffe503077006bf602074b937963aa78b5cd4d4b90ac0
+  metadata.gz: d949ae03350ff838eb97856d4c34afb610708dde36bee45d32b56de0bd1bf48a5e0adb4e67aaa549e1e35393cca146be755258fbc213422ab9a91b299769688e
+  data.tar.gz: 4ddc52d5273f06837f54a3806e56ebdad52c2a60581aa452b196de25885697348b13af8f56e27716ed2234b3771072f3f93e365035cdfc02b1539e7aa8385fb1

data/.travis.yml

@@ -1,9 +1,14 @@
 script: bundle exec rspec spec
 env:
   matrix:
-    - RAILS=5.1.6.2
-    - RAILS=5.2.2.1
+    - RAILS=5.2.6
+    - RAILS=6.0.4
+    - RAILS=6.1.4
 rvm:
-  - 2.3.8
-  - 2.4.5
-  - 2.5.5
+  - 2.6.7
+  - 2.7.4
+  - 3.0.2
+jobs:
+  exclude:
+    - rvm: 3.0.1
+      env: RAILS=5.2.6

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/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/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

@@ -110,7 +110,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/version.rb

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

data/spec/import_spec.rb

@@ -371,6 +371,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_import
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Igor Fedoronchuk
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2021-11-17 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
@@ -134,7 +134,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 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: ActiveAdmin import based on activerecord-import gem.
 test_files: