active_admin_scoped_collection_actions 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 48f3b27e6e615890eca448e5061ca11e96b249c6
-  data.tar.gz: c1c4f7226524058d732eb544506a6baa9c300ac6
+SHA256:
+  metadata.gz: f9192c809349fab7e5444cea16d61270bd75e2a113c8cc79d1567ebea4c1dd75
+  data.tar.gz: f6fd7507751f7c7297f861fce239fb42a055703c619bea1292d0d98deb6ece6d
 SHA512:
-  metadata.gz: 4239c88a770f0ea8ffb34ec806f738f11b80e1282d374c2e04cba3694167e3b6de6fdc3379ae21977c8dc86f57ed99506900823ddaa58a7fee8dea8123fa0cc9
-  data.tar.gz: 5592807cf0f632006bcb5ba176409461ab5145305dcc30dc4125216ecfe80d95a615653133722ca72c895fa68ead8561024cfd9260c24d54c5e10b9ae870e526
+  metadata.gz: a46f91dd43671741a6491ba4e8c5188094bb803f2df0c0a8821d4b0a900b26dd75acf5e2d7c86534b9c03b5ae80a9b472482bf5b1998d61112de01117b255e6c
+  data.tar.gz: 234f4d2c251e0d48c3db9b1241c5628e32d2a57bf817e4b3884a41a5e150e5f06273aedd0a0ec999d5ba6d669f34caba9d12d0723cbf063a9f540942bdf4855d

data/.travis.yml

@@ -1,8 +1,22 @@
+sudo: required
+
+language: ruby
+
+addons:
+  chrome: stable
+
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
+
 script: bundle exec rspec spec
+
+env:
+  matrix:
+    - RAILS=4.2.0 AA=1.1.0
+    - RAILS=5.2.0 AA=1.4.0
+    - RAILS=5.2.0 AA=2.0.0
+
 rvm:
-  - 2.2.7
-  - 2.3.4
-before_install:
-  - gem install bundler -v '= 1.9.3'
-  - gem update --system
-  - gem --version
+  - 2.4.6
+  - 2.6.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## ActiveAdmin Scoped Collection Actions 0.3.5 (November 22, 2017) ##
+
+*   compatibility with Decorators, fix is intended for old ActiveAdmin (@Zamyatin-AA #30)
+
 ## ActiveAdmin Scoped Collection Actions 0.3.4 (August 19, 2017) ##
 
 *   Swedish locale (@buren #27)

data/Gemfile

@@ -1,18 +1,19 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in activeadmin_scoped_collection_actions.gemspec
 gemspec
+
 group :test do
-  gem 'sprockets-rails', '2.3.3'
-  gem 'rails', '~> 5.1'
-  gem 'rspec-rails'
+  gem 'activeadmin', "~> #{ENV['AA'] || '2.0.0'}"
+  gem 'rails', "~> #{ENV['RAILS'] || '5.2.0'}"
+
+  gem 'capybara'
+  gem 'chromedriver-helper'
+  gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
+  gem 'database_cleaner'
   gem 'draper'
-  gem 'activeadmin', '1.0.0'
-  gem 'sass-rails'
-  gem 'sqlite3'
   gem 'launchy'
-  gem 'database_cleaner'
-  gem 'capybara'
+  gem 'rspec-rails'
+  gem 'sass-rails'
   gem 'selenium-webdriver'
-  gem 'poltergeist'
+  gem 'sqlite3', '~> 1.3.6'
 end

data/README.md

@@ -29,7 +29,7 @@ And then execute:
 $ bundle
 ```
 
-Add the following line at the end of "app/assets/javascript/active_admin.js.coffee":
+Add the following line at the end of "app/assets/javascript/active_admin.js":
 
 ```javascript
 //= require active_admin_scoped_collection_actions

data/active_admin_scoped_collection_actions.gemspec

@@ -17,6 +17,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.8"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency "activeadmin", ">= 1.1", "< 3.a"
 end

data/lib/active_admin_scoped_collection_actions/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdminScopedCollectionActions
-  VERSION = "0.3.5"
+  VERSION = '0.4.0'.freeze
 end

data/tasks/test.rake

@@ -1,6 +1,14 @@
-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.exists?("spec/rails")
-  system "bundle exec rails new spec/rails/rails-#{Rails::VERSION::STRING} -m spec/support/rails_template.rb --skip-spring"
+
+  rails_new_args = %w[
+    --skip-turbolinks
+    --skip-spring
+    --skip-bootsnap
+    -m
+    spec/support/rails_template.rb
+  ].join(' ')
+
+  system "bundle exec rails new spec/rails/rails-#{Rails::VERSION::STRING} #{rails_new_args}"
 end

data/vendor/assets/javascripts/active_admin_scoped_collection_actions.js

@@ -0,0 +1,29 @@
+//= require ./lib/dialog_mass_fields_update
+
+$(document).ready(() =>
+
+  $(document).on('click', '.scoped_collection_action_button', function(e) {
+    e.preventDefault();
+    const fields = JSON.parse( $(this).attr('data') );
+
+    return ActiveAdmin.dialogMassFieldsUpdate(fields['confirm'], fields['inputs'],
+      inputs=> {
+        const url = window.location.pathname + '/batch_action' + window.location.search;
+        const form_data = {
+          changes: inputs,
+          collection_selection: [],
+          authenticity_token: fields['auth_token'],
+          batch_action: fields['batch_action']
+        };
+        $('.paginated_collection').find('input.collection_selection:checked').each((i, el) => form_data["collection_selection"].push($(el).val()));
+
+        return $.post(url, form_data).always(function(data, textStatus, jqXHR) {
+          if (jqXHR.getResponseHeader('Location')) {
+            return window.location.assign(jqXHR.getResponseHeader('Location'));
+          } else {
+            return window.location.reload();
+          }
+        });
+    });
+  })
+);

data/vendor/assets/javascripts/lib/dialog_mass_fields_update.js

@@ -0,0 +1,73 @@
+ActiveAdmin.dialogMassFieldsUpdate = function(message, inputs, callback){
+  let html = `<form id="dialog_confirm" title="${message}"><div stype="padding-right:4px;padding-left:1px;margin-right:2px"><ul>`;
+  for (let name in inputs) {
+    var elem, opts, wrapper;
+    let type = inputs[name];
+    if (/^(datepicker|checkbox|text)$/.test(type)) {
+      wrapper = 'input';
+    } else if ($.isArray(type)) {
+      [wrapper, elem, opts, type] = Array.from(['select', 'option', type, '']);
+    } else {
+      throw new Error(`Unsupported input type: {${name}: ${type}}`);
+    }
+
+    let klass = type === 'datepicker' ? type : '';
+    html += `<li>
+<input type='checkbox' class='mass_update_protect_fild_flag' value='Y' id="mass_update_dialog_${name}" />
+<label for="mass_update_dialog_${name}"> ${name.charAt(0).toUpperCase() + name.slice(1)}</label>
+<${wrapper} name="${name}" class="${klass}" type="${type}" disabled="disabled">` +
+        (opts ? ((() => {
+          const result = [];
+
+          for (let v of Array.from(opts)) {
+            const $elem = $(`<${elem}/>`);
+            if ($.isArray(v)) {
+              $elem.text(v[0]).val(v[1]);
+            } else {
+              $elem.text(v);
+            }
+            result.push($elem.wrap('<div>').parent().html());
+          }
+
+          return result;
+        })()).join('') : '');
+    if (wrapper === 'select') {
+      html += `</${wrapper}>`;
+    }
+    html += "</li>";
+
+    [wrapper, elem, opts, type, klass] = Array.from([]);
+  } // unset any temporary variables
+
+  html += "</ul></div></form>";
+
+  const form = $(html).appendTo('body');
+
+  $('body').trigger('mass_update_modal_dialog:before_open', [form]);
+
+  return form.dialog({
+    modal: true,
+    dialogClass: 'active_admin_dialog active_admin_dialog_mass_update_by_filter',
+    maxHeight: window.innerHeight - (window.innerHeight * 0.1),
+    open() {
+      $('body').trigger('mass_update_modal_dialog:after_open', [form]);
+      return $('.mass_update_protect_fild_flag').on('change', function(e) {
+        if (this.checked) {
+          return $(e.target).next().next().removeAttr('disabled').trigger("chosen:updated");
+        } else {
+          return $(e.target).next().next().attr('disabled', 'disabled').trigger("chosen:updated");
+        }
+      });
+    },
+    buttons: {
+      OK(e){
+        $(e.target).closest('.ui-dialog-buttonset').html('<span>Processing. Please wait...</span>');
+        return callback($(this).serializeObject());
+      },
+      Cancel() {
+        $('.mass_update_protect_fild_flag').off('change');
+        return $(this).dialog('close').remove();
+      }
+    }
+  });
+};

metadata

@@ -1,43 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_scoped_collection_actions
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Gena M.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activeadmin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '1.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: 3.a
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 3.a
 description: Plugin for ActiveAdmin. Provides batch Update and Delete for scoped_collection
   (Filters + Scope) across all pages.
 email:
@@ -68,8 +60,8 @@ files:
 - screenshots/pupup.png
 - screenshots/sidebar.png
 - tasks/test.rake
-- vendor/assets/javascripts/active_admin_scoped_collection_actions.js.coffee
-- vendor/assets/javascripts/lib/dialog_mass_fields_update.js.coffee
+- vendor/assets/javascripts/active_admin_scoped_collection_actions.js
+- vendor/assets/javascripts/lib/dialog_mass_fields_update.js
 - vendor/assets/stylesheets/active_admin_scoped_collection_actions.scss
 homepage: https://github.com/activeadmin-plugins/active_admin_scoped_collection_actions
 licenses:
@@ -90,8 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: scoped_collection actions extension for ActiveAdmin

data/vendor/assets/javascripts/active_admin_scoped_collection_actions.js.coffee

@@ -1,25 +0,0 @@
-#= require ./lib/dialog_mass_fields_update
-
-$(document).ready ->
-
-  $(document).on 'click', '.scoped_collection_action_button', (e) ->
-    e.preventDefault()
-    fields = JSON.parse( $(this).attr('data') )
-
-    ActiveAdmin.dialogMassFieldsUpdate fields['confirm'], fields['inputs'],
-      (inputs)=>
-        url = window.location.pathname + '/batch_action' + window.location.search
-        form_data = {
-          changes: inputs,
-          collection_selection: [],
-          authenticity_token: fields['auth_token'],
-          batch_action: fields['batch_action']
-        }
-        $('.paginated_collection').find('input.collection_selection:checked').each (i, el) ->
-          form_data["collection_selection"].push($(el).val())
-
-        $.post(url, form_data).always (data, textStatus, jqXHR) ->
-          if jqXHR.getResponseHeader('Location')
-            window.location.assign jqXHR.getResponseHeader('Location')
-          else
-            window.location.reload()

data/vendor/assets/javascripts/lib/dialog_mass_fields_update.js.coffee

@@ -1,54 +0,0 @@
-ActiveAdmin.dialogMassFieldsUpdate = (message, inputs, callback)->
-  html = """<form id="dialog_confirm" title="#{message}"><div stype="padding-right:4px;padding-left:1px;margin-right:2px"><ul>"""
-  for name, type of inputs
-    if /^(datepicker|checkbox|text)$/.test type
-      wrapper = 'input'
-    else if $.isArray type
-      [wrapper, elem, opts, type] = ['select', 'option', type, '']
-    else
-      throw new Error "Unsupported input type: {#{name}: #{type}}"
-
-    klass = if type is 'datepicker' then type else ''
-    html += """<li>
-      <input type='checkbox' class='mass_update_protect_fild_flag' value='Y' id="mass_update_dialog_#{name}" />
-      <label for="mass_update_dialog_#{name}"> #{name.charAt(0).toUpperCase() + name.slice(1)}</label>
-      <#{wrapper} name="#{name}" class="#{klass}" type="#{type}" disabled="disabled">""" +
-        (if opts then (
-          for v in opts
-            $elem = $("<#{elem}/>")
-            if $.isArray v
-              $elem.text(v[0]).val(v[1])
-            else
-              $elem.text(v)
-            $elem.wrap('<div>').parent().html()
-        ).join '' else '')
-    if wrapper == 'select'
-      html += "</#{wrapper}>"
-    html += "</li>"
-
-    [wrapper, elem, opts, type, klass] = [] # unset any temporary variables
-
-  html += "</ul></div></form>"
-
-  form = $(html).appendTo('body')
-
-  $('body').trigger 'mass_update_modal_dialog:before_open', [form]
-
-  form.dialog
-    modal: true
-    dialogClass: 'active_admin_dialog active_admin_dialog_mass_update_by_filter',
-    maxHeight: window.innerHeight - window.innerHeight * 0.1,
-    open: ->
-      $('body').trigger 'mass_update_modal_dialog:after_open', [form]
-      $('.mass_update_protect_fild_flag').on 'change', (e) ->
-        if this.checked
-          $(e.target).next().next().removeAttr('disabled').trigger("chosen:updated")
-        else
-          $(e.target).next().next().attr('disabled', 'disabled').trigger("chosen:updated")
-    buttons:
-      OK: (e)->
-        $(e.target).closest('.ui-dialog-buttonset').html('<span>Processing. Please wait...</span>')
-        callback $(@).serializeObject()
-      Cancel: ->
-        $('.mass_update_protect_fild_flag').off('change')
-        $(@).dialog('close').remove()