activeadmin-rails 1.7.2 → 1.8.0

data/app/assets/stylesheets/active_admin/structure/_title_bar.scss

@@ -1,20 +1,28 @@
 #title_bar {
   @include section-header;
-  @include clearfix;
   box-sizing: border-box;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.37);
-  display: table;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
   border-bottom-color: #EEE;
   width: 100%;
   position: relative;
   margin: 0;
   padding: 10px $horizontal-page-margin;
-  z-index: 800;
+  z-index: 1000;
 
   #titlebar_left, #titlebar_right {
-    height: 50px;
-    vertical-align: middle;
-    display: table-cell;
+    min-height: 50px;
+    display: flex;
+    align-items: center;
+  }
+
+  #titlebar_left {
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: center;
+    gap: 3px;
   }
 
   #titlebar_right {
@@ -33,8 +41,11 @@
     span.action_item {
       & > a, & > .dropdown_menu > a {
         @include light-button;
-        padding: 12px 17px 10px;
-        margin: 0px;
+
+        & {
+          padding: 12px 17px 10px;
+          margin: 0px;
+        }
       }
     }
   }

data/app/javascript/active_admin/base.js

@@ -0,0 +1,28 @@
+import "jquery"
+import "jquery-ui/ui/widgets/datepicker"
+import "jquery-ui/ui/widgets/dialog"
+import "jquery-ui/ui/widgets/sortable"
+import "jquery-ui/ui/widgets/tabs"
+import "jquery-ui/ui/widget"
+import "jquery-ujs"
+
+import "./ext/jquery"
+import "./ext/jquery-ui"
+import "./initializers/batch-actions"
+import "./initializers/checkbox-toggler"
+import "./initializers/datepicker"
+import "./initializers/dropdown-menu"
+import "./initializers/filters"
+import "./initializers/has-many"
+import "./initializers/per-page"
+import "./initializers/table-checkbox-toggler"
+import "./initializers/tabs"
+
+import ModalDialog from "./lib/modal-dialog";
+
+function modal_dialog(message, inputs, callback) {
+  console.warn("ActiveAdmin.modal_dialog is deprecated in favor of ActiveAdmin.ModalDialog, please update usage.");
+  return ModalDialog(message, inputs, callback);
+}
+
+export { ModalDialog, modal_dialog };

data/app/{assets/javascripts/active_admin/lib/batch_actions.es6 → javascript/active_admin/initializers/batch-actions.js}

@@ -1,10 +1,12 @@
+import ModalDialog from "../lib/modal-dialog";
+
 const onDOMReady = function() {
   // Detach any previously attached handlers before re-attaching them.
   // This avoids double-registered handlers when Turbolinks is enabled
   $('.batch_actions_selector li a').off('click confirm:complete');
 
   //
-  // Use ActiveAdmin.modal_dialog to prompt user if
+  // Use ModalDialog to prompt user if
   // confirmation is required for current Batch Action
   //
   $('.batch_actions_selector li a').on('click', function(event){
@@ -12,7 +14,7 @@ const onDOMReady = function() {
     event.stopPropagation(); // prevent Rails UJS click event
     event.preventDefault();
     if ((message = $(this).data('confirm'))) {
-      ActiveAdmin.modal_dialog(message, $(this).data('inputs'), inputs => {
+      ModalDialog(message, $(this).data('inputs'), inputs => {
         $(this).trigger('confirm:complete', inputs);
       });
     } else {
@@ -45,7 +47,7 @@ const onDOMReady = function() {
     }
 
     $(document).on('change', '.paginated_collection :checkbox', function() {
-      if ($(".paginated_collection :checkbox:checked").length) {
+      if ($(".paginated_collection :checkbox:checked").length && $(".dropdown_menu_list").children().length) {
         $(".batch_actions_selector").each(function() { $(this).aaDropdownMenu("enable"); });
       } else {
         $(".batch_actions_selector").each(function() { $(this).aaDropdownMenu("disable"); });

data/app/javascript/active_admin/initializers/checkbox-toggler.js

@@ -0,0 +1,3 @@
+import CheckboxToggler from "../lib/checkbox-toggler";
+
+$.widget.bridge('checkboxToggler', CheckboxToggler);

data/app/javascript/active_admin/initializers/dropdown-menu.js

@@ -0,0 +1,9 @@
+import DropdownMenu from "../lib/dropdown-menu";
+
+$.widget.bridge('aaDropdownMenu', DropdownMenu);
+
+const onDOMReady = () => $('.dropdown_menu').aaDropdownMenu();
+
+$(document).
+  ready(onDOMReady).
+  on('page:load turbolinks:load turbo:load', onDOMReady);

data/app/javascript/active_admin/initializers/filters.js

@@ -0,0 +1,10 @@
+import Filters from '../lib/filters';
+
+(($) => {
+
+  $(document).
+    on('click', '.clear_filters_btn', Filters._clearForm).
+    on('submit', '.filter_form', Filters._disableEmptyInputFields).
+    on('change', '.filter_form_field.select_and_search select', Filters._setSearchType);
+
+})(jQuery);

data/app/{assets/javascripts/active_admin/lib/has_many.es6 → javascript/active_admin/initializers/has-many.js}

@@ -66,7 +66,13 @@ var init_sortable = function() {
   elems.sortable({
     items: '> fieldset',
     handle: '> ol > .handle',
-    stop:    recompute_positions
+    start: (ev, ui) => {
+      ui.item.css({opacity: 0.3});
+    },
+    stop: function (ev, ui) {
+      ui.item.css({opacity: 1.0});
+      recompute_positions($(this));
+    }
   });
   elems.each(recompute_positions);
 };

data/app/javascript/active_admin/initializers/per-page.js

@@ -0,0 +1,13 @@
+import PerPage from "../lib/per-page";
+
+(($) => {
+
+  $(document).
+    on('change', '.pagination_per_page > select', function(event) {
+      PerPage._jQueryInterface.call($(this), 'update')
+    });
+
+  $.fn['perPage'] = PerPage._jQueryInterface
+  $.fn['perPage'].Constructor = PerPage
+
+})(jQuery);

data/app/javascript/active_admin/initializers/table-checkbox-toggler.js

@@ -0,0 +1,3 @@
+import TableCheckboxToggler from "../lib/table-checkbox-toggler";
+
+$.widget.bridge('tableCheckboxToggler', TableCheckboxToggler);

data/app/{assets/javascripts/active_admin/lib/checkbox-toggler.es6 → javascript/active_admin/lib/checkbox-toggler.js}

@@ -1,4 +1,4 @@
-ActiveAdmin.CheckboxToggler = class CheckboxToggler {
+class CheckboxToggler {
   constructor(options, container){
     this.options = options;
     this.container = container;
@@ -46,4 +46,4 @@ ActiveAdmin.CheckboxToggler = class CheckboxToggler {
   }
 };
 
-$.widget.bridge('checkboxToggler', ActiveAdmin.CheckboxToggler);
+export default CheckboxToggler;

data/app/{assets/javascripts/active_admin/lib/dropdown-menu.es6 → javascript/active_admin/lib/dropdown-menu.js}

@@ -1,5 +1,4 @@
-ActiveAdmin.DropdownMenu = class DropdownMenu {
-
+class DropdownMenu {
   constructor(options, element) {
     this.options = options;
     this.element = element;
@@ -114,10 +113,4 @@ ActiveAdmin.DropdownMenu = class DropdownMenu {
   }
 };
 
-$.widget.bridge('aaDropdownMenu', ActiveAdmin.DropdownMenu);
-
-const onDOMReady = () => $('.dropdown_menu').aaDropdownMenu();
-
-$(document).
-  ready(onDOMReady).
-  on('page:load turbolinks:load turbo:load', onDOMReady);
+export default DropdownMenu;

data/app/javascript/active_admin/lib/filters.js

@@ -0,0 +1,39 @@
+import { queryStringToParams, hasTurbolinks, turbolinksVisit, toQueryString } from '../lib/utils';
+
+class Filters {
+
+  static _clearForm(event) {
+    const regex = /^(q\[|q%5B|q%5b|page|utf8|commit)/;
+    const params = queryStringToParams()
+      .filter(({name}) => !name.match(regex));
+
+    event.preventDefault();
+
+    if (hasTurbolinks()) {
+      turbolinksVisit(params);
+    } else {
+      window.location.search = toQueryString(params);
+    }
+  }
+
+  static _disableEmptyInputFields(event) {
+    const params = $(this)
+      .find(':input')
+      .filter((i, input) => input.value === '')
+      .prop({ disabled: true })
+      .end()
+      .serializeArray();
+
+    if (hasTurbolinks()) {
+      event.preventDefault();
+      turbolinksVisit(params);
+    }
+  }
+
+  static _setSearchType() {
+    $(this).siblings('input').prop({name: `q[${this.value}]`});
+  }
+
+}
+
+export default Filters;

data/app/{assets/javascripts/active_admin/lib/modal_dialog.es6 → javascript/active_admin/lib/modal-dialog.js}

@@ -1,4 +1,4 @@
-ActiveAdmin.modal_dialog = function(message, inputs, callback){
+function ModalDialog(message, inputs, callback){
   let html = `<form id="dialog_confirm" title="${message}"><ul>`;
   for (let name in inputs) {
     var elem, opts, wrapper;
@@ -20,7 +20,7 @@ ActiveAdmin.modal_dialog = function(message, inputs, callback){
         (opts ? ((() => {
           const result = [];
 
-          for (let v of opts) {
+          opts.forEach(v => {
             const $elem = $(`<${elem}/>`);
             if ($.isArray(v)) {
               $elem.text(v[0]).val(v[1]);
@@ -28,7 +28,7 @@ ActiveAdmin.modal_dialog = function(message, inputs, callback){
               $elem.text(v);
             }
             result.push($elem.wrap('<div>').parent().html());
-          }
+          });
 
           return result;
         })()).join('') : '') +
@@ -59,3 +59,5 @@ ActiveAdmin.modal_dialog = function(message, inputs, callback){
     }
   });
 };
+
+export default ModalDialog;

data/app/javascript/active_admin/lib/per-page.js

@@ -0,0 +1,38 @@
+import { queryStringToParams, hasTurbolinks, turbolinksVisit, toQueryString } from './utils';
+
+class PerPage {
+  constructor(element) {
+    this.element = element;
+  }
+
+  update() {
+    const params = queryStringToParams()
+      .filter(({name}) => name != 'per_page' || name != 'page')
+
+    params.push({ name: 'per_page', value: this.element.value });
+
+    if (hasTurbolinks()) {
+      turbolinksVisit(params);
+    } else {
+      window.location.search = toQueryString(params);
+    }
+  }
+
+  static _jQueryInterface(config) {
+    return this.each(function () {
+      const $this = $(this)
+      let data = $this.data('perPage')
+
+      if (!data) {
+        data = new PerPage(this)
+        $this.data('perPage', data)
+      }
+
+      if (config === 'update') {
+        data[config]()
+      }
+    })
+  }
+};
+
+export default PerPage;

data/app/{assets/javascripts/active_admin/lib/table-checkbox-toggler.es6 → javascript/active_admin/lib/table-checkbox-toggler.js}

@@ -1,4 +1,6 @@
-ActiveAdmin.TableCheckboxToggler = class TableCheckboxToggler extends ActiveAdmin.CheckboxToggler {
+import CheckboxToggler from "./checkbox-toggler";
+
+class TableCheckboxToggler extends CheckboxToggler {
   _bind() {
     super._bind(...arguments);
 
@@ -33,4 +35,4 @@ ActiveAdmin.TableCheckboxToggler = class TableCheckboxToggler extends ActiveAdmi
   }
 };
 
-$.widget.bridge('tableCheckboxToggler', ActiveAdmin.TableCheckboxToggler);
+export default TableCheckboxToggler;

data/app/javascript/active_admin/lib/utils.js

@@ -0,0 +1,40 @@
+function hasTurbolinks() {
+  return (typeof Turbolinks !== 'undefined' && Turbolinks.supported);
+}
+
+function turbolinksVisit(params) {
+  const path = [window.location.pathname, '?', toQueryString(params)].join('')
+  Turbolinks.visit(path);
+}
+
+function queryString() {
+  return (window.location.search || '').replace(/^\?/, '');
+}
+
+function queryStringToParams() {
+  const decode = (value) => decodeURIComponent((value || '').replace(/\+/g, '%20'));
+
+  return queryString()
+    .split("&")
+    .map(pair => pair.split("="))
+    .map(([key, value]) => {
+      return { name: decode(key), value: decode(value) }
+    });
+}
+
+function toQueryString(params) {
+  const encode = (value) => encodeURIComponent(value || '');
+
+  return params
+    .map(({name, value}) => [ encode(name), encode(value) ])
+    .map(pair => pair.join('='))
+    .join('&')
+}
+
+export {
+  hasTurbolinks,
+  turbolinksVisit,
+  queryString,
+  queryStringToParams,
+  toQueryString
+};

data/cucumber.yml

@@ -2,5 +2,5 @@
   std_opts = "--format progress --order random"
 %>
 
-default: <%= std_opts %> --require features/support/regular_env.rb features --tags 'not @requires-reloading' --tags 'not @wip'
-class-reloading: CLASS_RELOADING=true <%= std_opts %> --require features/support/reload_env.rb features --tags @requires-reloading
+default: <%= std_opts %> --require features/support/regular_env.rb features --tags 'not @requires-reloading' --tags 'not @wip' --publish-quiet
+class-reloading: CLASS_RELOADING=true <%= std_opts %> --require features/support/reload_env.rb features --tags @requires-reloading --publish-quiet

data/docs/9-batch-actions.md

@@ -165,13 +165,13 @@ batch_action :doit, form: -> { {user: User.pluck(:name, :id)} } do |ids, inputs|
 end
 ```
 
-Under the covers this is powered by the JS `ActiveAdmin.modal_dialog` which you
+Under the covers this is powered by the JS `ActiveAdmin.ModalDialog` which you
 can use yourself:
 
 ```coffee
 if $('body.admin_users').length
   $('a[data-prompt]').click ->
-    ActiveAdmin.modal_dialog $(@).data('prompt'), comment: 'textarea',
+    ActiveAdmin.ModalDialog $(@).data('prompt'), comment: 'textarea',
       (inputs)=>
         $.post "/admin/users/#{$(@).data 'id'}/change_state",
           comment: inputs.comment, state: $(@).data('state'),

data/features/index/format_as_csv.feature

@@ -13,8 +13,8 @@ Feature: Format as CSV
     When I am on the index page for posts
     And I follow "CSV"
     Then I should download a CSV file for "posts" containing:
-    | Id  | Title       | Body | Published date | Position | Starred | Foo    |Created at | Updated at |
-    | \d+ | Hello World |      |                |          |         |        |(.*)       | (.*)       |
+    | Id  | Body | Created at | Foo    | Position | Published date | Starred | Title       | Updated at |
+    | \d+ |      | (.*)       |        |          |                |         | Hello World | (.*)       |
 
   Scenario: Default with alias
     Given a configuration of:
@@ -25,7 +25,7 @@ Feature: Format as CSV
     When I am on the index page for my_articles
     And I follow "CSV"
     Then I should download a CSV file for "my-articles" containing:
-    | Id  | Title       | Body | Published date | Position | Starred | Foo    | Created at | Updated at |
+    | Id  | Body | Created at | Foo    | Position | Published date | Starred | Title       | Updated at |
 
   Scenario: Default with streaming disabled
     Given a configuration of:
@@ -38,8 +38,8 @@ Feature: Format as CSV
     When I am on the index page for posts
     And I follow "CSV"
     Then I should download a CSV file for "posts" containing:
-    | Id  | Title       | Body | Published date | Position | Starred | Foo    |Created at | Updated at |
-    | \d+ | Hello World |      |                |          |         |        |(.*)       | (.*)       |
+    | Id  | Body | Created at | Foo    | Position | Published date | Starred | Title       | Updated at |
+    | \d+ |      | (.*)       |        |          |                |         | Hello World | (.*)       |
 
   Scenario: With CSV format customization
     Given a configuration of:
@@ -104,8 +104,8 @@ Feature: Format as CSV
     When I am on the index page for posts
     And I follow "CSV"
     Then I should download a CSV file with "," separator for "posts" containing:
-      | id  | title | body | published_date | position | starred | foo  | created_at | updated_at |
-      | (.*)| (.*)  | (.*) | (.*)           | (.*)     | (.*)    | (.*) | (.*)       | (.*)       |
+      | id  | body | created_at | foo  | position | published_date | starred | title | updated_at |
+      | (.*)| (.*) | (.*)       | (.*) | (.*)     | (.*)           | (.*)    | (.*) | (.*)       |
 
   Scenario: With humanize_name option turned off globally and enabled locally
     Given a configuration of:

data/features/index/index_as_table.feature

@@ -250,14 +250,14 @@ Feature: Index as Table
       """
     When I am on the index page for posts
     Then I should see the "index_table_posts" table:
-      | [ ] | Id | Title        | Body | Published Date | Author | Position | Category | Starred | Foo | Created At | Updated At | |
-      | [ ] | 2 | Bye bye world | Move your...  |  |  |  |  | No |  | /.*/ | /.*/ | ViewEditDelete |
-      | [ ] | 1 | Hello World   | From the body |  |  |  |  | No |  | /.*/ | /.*/ | ViewEditDelete |
+      | [ ] | Id | Author | Body | Created At | Category | Foo | Position | Published Date | Starred | Title         | Updated At | |
+      | [ ] | 2 |  | Move your...  | /.*/ |  |  |  |  | No | Bye bye world | /.*/ | ViewEditDelete |
+      | [ ] | 1 |  | From the body | /.*/ |  |  |  |  | No | Hello World   | /.*/ | ViewEditDelete |
     When I follow "Id"
     Then I should see the "index_table_posts" table:
-      | [ ] | Id | Title        | Body | Published Date | Author | Position | Category | Starred | Foo | Created At | Updated At | |
-      | [ ] | 1 | Hello World   | From the body |  |  |  |  | No |  | /.*/ | /.*/ | ViewEditDelete |
-      | [ ] | 2 | Bye bye world | Move your...  |  |  |  |  | No |  | /.*/ | /.*/ | ViewEditDelete |
+      | [ ] | Id | Author | Body | Created At | Category | Foo | Position | Published Date | Starred | Title         | Updated At | |
+      | [ ] | 1 |  | From the body | /.*/ |  |  |  |  | No | Hello World   | /.*/ | ViewEditDelete |
+      | [ ] | 2 |  | Move your...  | /.*/ |  |  |  |  | No | Bye bye world | /.*/ | ViewEditDelete |
 
   Scenario: Sorting by a virtual column
     Given a post with the title "Hello World" exists

data/gemfiles/rails_71.gemfile

@@ -7,10 +7,11 @@ gem 'rails-i18n'
 gem 'inherited_resources', '>= 1.14.0'
 gem 'formtastic', '>= 5.0.0'
 gem 'ransack', '>= 4.1.0'
-gem 'devise', '>= 4.9.3'
+gem 'devise', '~> 4.9'
 gem 'rack', '~> 2.2'
 gem 'bootsnap'
 gem 'draper'
+gem 'dartsass-sprockets'
 gem 'sqlite3', '~> 1.4'
 gem 'activerecord-jdbcsqlite3-adapter', '>= 60.0.x', platform: :jruby
 

data/gemfiles/rails_72.gemfile

@@ -7,10 +7,11 @@ gem 'rails-i18n'
 gem 'inherited_resources', '>= 1.14.0'
 gem 'formtastic', '>= 5.0.0'
 gem 'ransack', '>= 4.1.0'
-gem 'devise', '>= 4.9.3'
+gem 'devise', '~> 4.9'
 gem 'rack', '>= 2.2'
 gem 'bootsnap'
 gem 'draper'
+gem 'dartsass-sprockets'
 gem 'sqlite3', '>= 2.x'
 gem 'activerecord-jdbcsqlite3-adapter', '>= 70.0.x', platform: :jruby
 

data/gemfiles/rails_80.gemfile

@@ -7,10 +7,11 @@ gem 'rails-i18n'
 gem 'inherited_resources', '>= 1.14.0'
 gem 'formtastic', '>= 5.0.0'
 gem 'ransack', '>= 4.1.0'
-gem 'devise', '>= 4.9.3'
+gem 'devise', '~> 4.9'
 gem 'rack', '>= 2.2'
 gem 'bootsnap'
 gem 'draper'
+gem 'propshaft'
 gem 'sqlite3', '>= 2.x'
 gem 'activerecord-jdbcsqlite3-adapter', '>= 70.0.x', platform: :jruby
 

data/gemfiles/rails_81.gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+
+eval_gemfile(File.expand_path(File.join('..', 'Gemfile'), __dir__))
+
+gem 'rails', '~> 8.1.0'
+gem 'rails-i18n'
+gem 'inherited_resources', '>= 1.14.0'
+gem 'formtastic', '>= 5.0.0'
+gem 'ransack', '>= 4.1.0'
+gem 'devise', '~> 4.9'
+gem 'rack', '>= 2.2'
+gem 'bootsnap'
+gem 'draper'
+gem 'propshaft'
+gem 'sqlite3', '>= 2.x'
+gem 'activerecord-jdbcsqlite3-adapter', '>= 70.0.x', platform: :jruby
+
+gemspec path: '../'

data/lib/active_admin/application.rb

@@ -187,7 +187,15 @@ module ActiveAdmin
       register_stylesheet 'active_admin.css',       media: 'screen'
       register_stylesheet 'active_admin/print.css', media: 'print'
 
-      register_javascript 'active_admin.js'
+      register_javascript 'https://cdn.jsdelivr.net/npm/jquery@3/dist/jquery.min.js'
+      register_javascript 'https://cdn.jsdelivr.net/npm/jquery-ui-dist@1/jquery-ui.min.js'
+      register_javascript 'https://cdn.jsdelivr.net/npm/jquery-ujs@1.2.3/src/rails.min.js'
+
+      if defined?(Sprockets)
+        register_javascript 'active_admin.js'
+      else
+        register_javascript 'active_admin/base.js'
+      end
     end
 
     # Since app/admin is alphabetically before app/models, we have to remove it

data/lib/active_admin/engine.rb

@@ -7,11 +7,14 @@ module ActiveAdmin
     end
 
     initializer "active_admin.precompile", group: :all do |app|
-      ActiveAdmin.application.stylesheets.each do |path, _|
-        app.config.assets.precompile << path
-      end
-      ActiveAdmin.application.javascripts.each do |path|
-        app.config.assets.precompile << path
+      # Only add to precompile list if using Sprockets (not Propshaft)
+      if app.config.respond_to?(:assets) && app.config.assets.respond_to?(:precompile)
+        ActiveAdmin.application.stylesheets.each do |path, _|
+          app.config.assets.precompile << path
+        end
+        ActiveAdmin.application.javascripts.each do |path|
+          app.config.assets.precompile << path
+        end
       end
     end
 

data/lib/active_admin/filters/active_filter.rb

@@ -26,8 +26,7 @@ module ActiveAdmin
       end
 
       def label
-        # TODO: to remind us to go back to the simpler str.downcase once we support ruby >= 2.4 only.
-        translated_predicate = predicate_name.mb_chars.downcase.to_s
+        translated_predicate = predicate_name.downcase
         if filter_label
           "#{filter_label} #{translated_predicate}"
         elsif related_class

data/lib/active_admin/namespace.rb

@@ -291,7 +291,7 @@ module ActiveAdmin
         end
       else
         eval "class ::#{config.controller_name} < ActiveAdmin::ResourceController; end"
-        config.controller.const_set(:DISPOSABLE, true)
+        config.controller.const_set(:DISPOSABLE, true) unless config.controller.const_defined?(:DISPOSABLE)
       end
       config.controller.active_admin_config = config
     end

data/lib/active_admin/namespace_settings.rb

@@ -82,7 +82,8 @@ module ActiveAdmin
     register :on_unauthorized_access, :rescue_active_admin_access_denied
 
     # A regex to detect unsupported browser, set to false to disable
-    register :unsupported_browser_matcher, /MSIE [1-8]\.0/
+    # IE11 and below are no longer supported
+    register :unsupported_browser_matcher, /MSIE|Trident/
 
     # Whether to display 'Current Filters' on search screen
     register :current_filters, true

data/lib/active_admin/resource/attributes.rb

@@ -4,7 +4,7 @@ module ActiveAdmin
     module Attributes
 
       def default_attributes
-        resource_class.columns.each_with_object({}) do |c, attrs|
+        resource_class.columns.sort_by(&:name).each_with_object({}) do |c, attrs|
           unless reject_col?(c)
             name = c.name.to_sym
             attrs[name] = (method_for_column(name) || name)

data/lib/active_admin/router.rb

@@ -19,7 +19,7 @@ module ActiveAdmin
         if namespace.root?
           router.root namespace.root_to_options.merge(to: namespace.root_to, as: nil)
         else
-          router.namespace namespace.name, namespace.route_options.dup do
+          router.namespace namespace.name, **namespace.route_options.dup do
             router.root namespace.root_to_options.merge(to: namespace.root_to, as: :root)
           end
         end
@@ -89,8 +89,8 @@ module ActiveAdmin
       build_route(action.http_verb, action.name)
     end
 
-    def build_route(verbs, *args)
-      Array.wrap(verbs).each { |verb| router.send(verb, *args) }
+    def build_route(verbs, *args, **kwargs)
+      Array.wrap(verbs).each { |verb| router.send(verb, *args, **kwargs) }
     end
 
     def define_belongs_to_routes(config)
@@ -105,7 +105,7 @@ module ActiveAdmin
     end
 
     def define_namespace(config)
-      router.namespace config.namespace.name, config.namespace.route_options.dup do
+      router.namespace config.namespace.name, **config.namespace.route_options.dup do
         define_routes(config)
       end
     end

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '1.7.2'
+  VERSION = '1.8.0'.freeze
 end