Merge pull request #26 from workgena/rails-5.1-compatibility

Rails 5.1 compatibility

Author: workgena

.gitignore

@@ -10,3 +10,4 @@
 /.idea
 .DS_Store
 /spec/rails
+.versions.conf

.travis.yml

@@ -1,8 +1,7 @@
 script: bundle exec rspec spec
 rvm:
-  - 2.1.10
-  - 2.2.6
-  - 2.3.3
+  - 2.2.7
+  - 2.3.4
 before_install:
   - gem install bundler -v '= 1.9.3'
   - gem update --system

CHANGELOG.md

@@ -0,0 +1,13 @@
+## ActiveAdmin Scoped Collection Actions 0.3.3 (July 17, 2017) ##
+
+*   Fixed compatibility with Rails 5.1
+
+
+## ActiveAdmin Scoped Collection Actions 0.3.2 (July 17, 2017) ##
+
+*   Added I18n support.
+
+    translations for English and Spanish (@cpfarher #25).
+
+    *Christian Pfarher*
+

Gemfile

@@ -4,9 +4,9 @@ source 'https://rubygems.org'
 gemspec
 group :test do
   gem 'sprockets-rails', '2.3.3'
-  gem 'rails', '4.2.0'
+  gem 'rails', '~> 5.1'
   gem 'rspec-rails'
-  gem 'activeadmin', github: 'activeadmin', ref: '64b5295571400c461376cf060dae9522731fe6d9'
+  gem 'activeadmin', '1.0.0'
   gem 'sass-rails'
   gem 'sqlite3'
   gem 'launchy'

lib/active_admin_scoped_collection_actions/dsl.rb

@@ -3,9 +3,6 @@ module DSL
 
     def scoped_collection_action(name, options = {}, &block)
       if name == :scoped_collection_destroy
-        
-      
-
         options[:title] = I18n.t('active_admin_scoped_collection_actions.actions.delete') if options[:title].nil?
         add_scoped_collection_action_default_destroy(options, &block)
       elsif name == :scoped_collection_update
@@ -18,15 +15,14 @@ def scoped_collection_action(name, options = {}, &block)
       config.add_scoped_collection_action(name, options)
     end
 
-
     def add_scoped_collection_action_default_update(options, &block)
       batch_action :scoped_collection_update, if: proc { false } do
         unless authorized?(:batch_edit, resource_class)
           flash[:error] = I18n.t('active_admin_scoped_collection_actions.actions.no_permissions_msg')
-          render nothing: true, status: :no_content and next
+          head :ok and next
         end
         if !params.has_key?(:changes) || params[:changes].empty?
-          render nothing: true, status: :no_content and next
+          head :ok and next
         end
         permitted_changes = params.require(:changes).permit(*(options[:form].call.keys))
         if block_given?
@@ -43,17 +39,16 @@ def add_scoped_collection_action_default_update(options, &block)
           else
             flash[:error] = errors.join(". ")
           end
-          render nothing: true, status: :no_content
+          head :ok
         end
       end
     end
 
-
     def add_scoped_collection_action_default_destroy(_, &block)
       batch_action :scoped_collection_destroy, if: proc { false } do |_|
         unless authorized?(:batch_destroy, resource_class)
           flash[:error] = I18n.t('active_admin_scoped_collection_actions.actions.no_permissions_msg')
-          render nothing: true, status: :no_content and next
+          head :ok and next
         end
         if block_given?
           instance_eval &block
@@ -69,11 +64,11 @@ def add_scoped_collection_action_default_destroy(_, &block)
           else
             flash[:error] = errors.join(". ")
           end
-          render nothing: true, status: :no_content
+          head :ok
         end
       end
     end
 
-
   end
 end
+

lib/active_admin_scoped_collection_actions/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdminScopedCollectionActions
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end