activeadmin 2.3.0 → 2.6.1

data/lib/active_admin/localizers/resource_localizer.rb

@@ -21,7 +21,7 @@ module ActiveAdmin
         scope = options.delete(:scope)
         specific_key = array_to_key('resources', @model_name, scope, key)
         defaults = [array_to_key(scope, key), key.to_s.titleize]
-        ::I18n.t specific_key, options.reverse_merge(model: @model, default: defaults, scope: 'active_admin')
+        ::I18n.t specific_key, **options.reverse_merge(model: @model, default: defaults, scope: 'active_admin')
       end
       alias_method :t, :translate
 

data/lib/active_admin/namespace_settings.rb

@@ -106,5 +106,18 @@ module ActiveAdmin
 
     # Include association filters by default
     register :include_default_association_filters, true
+
+    register :maximum_association_filter_arity, :unlimited
+
+    register :filter_columns_for_large_association, [
+        :display_name,
+        :full_name,
+        :name,
+        :username,
+        :login,
+        :title,
+        :email,
+    ]
+    register :filter_method_for_large_association, '_starts_with'
   end
 end

data/lib/active_admin/order_clause.rb

@@ -3,7 +3,7 @@ module ActiveAdmin
     attr_reader :field, :order, :active_admin_config
 
     def initialize(active_admin_config, clause)
-      clause =~ /^([\w\_\.]+)(->'\w+')?_(desc|asc)$/
+      clause =~ /^([\w\.]+)(->'\w+')?_(desc|asc)$/
       @column = $1
       @op = $2
       @order = $3

data/lib/active_admin/resource.rb

@@ -70,7 +70,7 @@ module ActiveAdmin
       def initialize(namespace, resource_class, options = {})
         @namespace = namespace
         @resource_class_name = "::#{resource_class.name}"
-        @options    = options
+        @options = options
         @sort_order = options[:sort_order]
         @member_actions = []
         @collection_actions = []

data/lib/active_admin/resource/naming.rb

@@ -46,7 +46,7 @@ module ActiveAdmin
       end
 
       def translate(options = {})
-        I18n.t i18n_key, { scope: [:activerecord, :models] }.merge(options)
+        I18n.t i18n_key, **{ scope: [:activerecord, :models] }.merge(options)
       end
 
       def route_key

data/lib/active_admin/resource_controller/decorators.rb

@@ -67,8 +67,8 @@ module ActiveAdmin
         def self.wrap!(parent, name)
           ::Class.new parent do
             delegate :reorder, :page, :current_page, :total_pages, :limit_value,
-                     :total_count, :total_pages, :to_key, :group_values, :except,
-                     :find_each, :ransack
+                     :total_count, :total_pages, :offset, :to_key, :group_values,
+                     :except, :find_each, :ransack
 
             define_singleton_method(:name) { name }
           end

data/lib/active_admin/resource_controller/polymorphic_routes.rb

@@ -25,8 +25,9 @@ module ActiveAdmin
           return ActiveAdmin::Model.new(active_admin_config, record)
         end
 
-        if record.is_a?(parent.class)
-          return ActiveAdmin::Model.new(active_admin_config.belongs_to_config.resource, record)
+        belongs_to_resource = active_admin_config.belongs_to_config.try(:resource)
+        if belongs_to_resource && record.is_a?(belongs_to_resource.resource_class)
+          return ActiveAdmin::Model.new(belongs_to_resource, record)
         end
 
         record

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '2.3.0'
+  VERSION = '2.6.1'
 end

data/lib/active_admin/views/components/paginated_collection.rb

@@ -96,7 +96,7 @@ module ActiveAdmin
         options[:params]     = @params     if @params
         options[:param_name] = @param_name if @param_name
 
-        if !@display_total && collection.respond_to?(:offset)
+        if !@display_total
           # The #paginate method in kaminari will query the resource with a
           # count(*) to determine how many pages there should be unless
           # you pass in the :total_pages option. We issue a query to determine
@@ -123,6 +123,7 @@ module ActiveAdmin
           entries_name = I18n.t "active_admin.pagination.entry", count: 2, default: 'entries'
         else
           key = "activerecord.models." + collection.first.class.model_name.i18n_key.to_s
+
           entry_name   = I18n.translate key, count: 1,               default: collection.first.class.name.underscore.sub('_', ' ')
           entries_name = I18n.translate key, count: collection.size, default: entry_name.pluralize
         end

data/lib/active_admin/views/components/table_for.rb

@@ -13,6 +13,7 @@ module ActiveAdmin
         @collection     = obj.respond_to?(:each) && !obj.is_a?(Hash) ? obj : [obj]
         @resource_class = options.delete(:i18n)
         @resource_class ||= @collection.klass if @collection.respond_to? :klass
+
         @columns        = []
         @row_class      = options.delete(:row_class)
 

data/lib/active_admin/views/pages/base.rb

@@ -33,7 +33,7 @@ module ActiveAdmin
             end
 
             active_admin_namespace.meta_tags.each do |name, content|
-              text_node(tag(:meta, name: name, content: content))
+              text_node(meta(name: name, content: content))
             end
 
             active_admin_application.javascripts.each do |path|
@@ -85,8 +85,10 @@ module ActiveAdmin
 
         def build_flash_messages
           div class: 'flashes' do
-            flash_messages.each do |type, message|
-              div message, class: "flash flash_#{type}"
+            flash_messages.each do |type, messages|
+              [*messages].each do |message|
+                div message, class: "flash flash_#{type}"
+              end
             end
           end
         end

data/lib/active_admin/views/pages/index.rb

@@ -124,6 +124,7 @@ module ActiveAdmin
 
         def render_index
           renderer_class = find_index_renderer_class(config[:as])
+
           paginator        = config.fetch(:paginator, true)
           download_links   = config.fetch(:download_links, active_admin_config.namespace.download_links)
           pagination_total = config.fetch(:pagination_total, true)

data/lib/generators/active_admin/install/templates/active_admin.rb.erb

@@ -286,12 +286,25 @@ ActiveAdmin.setup do |config|
   # config.filters = true
   #
   # By default the filters include associations in a select, which means
-  # that every record will be loaded for each association.
+  # that every record will be loaded for each association (up
+  # to the value of config.maximum_association_filter_arity).
   # You can enabled or disable the inclusion
   # of those filters by default here.
   #
   # config.include_default_association_filters = true
 
+  # config.maximum_association_filter_arity = 256 # default value of :unlimited will change to 256 in a future version
+  # config.filter_columns_for_large_association, [
+  #    :display_name,
+  #    :full_name,
+  #    :name,
+  #    :username,
+  #    :login,
+  #    :title,
+  #    :email,
+  #  ]
+  # config.filter_method_for_large_association, '_starts_with'
+
   # == Head
   #
   # You can add your own content to the site head like analytics. Make sure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2020-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -119,7 +119,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -129,7 +129,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -139,14 +139,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
@@ -181,26 +187,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.1'
-- !ruby/object:Gem::Dependency
-  name: sprockets-es6
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.2
 description: The administration framework for Ruby on Rails.
 email:
 - deivid.rodriguez@riseup.net
@@ -217,27 +203,12 @@ files:
 - CONTRIBUTING.md
 - LICENSE
 - README.md
-- app/assets/images/active_admin/nested_menu_arrow.gif
-- app/assets/images/active_admin/nested_menu_arrow_dark.gif
-- app/assets/images/active_admin/orderable.png
-- app/assets/javascripts/active_admin/base.es6
-- app/assets/javascripts/active_admin/ext/jquery-ui.es6
-- app/assets/javascripts/active_admin/ext/jquery.es6
-- app/assets/javascripts/active_admin/initializers/datepicker.es6
-- app/assets/javascripts/active_admin/initializers/filters.es6
-- app/assets/javascripts/active_admin/initializers/tabs.es6
-- app/assets/javascripts/active_admin/lib/active_admin.es6
-- app/assets/javascripts/active_admin/lib/batch_actions.es6
-- app/assets/javascripts/active_admin/lib/checkbox-toggler.es6
-- app/assets/javascripts/active_admin/lib/dropdown-menu.es6
-- app/assets/javascripts/active_admin/lib/has_many.es6
-- app/assets/javascripts/active_admin/lib/modal_dialog.es6
-- app/assets/javascripts/active_admin/lib/per_page.es6
-- app/assets/javascripts/active_admin/lib/table-checkbox-toggler.es6
+- app/assets/javascripts/active_admin/base.js
 - app/assets/stylesheets/active_admin/_base.scss
 - app/assets/stylesheets/active_admin/_forms.scss
 - app/assets/stylesheets/active_admin/_header.scss
 - app/assets/stylesheets/active_admin/_mixins.scss
+- app/assets/stylesheets/active_admin/_normalize.scss
 - app/assets/stylesheets/active_admin/_typography.scss
 - app/assets/stylesheets/active_admin/components/_batch_actions.scss
 - app/assets/stylesheets/active_admin/components/_blank_slates.scss
@@ -274,6 +245,25 @@ files:
 - app/assets/stylesheets/active_admin/structure/_footer.scss
 - app/assets/stylesheets/active_admin/structure/_main_structure.scss
 - app/assets/stylesheets/active_admin/structure/_title_bar.scss
+- app/javascript/active_admin/base.js
+- app/javascript/active_admin/ext/jquery-ui.js
+- app/javascript/active_admin/ext/jquery.js
+- app/javascript/active_admin/initializers/batch-actions.js
+- app/javascript/active_admin/initializers/checkbox-toggler.js
+- app/javascript/active_admin/initializers/datepicker.js
+- app/javascript/active_admin/initializers/dropdown-menu.js
+- app/javascript/active_admin/initializers/filters.js
+- app/javascript/active_admin/initializers/has-many.js
+- app/javascript/active_admin/initializers/per-page.js
+- app/javascript/active_admin/initializers/table-checkbox-toggler.js
+- app/javascript/active_admin/initializers/tabs.js
+- app/javascript/active_admin/lib/checkbox-toggler.js
+- app/javascript/active_admin/lib/dropdown-menu.js
+- app/javascript/active_admin/lib/filters.js
+- app/javascript/active_admin/lib/modal-dialog.js
+- app/javascript/active_admin/lib/per-page.js
+- app/javascript/active_admin/lib/table-checkbox-toggler.js
+- app/javascript/active_admin/lib/utils.js
 - app/views/active_admin/devise/confirmations/new.html.erb
 - app/views/active_admin/devise/mailer/reset_password_instructions.html.erb
 - app/views/active_admin/devise/mailer/unlock_instructions.html.erb
@@ -305,6 +295,7 @@ files:
 - app/views/layouts/active_admin.html.arb
 - app/views/layouts/active_admin_logged_out.html.erb
 - config/locales/ar.yml
+- config/locales/az.yml
 - config/locales/bg.yml
 - config/locales/bs.yml
 - config/locales/ca.yml
@@ -589,7 +580,6 @@ files:
 - vendor/assets/javascripts/jquery-ui/widgets/resizable.js
 - vendor/assets/javascripts/jquery-ui/widgets/sortable.js
 - vendor/assets/javascripts/jquery-ui/widgets/tabs.js
-- vendor/assets/stylesheets/active_admin/_normalize.scss
 homepage: https://activeadmin.info
 licenses:
 - MIT
@@ -609,7 +599,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Active Admin is a Ruby on Rails plugin for generating administration style

data/app/assets/javascripts/active_admin/base.es6

@@ -1,23 +0,0 @@
-//= require jquery3
-//= require jquery-ui/widgets/datepicker
-//= require jquery-ui/widgets/dialog
-//= require jquery-ui/widgets/sortable
-//= require jquery-ui/widgets/tabs
-//= require jquery-ui/widget
-//= require jquery_ujs
-//= require_self
-//= require ./ext/jquery
-//= require ./ext/jquery-ui
-//= require ./lib/active_admin
-//= require ./lib/batch_actions
-//= require ./lib/dropdown-menu
-//= require ./lib/has_many
-//= require ./lib/modal_dialog
-//= require ./lib/per_page
-//= require ./lib/checkbox-toggler
-//= require ./lib/table-checkbox-toggler
-//= require ./initializers/datepicker
-//= require ./initializers/filters
-//= require ./initializers/tabs
-
-window.ActiveAdmin = {}

data/app/assets/javascripts/active_admin/initializers/filters.es6

@@ -1,45 +0,0 @@
-(($, ActiveAdmin) => {
-
-  class Filters {
-
-    static _clearForm(event) {
-      const regex = /^(q\[|q%5B|q%5b|page|utf8|commit)/;
-      const params = ActiveAdmin
-        .queryStringToParams()
-        .filter(({name}) => !name.match(regex));
-
-      event.preventDefault();
-
-      if (ActiveAdmin.turbolinks) {
-        ActiveAdmin.turbolinksVisit(params);
-      } else {
-        window.location.search = ActiveAdmin.toQueryString(params);
-      }
-    }
-
-    static _disableEmptyInputFields(event) {
-      const params = $(this)
-        .find(':input')
-        .filter((i, input) => input.value === '')
-        .prop({ disabled: true })
-        .end()
-        .serializeArray();
-
-      if (ActiveAdmin.turbolinks) {
-        event.preventDefault();
-        ActiveAdmin.turbolinksVisit(params);
-      }
-    }
-
-    static _setSearchType() {
-      $(this).siblings('input').prop({name: `q[${this.value}]`});
-    }
-
-  }
-
-  $(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, window.activeadmin);

data/app/assets/javascripts/active_admin/lib/active_admin.es6

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