activeadmin 2.13.0 → 2.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 170a59df9471df04e568a2ae1cc4dab8ff58c28fd28a6861a5e87ba596a4e913
-  data.tar.gz: ff345b66e5c18bc94b2a9394d0a633ebe12cce3f7c94b5119ece2b54bcf86836
+  metadata.gz: 0b3beb756b607b196f72d4ec4a4b173867021bb2eba03d183797165810a526b5
+  data.tar.gz: bed4421fc6a28f2ff0bee9659a76bfd680b9432c74d290753c62392c3a7048d3
 SHA512:
-  metadata.gz: 558b34213e3a1af076814008a337ed3d7a66fa328c33bb460020f28595f4e4898e815752dde54c8b41ab6fa687989e7c4d0d8cd58113e736bdafe3943b3c3026
-  data.tar.gz: bb0f39fecd17ef5bb0063aaa64cf2ee2684fa52b19faf7b2e37fc273484554ad97a686972f5d5baa02cbd8d785efd9de384769e86b2083f5a2a6c591381d573d
+  metadata.gz: 11cce1d23fb4519f394ef13930716fabe39e6d7654f5c4424c887fe54e6d56225700155ae59187ad42a6551d9bcf17f95652c08d234ddafb5ba2d4fb5e444a09
+  data.tar.gz: 452592e57f8fe9f16e683a2f54b9dc7fdd717d1ec2db909710a07cfb74dda5d8f7a0efda515b439555470381da020e75b2d4dfe328a8b52bc436b2f94371525b

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## 2.13.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.13.0..v2.13.1)
+
+### Bug Fixes
+
+* Honor load paths order when loading admin files. [#7488] by [@tf]
+* Fix passing expected hash payload argument. [#7487] by [@ispyropoulos]
+
 ## 2.13.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.12.0..v2.13.0)
 
 ### Documentation
@@ -789,6 +796,8 @@ Please check [0-6-stable] for previous changes.
 [#7475]: https://github.com/activeadmin/activeadmin/pull/7475
 [#7476]: https://github.com/activeadmin/activeadmin/pull/7476
 [#7479]: https://github.com/activeadmin/activeadmin/pull/7479
+[#7487]: https://github.com/activeadmin/activeadmin/pull/7487
+[#7488]: https://github.com/activeadmin/activeadmin/pull/7488
 
 [@1000ship]: https://github.com/1000ship
 [@5t111111]: https://github.com/5t111111
@@ -836,6 +845,7 @@ Please check [0-6-stable] for previous changes.
 [@innparusu95]: https://github.com/innparusu95
 [@ionut998]: https://github.com/ionut998
 [@irmela]: https://github.com/irmela
+[@ispyropoulos]: https://github.com/ispyropoulos
 [@Ivanov-Anton]: https://github.com/Ivanov-Anton
 [@jasl]: https://github.com/jasl
 [@javawizard]: https://github.com/javawizard
@@ -894,6 +904,7 @@ Please check [0-6-stable] for previous changes.
 [@stereoscott]: https://github.com/stereoscott
 [@tagliala]: https://github.com/tagliala
 [@taralbass]: https://github.com/taralbass
+[@tf]: https://github.com/tf
 [@tiagotex]: https://github.com/tiagotex
 [@timoschilling]: https://github.com/timoschilling
 [@TimPetricola]: https://github.com/TimPetricola

data/docs/Gemfile.lock

@@ -232,7 +232,7 @@ GEM
       jekyll-seo-tag (~> 2.1)
     minitest (5.15.0)
     multipart-post (2.1.1)
-    nokogiri (1.13.4)
+    nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     octokit (4.22.0)

data/lib/active_admin/application.rb

@@ -76,7 +76,7 @@ module ActiveAdmin
 
       namespace = namespaces[name.to_sym] ||= begin
         namespace = Namespace.new(self, name)
-        ActiveSupport::Notifications.instrument ActiveAdmin::Namespace::RegisterEvent, namespace
+        ActiveSupport::Notifications.instrument ActiveAdmin::Namespace::RegisterEvent, { active_admin_namespace: namespace }
         namespace
       end
 
@@ -112,10 +112,10 @@ module ActiveAdmin
     # To reload everything simply call `ActiveAdmin.unload!`
     def load!
       unless loaded?
-        ActiveSupport::Notifications.instrument BeforeLoadEvent, self # before_load hook
+        ActiveSupport::Notifications.instrument BeforeLoadEvent, { active_admin_application: self } # before_load hook
         files.each { |file| load file } # load files
         namespace(default_namespace) # init AA resources
-        ActiveSupport::Notifications.instrument AfterLoadEvent, self # after_load hook
+        ActiveSupport::Notifications.instrument AfterLoadEvent, { active_admin_application: self } # after_load hook
         @@loaded = true
       end
     end
@@ -126,7 +126,7 @@ module ActiveAdmin
 
     # Returns ALL the files to be loaded
     def files
-      load_paths.flatten.compact.uniq.flat_map { |path| Dir["#{path}/**/*.rb"] }.sort
+      load_paths.flatten.compact.uniq.flat_map { |path| Dir["#{path}/**/*.rb"].sort }
     end
 
     # Creates all the necessary routes for the ActiveAdmin configurations

data/lib/active_admin/namespace.rb

@@ -60,7 +60,7 @@ module ActiveAdmin
       settings.respond_to?(method) ? settings.send(method, *args) : super
     end
 
-    # Register a resource into this namespace. The preffered method to access this is to
+    # Register a resource into this namespace. The preferred method to access this is to
     # use the global registration ActiveAdmin.register which delegates to the proper
     # namespace instance.
     def register(resource_class, options = {}, &block)
@@ -72,7 +72,7 @@ module ActiveAdmin
       reset_menu!
 
       # Dispatch a registration event
-      ActiveSupport::Notifications.instrument ActiveAdmin::Resource::RegisterEvent, config
+      ActiveSupport::Notifications.instrument ActiveAdmin::Resource::RegisterEvent, { active_admin_resource: config }
 
       # Return the config
       config

data/lib/active_admin/version.rb

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

data/lib/active_admin.rb

@@ -113,7 +113,7 @@ module ActiveAdmin
     private
 
     def wrap_block_for_active_support_notifications block
-      proc { |_name, _start, _finish, _id, payload| block.call payload }
+      proc { |_name, _start, _finish, _id, payload| block.call payload[:active_admin_application] }
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.13.1
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-07 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -578,7 +578,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.13
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Active Admin is a Ruby on Rails plugin for generating administration style