activeadmin 2.12.0 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fee30bf6175502c7e29f5cba45777a52fd9d72f9433f7f3911ba324a24638ef
-  data.tar.gz: 8ad44b1980960d2e8abb3f1406f90c3a0cd01255f0fcb30b6a56bf3cb8db1ab6
+  metadata.gz: 170a59df9471df04e568a2ae1cc4dab8ff58c28fd28a6861a5e87ba596a4e913
+  data.tar.gz: ff345b66e5c18bc94b2a9394d0a633ebe12cce3f7c94b5119ece2b54bcf86836
 SHA512:
-  metadata.gz: 39beb44c14375cec330f99a1d63d38959523a0bbbcf90e55f6b938a71a8d2624b9f8fdb110839b7272b346acdd533bc3f0fcd3a78ca3c3250bf401c807fb4b13
-  data.tar.gz: 9b4d5fb6d6d2238925e315c639bb6625703102d111c482399eb79b02cd6f203f7145770c2985795c2a3f60f6822f2757efe1e5c57a8c4ede3716e023e2efc50e
+  metadata.gz: 558b34213e3a1af076814008a337ed3d7a66fa328c33bb460020f28595f4e4898e815752dde54c8b41ab6fa687989e7c4d0d8cd58113e736bdafe3943b3c3026
+  data.tar.gz: bb0f39fecd17ef5bb0063aaa64cf2ee2684fa52b19faf7b2e37fc273484554ad97a686972f5d5baa02cbd8d785efd9de384769e86b2083f5a2a6c591381d573d

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## Unreleased
 
+## 2.13.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.12.0..v2.13.0)
+
+### Documentation
+
+* Update validation errors documentation to account for deprecated `ActiveModel::Errors#keys`. [#7475] by [@amit]
+
+### Dependency Changes
+
+* Drop rails 6.0 support. [#7476] by [@deivid-rodriguez]
+
+### Performance
+
+* Fix pundit performance. [#7479] by [@deivid-rodriguez]
+
 ## 2.12.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.11.2..v2.12.0)
 
 ### Enhancements
@@ -772,6 +786,9 @@ Please check [0-6-stable] for previous changes.
 [#7384]: https://github.com/activeadmin/activeadmin/pull/7384
 [#7394]: https://github.com/activeadmin/activeadmin/pull/7394
 [#7453]: https://github.com/activeadmin/activeadmin/pull/7453
+[#7475]: https://github.com/activeadmin/activeadmin/pull/7475
+[#7476]: https://github.com/activeadmin/activeadmin/pull/7476
+[#7479]: https://github.com/activeadmin/activeadmin/pull/7479
 
 [@1000ship]: https://github.com/1000ship
 [@5t111111]: https://github.com/5t111111
@@ -782,6 +799,7 @@ Please check [0-6-stable] for previous changes.
 [@alejandroperea]: https://github.com/alejandroperea
 [@alex-bogomolov]: https://github.com/alex-bogomolov
 [@amiel]: https://github.com/amiel
+[@amit]: https://github.com/amit
 [@amiuhle]: https://github.com/amiuhle
 [@andreslemik]: https://github.com/andreslemik
 [@bartoszkopinski]: https://github.com/bartoszkopinski

data/CONTRIBUTING.md

@@ -63,7 +63,7 @@ If you want to test against a Rails version different from the latest, make sure
 you use the correct Gemfile, for example:
 
 ```sh
-export BUNDLE_GEMFILE=gemfiles/rails_60/Gemfile
+export BUNDLE_GEMFILE=gemfiles/rails_61/Gemfile
 ```
 
 **Warning** SCSS assets are aimed to be used indifferently with Sprockets **and** webpacker.

data/docs/5-forms.md

@@ -182,7 +182,8 @@ To display a list of all validation errors:
 
 ```ruby
 form do |f|
-  f.semantic_errors *f.object.errors.keys
+  f.semantic_errors *f.object.errors.attribute_names
+
   # ...
 end
 ```

data/lib/active_admin/pundit_adapter.rb

@@ -31,14 +31,13 @@ module ActiveAdmin
     end
 
     def retrieve_policy(subject)
-      Pundit.policy!(user, namespace(policy_target(subject)))
-    rescue Pundit::NotDefinedError => e
-      if (policy = compat_policy(subject))
+      target = policy_target(subject)
+      if (policy = policy(namespace(target)) || compat_policy(subject))
         policy
       elsif default_policy_class
-        default_policy(user, subject)
+        default_policy(subject)
       else
-        raise e
+        raise Pundit::NotDefinedError, "unable to find a compatible policy for `#{target}`"
       end
     end
 
@@ -71,11 +70,12 @@ module ActiveAdmin
     # This fallback might be removed in future versions of ActiveAdmin, so
     # pundit_adapter search will work consistently with provided namespaces
     def compat_policy(subject)
+      return unless default_policy_namespace
+
       target = policy_target(subject)
 
-      return unless default_policy_namespace &&
-        target.class.to_s.include?(default_policy_module) &&
-        (policy = Pundit.policy(user, target))
+      return unless target.class.to_s.include?(default_policy_module) &&
+        (policy = policy(target))
 
       policy_name = policy.class.to_s
 
@@ -89,7 +89,7 @@ module ActiveAdmin
     end
 
     def namespace(object)
-      if default_policy_namespace && !object.class.to_s.match?(/^#{default_policy_module}::/)
+      if default_policy_namespace && !object.class.to_s.start_with?("#{default_policy_module}::")
         [default_policy_namespace.to_sym, object]
       else
         object
@@ -100,7 +100,7 @@ module ActiveAdmin
       ActiveAdmin.application.pundit_default_policy && ActiveAdmin.application.pundit_default_policy.constantize
     end
 
-    def default_policy(user, subject)
+    def default_policy(subject)
       default_policy_class.new(user, subject)
     end
 
@@ -112,6 +112,14 @@ module ActiveAdmin
       default_policy_namespace.to_s.camelize
     end
 
+    def policy(target)
+      policies[target] ||= Pundit.policy(user, target)
+    end
+
+    def policies
+      @policies ||= {}
+    end
+
   end
 
 end

data/lib/active_admin/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveAdmin
-  VERSION = "2.12.0"
+  VERSION = "2.13.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.13.0
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-22 00:00:00.000000000 Z
+date: 2022-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -125,7 +125,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -135,7 +135,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -578,7 +578,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.10
+rubygems_version: 3.3.13
 signing_key:
 specification_version: 4
 summary: Active Admin is a Ruby on Rails plugin for generating administration style