Merge pull request #114 from activeadmin-plugins/rails5

WIP rails 5 support

Author: Fivell

.travis.yml

@@ -1,15 +1,22 @@
 script: bundle exec rspec spec
 env:
   matrix:
-    - RAILS=4.0.13
-    - RAILS=4.1.15
     - RAILS=4.2.6
+    - RAILS=5.0.0
 rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.9
   - 2.2.5
   - 2.3.1
+matrix:
+  exclude:
+    - rvm: 1.9.3
+      env: RAILS=5.0.0
+    - rvm: 2.0.0
+      env: RAILS=5.0.0
+    - rvm: 2.1.9
+      env: RAILS=5.0.0
 before_install:
   - gem install bundler -v '= 1.9.3'
   - gem update --system

Gemfile

@@ -2,20 +2,29 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in active_admin_importable.gemspec
 gemspec
+default_rails_version = '4.2.6'
+rails_version = ENV['RAILS'] || default_rails_version
+rails_major = rails_version[0]
+
 group :test do
-  default_rails_version = '4.2.6'
-  gem 'sprockets-rails', '2.3.3'
-  gem 'rails',  "#{ENV['RAILS'] || default_rails_version}"
+
+  gem 'rails', rails_version
+  if rails_major == '5'
+    gem 'inherited_resources', github: 'activeadmin/inherited_resources'
+    gem 'activeadmin', github: 'activeadmin/activeadmin'
+  else
+    gem 'activeadmin', '1.0.0.pre4'
+  end
+
   gem 'rspec-rails'
-  gem 'activeadmin', github: 'activeadmin'  , ref: 'd787029e5523be2eb2ed99816eb0cecca2b72862'
   gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
-  gem 'sass-rails'
   gem 'sqlite3'
   gem 'launchy'
   gem 'database_cleaner'
   gem 'capybara'
   gem 'selenium-webdriver'
   gem 'poltergeist'
-  gem 'json', '~> 1.8', platforms: :ruby_19 # Json 2.0 requires Ruby >= 2.0
+  gem 'json', '< 2.0', platforms: :ruby_19 # Json 2.0 requires Ruby >= 2.0
   gem 'mime-types', '< 3.0.0', platforms: [:ruby_19, :ruby_20]
+  gem 'tins', '< 1.3.4', platforms: :ruby_19
 end

lib/active_admin_import/dsl.rb

@@ -63,7 +63,8 @@ def active_admin_import(options = {}, &block)
 
       collection_action :do_import, method: :post do
         authorize!(ActiveAdminImport::Auth::IMPORT, active_admin_config.resource_class)
-
+        _params = params.respond_to?(:to_unsafe_h) ? params.to_unsafe_h : params
+        params = ActiveSupport::HashWithIndifferentAccess.new _params
         @active_admin_import_model = options[:template_object]
         @active_admin_import_model.assign_attributes(params[params_key].try(:deep_symbolize_keys) || {})
         #go back to form

spec/support/rails_template.rb

@@ -4,8 +4,8 @@
 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"
+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"

tasks/test.rake

@@ -2,5 +2,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.exists?("spec/rails")
-  system "bundle exec rails new spec/rails/rails-#{Rails::VERSION::STRING} -m spec/support/rails_template.rb --skip-spring"
+  system "bundle exec rails new spec/rails/rails-#{Rails::VERSION::STRING} -m spec/support/rails_template.rb --skip-spring  --skip-turbolinks"
 end