active_admin_import 3.0.0.pre → 3.0.0

data/spec/model_spec.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'active_model_lint'
-describe ActiveAdminImport::Model   do
-  it_behaves_like "ActiveModel"
-end
+describe ActiveAdminImport::Model do
+  it_behaves_like 'ActiveModel'
+end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'coveralls'
 Coveralls.wear!
 
@@ -5,27 +6,23 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH << File.expand_path('../support', __FILE__)
 
 ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
-require "bundler"
+require 'bundler'
 Bundler.setup
 
-ENV['RAILS'] = '4.1.9'
-
 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
-unless File.exists?(ENV['RAILS_ROOT'])
-  system 'rake setup'
-end
+system 'rake setup' unless File.exist?(ENV['RAILS_ROOT'])
 
-# Ensure the Active Admin load path is happy
-require 'rails'
 require 'active_model'
+# require ActiveRecord to ensure that Ransack loads correctly
+require 'active_record'
 require 'active_admin'
-ActiveAdmin.application.load_paths = [ENV['RAILS_ROOT'] + "/app/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
@@ -37,23 +34,15 @@ require 'capybara/rails'
 require 'capybara/rspec'
 require 'capybara/poltergeist'
 
-
-
-
 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::Poltergeist::Driver.new(app, js_errors: true,
+                                         timeout: 80,
+                                         debug: true,
+                                         phantomjs_options: ['--debug=no', '--load-images=no'])
 end
 
-
 Capybara.javascript_driver = :poltergeist
 
-
 RSpec.configure do |config|
   config.use_transactional_fixtures = false
 
@@ -69,4 +58,3 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 end
-

data/spec/support/active_model_lint.rb

@@ -1,9 +1,10 @@
-shared_examples_for "ActiveModel" do
+# frozen_string_literal: true
+shared_examples_for 'ActiveModel' do
   include ActiveModel::Lint::Tests
 
   # to_s is to support ruby-1.9
-  ActiveModel::Lint::Tests.public_instance_methods.map{|m| m.to_s}.grep(/^test/).each do |m|
-    example m.gsub('_',' ') do
+  ActiveModel::Lint::Tests.public_instance_methods.map(&:to_s).grep(/^test/).each do |m|
+    example m.tr('_', ' ') do
       send m
     end
   end
@@ -11,4 +12,4 @@ shared_examples_for "ActiveModel" do
   def model
     subject
   end
-end
+end

data/spec/support/admin.rb

@@ -1,20 +1,16 @@
+# frozen_string_literal: true
 def add_author_resource(options = {}, &block)
-
   ActiveAdmin.register Author do
-     config.filters = false
-     active_admin_import(options, &block)
+    config.filters = false
+    active_admin_import(options, &block)
   end
   Rails.application.reload_routes!
-
 end
 
-
 def add_post_resource(options = {}, &block)
-
   ActiveAdmin.register Post do
-     config.filters = false
-     active_admin_import(options, &block)
+    config.filters = false
+    active_admin_import(options, &block)
   end
   Rails.application.reload_routes!
-
 end

data/spec/support/rails_template.rb

@@ -1,29 +1,29 @@
+# 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'
 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", after: "Base\n"
-inject_into_file "app/models/post.rb", "   validates_presence_of :author\n", after: ":author\n"
+# 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"
+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__)"
+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"
+run 'rm Gemfile'
 
 $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 -r test'
+run 'rm -r spec'
 
-# Setup a root path for devise
 route "root :to => 'admin/dashboard#index'"
 
-rake "db:migrate"
+rake 'db:migrate'

data/tasks/test.rake

@@ -1,6 +1,7 @@
-desc "Creates a test rails app for the specs to run against"
+# frozen_string_literal: true
+desc 'Creates a test rails app for the specs to run against'
 task :setup do
   require 'rails/version'
-  system("mkdir spec/rails") unless File.exists?("spec/rails")
-  system "bundle exec rails new spec/rails/rails-#{Rails::VERSION::STRING} -m spec/support/rails_template.rb --skip-spring"
-end
+  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"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_import
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre
+  version: 3.0.0
 platform: ruby
 authors:
 - Igor Fedoronchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -16,62 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: rchardet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activeadmin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.0'
 description: The most efficient way to import for Active Admin
 email:
 - fedoronchuk@gmail.com
@@ -80,7 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".hound.yml"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -90,7 +84,13 @@ files:
 - app/views/admin/import.html.erb
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/fr.yml
 - config/locales/it.yml
+- config/locales/ja.yml
+- config/locales/ko.yml
+- config/locales/pt-BR.yml
+- config/locales/ru.yml
+- config/locales/uk.yml
 - config/locales/zh-CN.yml
 - lib/active_admin_import.rb
 - lib/active_admin_import/authorization.rb
@@ -112,6 +112,7 @@ files:
 - 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/posts.csv
@@ -140,12 +141,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: ActiveAdmin import based on activerecord-import gem.
@@ -161,6 +162,7 @@ test_files:
 - 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/posts.csv
@@ -173,4 +175,3 @@ test_files:
 - spec/support/active_model_lint.rb
 - spec/support/admin.rb
 - spec/support/rails_template.rb
-has_rdoc: 

data/.hound.yml

@@ -1,4 +0,0 @@
-ruby:
-  enabled: true
-StringLiterals:
-  EnforcedStyle: single_quotes