Merge pull request #207 from activeadmin-plugins/v6.0.0

Drop EOL versions, switch to Cuprite, modernize CI

Author: Fivell

.github/workflows/test.yml

@@ -1,43 +1,42 @@
-name: Test
-
+name: CI
 on:
-  - push
-  - pull_request
-
+  pull_request:
+  push:
+    branches: [master]
 jobs:
-  build:
+  test:
+    name: Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / AA ${{ matrix.activeadmin }}
     runs-on: ubuntu-latest
-
     strategy:
+      fail-fast: false
       matrix:
-        ruby_version:
-          - '2.6'
-          - '2.7'
-          - '3.0'
-        rails_version:
-          - '5.2.6'
-          - '6.0.4'
-          - '6.1.4'
-          - '7.0.0'
-        exclude:
-          - ruby_version: '3.0'
-            rails_version: '5.2.6'
-          - ruby_version: '2.6'
-            rails_version: '7.0.0'
-
-    name: Ruby ${{ matrix.ruby_version }} / Rails ${{ matrix.rails_version }}
-
+        ruby: ['3.2', '3.3', '3.4']
+        rails: ['7.1.0', '7.2.0']
+        activeadmin: ['3.2.0', '3.3.0']
     env:
-      RAILS: ${{ matrix.rails_version }}
-
+      RAILS: ${{ matrix.rails }}
+      AA: ${{ matrix.activeadmin }}
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby_version }}
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-
-      - name: Test
+      - 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/

Gemfile

@@ -1,21 +1,20 @@
-# frozen_string_literal: true
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in active_admin_importable.gemspec
 gemspec
 
+default_rails_version = '7.1.0'
+default_activeadmin_version = '3.2.0'
+
+gem 'rails', "~> #{ENV['RAILS'] || default_rails_version}"
+gem 'activeadmin', "~> #{ENV['AA'] || default_activeadmin_version}"
+gem 'sprockets-rails'
+gem 'sass-rails'
 
 group :test do
-  default_rails_version = "~> 5.2.4"
-  rails_version = ENV['RAILS'] || default_rails_version
-  gem 'sassc-rails'
-  gem 'rails', rails_version
+  gem 'simplecov', require: false
   gem 'rspec-rails'
-  gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
-  gem "sqlite3", "~> 1.4.0"
-  gem 'launchy'
+  gem 'sqlite3', '~> 2.0'
   gem 'database_cleaner'
   gem 'capybara'
-  gem 'poltergeist'
-  gem 'jquery-ui-rails', '~> 5.0'
+  gem 'cuprite'
+  gem 'webrick', require: false
 end

README.md

@@ -7,7 +7,7 @@
 [![License        ][license_badge]][license_link]
 
 
-The most fastest and efficient CSV import for Active Admin with support of validations, bulk inserts and encodings handling.
+The fastest and most efficient CSV import for Active Admin with support for validations, bulk inserts, and encoding handling.
 
 For more about ActiveAdminImport installation and usage, check [Documentation website](http://activeadmin-plugins.github.io/active_admin_import/) and [Wiki pages](https://github.com/activeadmin-plugins/active_admin_import/wiki) for some specific cases and caveats.
 
@@ -44,7 +44,7 @@ And then execute:
 #### Basic usage
 
 ```ruby
-ActiveAdmin.register Post
+ActiveAdmin.register Post do
   active_admin_import options
 end
 ```
@@ -99,8 +99,8 @@ Tool                  | Description
 [codeclimate_link]: https://codeclimate.com/github/activeadmin-plugins/active_admin_import
 [rubygems_badge]: https://badge.fury.io/rb/active_admin_import.svg
 [rubygems_link]: https://rubygems.org/gems/active_admin_import
-[license_badge]: http://img.shields.io/:license-mit-blue.svg
-[license_link]: http://Fivell.mit-license.org
+[license_badge]: https://img.shields.io/:license-mit-blue.svg
+[license_link]: https://Fivell.mit-license.org
 
 
 ## Contributing

Rakefile

@@ -1,8 +1,5 @@
-# frozen_string_literal: true
-require 'bundler'
+require "bundler"
 require 'rake'
 Bundler.setup
 Bundler::GemHelper.install_tasks
-
-# Import all our rake tasks
 FileList['tasks/**/*.rake'].each { |task| import task }

active_admin_import.gemspec

@@ -7,16 +7,16 @@ Gem::Specification.new do |gem|
   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 = 'http://github.com/Fivell/active_admin_import'
+  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.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.name = 'active_admin_import'
   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'
+  gem.add_dependency 'activeadmin', '>= 3.0', '< 4.0'
 end

spec/import_spec.rb

@@ -27,7 +27,7 @@ def with_zipped_csv(name, &block)
     zip_file = File.expand_path("./spec/fixtures/files/#{name}.zip")
 
     begin
-      Zip::File.open(zip_file, Zip::File::CREATE) do |z|
+      Zip::File.open(zip_file, create: true) do |z|
         z.add "#{name}.csv", File.expand_path("./spec/fixtures/files/#{name}.csv")
       end
       instance_eval &block

spec/spec_helper.rb

@@ -1,6 +1,7 @@
-# frozen_string_literal: true
-require 'coveralls'
-Coveralls.wear!
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/spec/'
+end
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH << File.expand_path('../support', __FILE__)
@@ -10,44 +11,38 @@
 Bundler.setup
 
 ENV['RAILS_ENV'] = 'test'
-# Ensure the Active Admin load path is happy
 require 'rails'
 ENV['RAILS'] = Rails.version
 ENV['RAILS_ROOT'] = File.expand_path("../rails/rails-#{ENV['RAILS']}", __FILE__)
-# Create the test app if it doesn't exists
 system 'rake setup' unless File.exist?(ENV['RAILS_ROOT'])
 
 require 'active_model'
-# require ActiveRecord to ensure that Ransack loads correctly
 require 'active_record'
 require 'action_view'
 require 'active_admin'
 ActiveAdmin.application.load_paths = [ENV['RAILS_ROOT'] + '/app/admin']
 require ENV['RAILS_ROOT'] + '/config/environment.rb'
-# Disabling authentication in specs so that we don't have to worry about
-# it allover the place
 ActiveAdmin.application.authentication_method = false
 ActiveAdmin.application.current_user_method = false
 
 require 'rspec/rails'
 require 'support/admin'
 require 'capybara/rails'
 require 'capybara/rspec'
-require 'capybara/poltergeist'
+require 'capybara/cuprite'
 
-Capybara.register_driver :poltergeist do |app|
-  Capybara::Poltergeist::Driver.new(app, js_errors: true,
-                                         timeout: 80,
-                                         debug: true,
-                                         phantomjs_options: ['--debug=no', '--load-images=no'])
+Capybara.server = :webrick
+Capybara.register_driver :cuprite do |app|
+  Capybara::Cuprite::Driver.new(app, headless: true, window_size: [1280, 800])
 end
-
-Capybara.javascript_driver = :poltergeist
+Capybara.javascript_driver = :cuprite
+Capybara.default_max_wait_time = 5
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = false
 
   config.before(:suite) do
+    ActiveRecord::Migration.maintain_test_schema!
     DatabaseCleaner.strategy = :truncation
     DatabaseCleaner.clean_with(:truncation)
   end

spec/support/rails_template.rb

@@ -1,29 +1,21 @@
-# frozen_string_literal: true
-# Rails template to build the sample app for specs
+generate :model, 'author name:string{10}:uniq last_name:string birthday:date --force'
+generate :model, 'post title:string:uniq body:text author:references --force'
 
-generate :model, 'author name:string{10}:uniq last_name:string birthday:date'
-generate :model, 'post title:string:uniq body:text author:references'
-
-# Add validation
 inject_into_file 'app/models/author.rb', "  validates_presence_of :name\n  validates_uniqueness_of :last_name\n", before: 'end'
 inject_into_file 'app/models/post.rb', "  validates_presence_of :author\n", before: 'end'
 
-# Configure default_url_options in test environment
-inject_into_file 'config/environments/test.rb', "  config.action_mailer.default_url_options = { :host => 'example.com' }\n", after: "config.cache_classes = true\n"
-
-# Add our local Active Admin to the load path
-inject_into_file 'config/environment.rb', "\n$LOAD_PATH.unshift('#{File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))}')\nrequire \"active_admin\"\n", after: "require File.expand_path('../application', __FILE__)"
-
-run 'rm Gemfile'
+# Add our local Active Admin to the load path (Rails 7.1+)
+gsub_file "config/environment.rb",
+  'require_relative "application"',
+  "require_relative \"application\"\n$LOAD_PATH.unshift('#{File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))}')\nrequire \"active_admin\"\n"
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 generate :'active_admin:install --skip-users'
 generate :'formtastic:install'
 
-run 'rm -r test'
-run 'rm -r spec'
-
+run 'rm -rf test'
 route "root :to => 'admin/dashboard#index'"
-
 rake 'db:migrate'
+
+run 'rm -f Gemfile Gemfile.lock'

tasks/test.rake

@@ -1,7 +1,13 @@
-# frozen_string_literal: true
-desc 'Creates a test rails app for the specs to run against'
+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  --skip-bootsnap"
+
+  rails_new_opts = %w(
+    --skip-turbolinks
+    --skip-spring
+    --skip-bootsnap
+    -m
+    spec/support/rails_template.rb
+  )
+  system "bundle exec rails new spec/rails/rails-#{Rails::VERSION::STRING} #{rails_new_opts.join(' ')}"
 end