activeadmin 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eae0d60f49f4133f9500f31625e24882ac57efa140f8052c87dd65a0cfbd353
-  data.tar.gz: 8db6863400174d2ed23adcf9985efff541ef858afe56339822d9cf02411052c4
+  metadata.gz: d5319bddf9e28d0adf5521d932bfb6b1a27bb8a0f0b84116bf5014148fe04ef8
+  data.tar.gz: 4b41ed99a504af4c5c82f84a959c16a6efa703f09970c4e61b0fc9dd48dbccea
 SHA512:
-  metadata.gz: cf3d8b2a337b50a73a5806ce18e2c40c9985d5db2a064d417057b349d172909fb1ed6e248ea271c76e331a76a76578f975e044373dbc0ca5bd2141f0ac365df4
-  data.tar.gz: 88b06f52c04bae83a5068301b0013366db174638392a8b850bec32b20ff3e72adfb480335211558319ee671b1a7a28955fbf4334b8ebf89c836107c7b85c1e61
+  metadata.gz: c15f0a18dab4b6dd28c433d4481c18fc00a406dbad22f397035ad1dcd5fdff5a7e11018bc39fd15af3e92644a94d311b39a6268ff625e5b6c1372424807a8ced
+  data.tar.gz: 444c6aac584a1a13131cdf7b2f1f6c4f2d5a6d4a565c1dee172944837960297223e661534f502e2a1f3624606b9b083337625cd2b2db4eaf0dae357b42f466bd

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## 2.8.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.8.0..v2.8.1)
+
+### Bug Fixes
+
+* Fix `permitted_param` generation for `belongs_to` when `:param` is used. [#6460] by [@deivid-rodriguez]
+* Fix streaming CSV export. [#6451] by [@deivid-rodriguez]
+* Fix input string filter no rendering dropdown input when its column name ends with a ransack predicate. [#6422] by [@Fivell]
+
 ## 2.8.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.7.0..v2.8.0)
 
 ### Enhancements
@@ -611,6 +619,9 @@ Please check [0-6-stable] for previous changes.
 [#6341]: https://github.com/activeadmin/activeadmin/pull/6341
 [#6368]: https://github.com/activeadmin/activeadmin/pull/6368
 [#6393]: https://github.com/activeadmin/activeadmin/pull/6393
+[#6422]: https://github.com/activeadmin/activeadmin/pull/6422
+[#6451]: https://github.com/activeadmin/activeadmin/pull/6451
+[#6460]: https://github.com/activeadmin/activeadmin/pull/6460
 
 [@5t111111]: https://github.com/5t111111
 [@aarek]: https://github.com/aarek

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

@@ -11,7 +11,7 @@
 //= require_self
 
 (function(global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("jquery"), require("jquery-ui/ui/widgets/datepicker"), require("jquery-ui/ui/widgets/dialog"), require("jquery-ui/ui/widgets/sortable"), require("jquery-ui/ui/widgets/tabs"), require("jquery-ui/ui/widget"), require("jquery-ujs")) : typeof define === "function" && define.amd ? define([ "exports", "jquery", "jquery-ui/ui/widgets/datepicker", "jquery-ui/ui/widgets/dialog", "jquery-ui/ui/widgets/sortable", "jquery-ui/ui/widgets/tabs", "jquery-ui/ui/widget", "jquery-ujs" ], factory) : (global = global || self, 
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("jquery"), require("jquery-ui/ui/widgets/datepicker"), require("jquery-ui/ui/widgets/dialog"), require("jquery-ui/ui/widgets/sortable"), require("jquery-ui/ui/widgets/tabs"), require("jquery-ui/ui/widget"), require("jquery-ujs")) : typeof define === "function" && define.amd ? define([ "exports", "jquery", "jquery-ui/ui/widgets/datepicker", "jquery-ui/ui/widgets/dialog", "jquery-ui/ui/widgets/sortable", "jquery-ui/ui/widgets/tabs", "jquery-ui/ui/widget", "jquery-ujs" ], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, 
   factory(global.ActiveAdmin = {}));
 })(this, function(exports) {
   "use strict";

data/docs/Gemfile

@@ -1,3 +1,3 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'github-pages'
+gem "github-pages"

data/lib/active_admin.rb

@@ -1,58 +1,58 @@
-require 'active_support/core_ext'
-require 'set'
+require "active_support/core_ext"
+require "set"
 
-require 'ransack'
-require 'ransack_ext'
-require 'kaminari'
-require 'formtastic'
-require 'formtastic_i18n'
-require 'inherited_resources'
-require 'jquery-rails'
-require 'sassc-rails'
-require 'arbre'
+require "ransack"
+require "ransack_ext"
+require "kaminari"
+require "formtastic"
+require "formtastic_i18n"
+require "inherited_resources"
+require "jquery-rails"
+require "sassc-rails"
+require "arbre"
 
-require 'active_admin/helpers/i18n'
+require "active_admin/helpers/i18n"
 
 module ActiveAdmin
 
-  autoload :VERSION, 'active_admin/version'
-  autoload :Application, 'active_admin/application'
-  autoload :AssetRegistration, 'active_admin/asset_registration'
-  autoload :Authorization, 'active_admin/authorization_adapter'
-  autoload :AuthorizationAdapter, 'active_admin/authorization_adapter'
-  autoload :Callbacks, 'active_admin/callbacks'
-  autoload :Component, 'active_admin/component'
-  autoload :BaseController, 'active_admin/base_controller'
-  autoload :CanCanAdapter, 'active_admin/cancan_adapter'
-  autoload :ControllerAction, 'active_admin/controller_action'
-  autoload :CSVBuilder, 'active_admin/csv_builder'
-  autoload :Dependency, 'active_admin/dependency'
-  autoload :Deprecation, 'active_admin/deprecation'
-  autoload :Devise, 'active_admin/devise'
-  autoload :DSL, 'active_admin/dsl'
-  autoload :FormBuilder, 'active_admin/form_builder'
-  autoload :Inputs, 'active_admin/inputs'
-  autoload :Localizers, 'active_admin/localizers'
-  autoload :Menu, 'active_admin/menu'
-  autoload :MenuCollection, 'active_admin/menu_collection'
-  autoload :MenuItem, 'active_admin/menu_item'
-  autoload :Namespace, 'active_admin/namespace'
-  autoload :OrderClause, 'active_admin/order_clause'
-  autoload :Page, 'active_admin/page'
-  autoload :PagePresenter, 'active_admin/page_presenter'
-  autoload :PageController, 'active_admin/page_controller'
-  autoload :PageDSL, 'active_admin/page_dsl'
-  autoload :PunditAdapter, 'active_admin/pundit_adapter'
-  autoload :Resource, 'active_admin/resource'
-  autoload :ResourceController, 'active_admin/resource_controller'
-  autoload :ResourceDSL, 'active_admin/resource_dsl'
-  autoload :Scope, 'active_admin/scope'
-  autoload :ScopeChain, 'active_admin/helpers/scope_chain'
-  autoload :SidebarSection, 'active_admin/sidebar_section'
-  autoload :TableBuilder, 'active_admin/table_builder'
-  autoload :ViewFactory, 'active_admin/view_factory'
-  autoload :ViewHelpers, 'active_admin/view_helpers'
-  autoload :Views, 'active_admin/views'
+  autoload :VERSION, "active_admin/version"
+  autoload :Application, "active_admin/application"
+  autoload :AssetRegistration, "active_admin/asset_registration"
+  autoload :Authorization, "active_admin/authorization_adapter"
+  autoload :AuthorizationAdapter, "active_admin/authorization_adapter"
+  autoload :Callbacks, "active_admin/callbacks"
+  autoload :Component, "active_admin/component"
+  autoload :BaseController, "active_admin/base_controller"
+  autoload :CanCanAdapter, "active_admin/cancan_adapter"
+  autoload :ControllerAction, "active_admin/controller_action"
+  autoload :CSVBuilder, "active_admin/csv_builder"
+  autoload :Dependency, "active_admin/dependency"
+  autoload :Deprecation, "active_admin/deprecation"
+  autoload :Devise, "active_admin/devise"
+  autoload :DSL, "active_admin/dsl"
+  autoload :FormBuilder, "active_admin/form_builder"
+  autoload :Inputs, "active_admin/inputs"
+  autoload :Localizers, "active_admin/localizers"
+  autoload :Menu, "active_admin/menu"
+  autoload :MenuCollection, "active_admin/menu_collection"
+  autoload :MenuItem, "active_admin/menu_item"
+  autoload :Namespace, "active_admin/namespace"
+  autoload :OrderClause, "active_admin/order_clause"
+  autoload :Page, "active_admin/page"
+  autoload :PagePresenter, "active_admin/page_presenter"
+  autoload :PageController, "active_admin/page_controller"
+  autoload :PageDSL, "active_admin/page_dsl"
+  autoload :PunditAdapter, "active_admin/pundit_adapter"
+  autoload :Resource, "active_admin/resource"
+  autoload :ResourceController, "active_admin/resource_controller"
+  autoload :ResourceDSL, "active_admin/resource_dsl"
+  autoload :Scope, "active_admin/scope"
+  autoload :ScopeChain, "active_admin/helpers/scope_chain"
+  autoload :SidebarSection, "active_admin/sidebar_section"
+  autoload :TableBuilder, "active_admin/table_builder"
+  autoload :ViewFactory, "active_admin/view_factory"
+  autoload :ViewHelpers, "active_admin/view_helpers"
+  autoload :Views, "active_admin/views"
 
   class << self
 
@@ -121,13 +121,13 @@ module ActiveAdmin
 end
 
 # Require things that don't support autoload
-require 'active_admin/engine'
-require 'active_admin/error'
+require "active_admin/engine"
+require "active_admin/error"
 
 # Require internal plugins
-require 'active_admin/batch_actions'
-require 'active_admin/filters'
+require "active_admin/batch_actions"
+require "active_admin/filters"
 
 # Require ORM-specific plugins
-require 'active_admin/orm/active_record' if defined? ActiveRecord
-require 'active_admin/orm/mongoid' if defined? Mongoid
+require "active_admin/orm/active_record" if defined? ActiveRecord
+require "active_admin/orm/mongoid" if defined? Mongoid

data/lib/active_admin/application.rb

@@ -1,6 +1,6 @@
-require 'active_admin/router'
-require 'active_admin/application_settings'
-require 'active_admin/namespace_settings'
+require "active_admin/router"
+require "active_admin/application_settings"
+require "active_admin/namespace_settings"
 
 module ActiveAdmin
   class Application
@@ -45,8 +45,8 @@ module ActiveAdmin
     include AssetRegistration
 
     # Event that gets triggered on load of Active Admin
-    BeforeLoadEvent = 'active_admin.application.before_load'.freeze
-    AfterLoadEvent = 'active_admin.application.after_load'.freeze
+    BeforeLoadEvent = "active_admin.application.before_load".freeze
+    AfterLoadEvent = "active_admin.application.after_load".freeze
 
     # Runs before the app's AA initializer
     def setup!
@@ -164,9 +164,9 @@ module ActiveAdmin
     private
 
     def register_default_assets
-      register_stylesheet 'active_admin.css', media: 'screen'
-      register_stylesheet 'active_admin/print.css', media: 'print'
-      register_javascript 'active_admin.js'
+      register_stylesheet "active_admin.css", media: "screen"
+      register_stylesheet "active_admin/print.css", media: "print"
+      register_javascript "active_admin.js"
     end
 
     # Since app/admin is alphabetically before app/models, we have to remove it

data/lib/active_admin/application_settings.rb

@@ -1,4 +1,4 @@
-require 'active_admin/settings_node'
+require "active_admin/settings_node"
 
 module ActiveAdmin
   class ApplicationSettings < SettingsNode
@@ -15,7 +15,7 @@ module ActiveAdmin
     # Load paths for admin configurations. Add folders to this load path
     # to load up other resources for administration. External gems can
     # include their paths in this load path to provide active_admin UIs
-    register :load_paths, [File.expand_path('app/admin', Rails.root)]
+    register :load_paths, [File.expand_path("app/admin", Rails.root)]
 
     # Set default localize format for Date/Time values
     register :localize_format, :long
@@ -34,7 +34,7 @@ module ActiveAdmin
                                       :to_s ]
 
     # To make debugging easier, by default don't stream in development
-    register :disable_streaming_in, ['development']
+    register :disable_streaming_in, ["development"]
 
     # Remove sensitive attributes from being displayed, made editable, or exported by default
     register :filter_attributes, [:encrypted_password, :password, :password_confirmation]

data/lib/active_admin/base_controller.rb

@@ -1,5 +1,5 @@
-require 'active_admin/base_controller/authorization'
-require 'active_admin/base_controller/menu'
+require "active_admin/base_controller/authorization"
+require "active_admin/base_controller/menu"
 
 module ActiveAdmin
   # BaseController for ActiveAdmin.
@@ -69,11 +69,11 @@ module ActiveAdmin
     #   2.  If we're rendering a custom action, we'll use the active_admin layout so
     #       that users can render any template inside Active Admin.
     def determine_active_admin_layout
-      ACTIVE_ADMIN_ACTIONS.include?(params[:action].to_sym) ? false : 'active_admin'
+      ACTIVE_ADMIN_ACTIONS.include?(params[:action].to_sym) ? false : "active_admin"
     end
 
     def active_admin_root
-      controller, action = active_admin_namespace.root_to.split '#'
+      controller, action = active_admin_namespace.root_to.split "#"
       { controller: controller, action: action }
     end
 

data/lib/active_admin/base_controller/authorization.rb

@@ -52,9 +52,10 @@ module ActiveAdmin
       #                 an ActiveAdmin::AccessDenied.
       def authorize!(action, subject = nil)
         unless authorized? action, subject
-          raise ActiveAdmin::AccessDenied.new(current_active_admin_user,
-                                              action,
-                                              subject)
+          raise ActiveAdmin::AccessDenied.new(
+            current_active_admin_user,
+            action,
+            subject)
         end
       end
 

data/lib/active_admin/batch_actions/controller.rb

@@ -6,7 +6,7 @@ module ActiveAdmin
       def batch_action
         if action_present?
           selection = params[:collection_selection] || []
-          inputs = JSON.parse params[:batch_action_inputs] || '{}'
+          inputs = JSON.parse params[:batch_action_inputs] || "{}"
           valid_keys = MethodOrProcHelper.render_in_context(self, current_batch_action.inputs).try(:keys)
           inputs = inputs.with_indifferent_access.slice *valid_keys
           instance_exec selection, inputs, &current_batch_action.block

data/lib/active_admin/batch_actions/resource_extension.rb

@@ -57,21 +57,22 @@ module ActiveAdmin
       def add_default_batch_action
         destroy_options = {
           priority: 100,
-          confirm: proc { I18n.t('active_admin.batch_actions.delete_confirmation', plural_model: active_admin_config.plural_resource_label.downcase) },
-          if: proc { controller.action_methods.include?('destroy') && authorized?(ActiveAdmin::Auth::DESTROY, active_admin_config.resource_class) }
+          confirm: proc { I18n.t("active_admin.batch_actions.delete_confirmation", plural_model: active_admin_config.plural_resource_label.downcase) },
+          if: proc { controller.action_methods.include?("destroy") && authorized?(ActiveAdmin::Auth::DESTROY, active_admin_config.resource_class) }
         }
 
-        add_batch_action :destroy, proc { I18n.t('active_admin.delete') }, destroy_options do |selected_ids|
+        add_batch_action :destroy, proc { I18n.t("active_admin.delete") }, destroy_options do |selected_ids|
           batch_action_collection.find(selected_ids).each do |record|
             authorize! ActiveAdmin::Auth::DESTROY, record
             destroy_resource(record)
           end
 
           redirect_to active_admin_config.route_collection_path(params),
-                      notice: I18n.t("active_admin.batch_actions.succesfully_destroyed",
-                                        count: selected_ids.count,
-                                        model: active_admin_config.resource_label.downcase,
-                                        plural_model: active_admin_config.plural_resource_label(count: selected_ids.count).downcase)
+                      notice: I18n.t(
+                        "active_admin.batch_actions.succesfully_destroyed",
+                        count: selected_ids.count,
+                        model: active_admin_config.resource_label.downcase,
+                        plural_model: active_admin_config.plural_resource_label(count: selected_ids.count).downcase)
         end
       end
 
@@ -84,7 +85,7 @@ module ActiveAdmin
 
     attr_reader :block, :title, :sym
 
-    DEFAULT_CONFIRM_MESSAGE = proc { I18n.t 'active_admin.batch_actions.default_confirmation' }
+    DEFAULT_CONFIRM_MESSAGE = proc { I18n.t "active_admin.batch_actions.default_confirmation" }
 
     # Create a Batch Action
     #

data/lib/active_admin/batch_actions/views/batch_action_form.rb

@@ -1,4 +1,4 @@
-require 'active_admin/component'
+require "active_admin/component"
 
 module ActiveAdmin
   module BatchActions
@@ -30,7 +30,7 @@ module ActiveAdmin
       private
 
       def closing_form_tag
-        '</form>'.html_safe
+        "</form>".html_safe
       end
 
     end

data/lib/active_admin/batch_actions/views/batch_action_selector.rb

@@ -1,4 +1,4 @@
-require 'active_admin/component'
+require "active_admin/component"
 
 module ActiveAdmin
   module BatchActions

data/lib/active_admin/batch_actions/views/selection_cells.rb

@@ -1,4 +1,4 @@
-require 'active_admin/component'
+require "active_admin/component"
 
 module ActiveAdmin
   module BatchActions
@@ -7,7 +7,7 @@ module ActiveAdmin
     class ResourceSelectionToggleCell < ActiveAdmin::Component
       builder_method :resource_selection_toggle_cell
 
-      def build(label_text = '')
+      def build(label_text = "")
         label do
           input type: "checkbox", id: "collection_selection_toggle_all", name: "collection_selection_toggle_all", class: "toggle_all"
           text_node label_text if label_text.present?
@@ -30,7 +30,7 @@ module ActiveAdmin
 
       def build
         super(id: "collection_selection_toggle_panel")
-        resource_selection_toggle_cell(I18n.t('active_admin.batch_actions.selection_toggle_explanation', default: "(Toggle Selection)"))
+        resource_selection_toggle_cell(I18n.t("active_admin.batch_actions.selection_toggle_explanation", default: "(Toggle Selection)"))
       end
     end
 

data/lib/active_admin/cancan_adapter.rb

@@ -2,7 +2,7 @@ unless ActiveAdmin::Dependency.cancan? || ActiveAdmin::Dependency.cancancan?
   ActiveAdmin::Dependency.cancan!
 end
 
-require 'cancan'
+require "cancan"
 
 # Add a setting to the application to configure the ability
 ActiveAdmin::Application.inheritable_setting :cancan_ability_class, "Ability"

data/lib/active_admin/dependency.rb

@@ -1,7 +1,7 @@
 module ActiveAdmin
   module Dependency
     module Requirements
-      DEVISE = '>= 4.0', '< 5'
+      DEVISE = ">= 4.0", "< 5"
     end
 
     # Provides a clean interface to check for gem dependencies at runtime.
@@ -42,9 +42,9 @@ module ActiveAdmin
     # => false
     #
     def self.method_missing(name, *args)
-      if name[-1] == '?'
+      if name[-1] == "?"
         Matcher.new(name[0..-2]).match? args
-      elsif name[-1] == '!'
+      elsif name[-1] == "!"
         Matcher.new(name[0..-2]).match! args
       else
         Matcher.new name.to_s
@@ -91,7 +91,7 @@ module ActiveAdmin
       end
 
       def inspect
-        info = spec ? "#{spec.name} #{spec.version}" : '(missing)'
+        info = spec ? "#{spec.name} #{spec.version}" : "(missing)"
         "<ActiveAdmin::Dependency::Matcher for #{info}>"
       end
     end

data/lib/active_admin/devise.rb

@@ -1,6 +1,6 @@
 ActiveAdmin::Dependency.devise! ActiveAdmin::Dependency::Requirements::DEVISE
 
-require 'devise'
+require "devise"
 
 module ActiveAdmin
   module Devise
@@ -9,7 +9,7 @@ module ActiveAdmin
       {
         path: ActiveAdmin.application.default_namespace || "/",
         controllers: ActiveAdmin::Devise.controllers,
-        path_names: { sign_in: 'login', sign_out: "logout" },
+        path_names: { sign_in: "login", sign_out: "logout" },
         sign_out_via: [*::Devise.sign_out_via, ActiveAdmin.application.logout_link_method].uniq
       }
     end
@@ -27,14 +27,14 @@ module ActiveAdmin
     module Controller
       extend ::ActiveSupport::Concern
       included do
-        layout 'active_admin_logged_out'
+        layout "active_admin_logged_out"
         helper ::ActiveAdmin::ViewHelpers
       end
 
       # Redirect to the default namespace on logout
       def root_path
         namespace = ActiveAdmin.application.default_namespace.presence
-        root_path_method = [namespace, :root_path].compact.join('_')
+        root_path_method = [namespace, :root_path].compact.join("_")
 
         path = if Helpers::Routes.respond_to? root_path_method
                  Helpers::Routes.send root_path_method
@@ -45,7 +45,7 @@ module ActiveAdmin
 
         # NOTE: `relative_url_root` is deprecated by Rails.
         #       Remove prefix here if it is removed completely.
-        prefix = Rails.configuration.action_controller[:relative_url_root] || ''
+        prefix = Rails.configuration.action_controller[:relative_url_root] || ""
         prefix + path
       end
     end