activeadmin 3.2.3 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd51d7cc81eac3cbb01358076ca98368ccd5879f96dd9dfaed3f4e6b5c511648
-  data.tar.gz: 95913536dfd3ccf746a0848545b81685ead621cd2536776ede879a9b02196058
+  metadata.gz: 99b9db7d0e925b5764b5141008734fa147cbb742e0f3e62476a7dcc8fb1f0485
+  data.tar.gz: b0f5aa9c2dc4c1923e7cac2b893a0a2d871ddb67cdec7183dc7886b5adea97e6
 SHA512:
-  metadata.gz: 0b296e6597a76172815063ca7b63ba359308b9a13c26874b6ea6b746dbd25bb8d6929c4da2f1b8682dfbd998cc7a752c73d2eca70b356fdfad8362294273aac9
-  data.tar.gz: ac965d5a5b2308a064e0e47816c1739f8482570ce926feb72fcf1031b12ac1e738719571faae48d03128c1d8af790e74e47c04e7f62484e791cd654749373417
+  metadata.gz: efa9d0ded1ac54f680ab3409019cf425a578d18bd89c73b4a39cc219cbbb50e25abeb294d771724394648432704e5bbcb10729ea5aa4e89150c00c3de876755d
+  data.tar.gz: c85cd6bfc4f4cbaa4345d960c8c797ab4066d58f131116b79100195edd6e269ac8f1867441442801c7a7eea4cefebe36506db373284d28b7ee48fa826d05bdcc

data/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 ## Unreleased
 
+## 3.2.5 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.4..v3.2.5)
+
+### Enhancements
+
+* Backport Add favicon to template app to fix Rails 7.2 test suite run [#8468] by [@mgrunberg]
+* Backport Use attribute_types instead of columns_hash to determine type [#8469] by [@mgrunberg]
+* Backport Optimize count query for pagination_total: false option [#8470] by [@mgrunberg]
+
+### Bug Fixes
+
+* Restore inner span tag to form inputs legend [#8467] by [@denisahearn]
+
+## 3.2.4 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.3..v3.2.4)
+
+### Enhancements
+
+* Test against Rails 7.2 [#8434] by [@mgrunberg]
+
+### Bug Fixes
+
+* Backport Improve form f.inputs attributes rendering [#8446] by [@amiel]
+
 ## 3.2.3 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.2..v3.2.3)
 
 ### Enhancements
@@ -932,6 +954,12 @@ Please check [0-6-stable] for previous changes.
 [#8349]: https://github.com/activeadmin/activeadmin/pull/8349
 [#8405]: https://github.com/activeadmin/activeadmin/pull/8405
 [#8412]: https://github.com/activeadmin/activeadmin/pull/8412
+[#8434]: https://github.com/activeadmin/activeadmin/pull/8434
+[#8446]: https://github.com/activeadmin/activeadmin/pull/8446
+[#8467]: https://github.com/activeadmin/activeadmin/pull/8467
+[#8468]: https://github.com/activeadmin/activeadmin/pull/8468
+[#8469]: https://github.com/activeadmin/activeadmin/pull/8469
+[#8470]: https://github.com/activeadmin/activeadmin/pull/8470
 
 [@1000ship]: https://github.com/1000ship
 [@5t111111]: https://github.com/5t111111
@@ -960,6 +988,7 @@ Please check [0-6-stable] for previous changes.
 [@craigmcnamara]: https://github.com/craigmcnamara
 [@DanielHeath]: https://github.com/DanielHeath
 [@deivid-rodriguez]: https://github.com/deivid-rodriguez
+[@denisahearn]: https://github.com/denisahearn
 [@dennisvdvliet]: https://github.com/dennisvdvliet
 [@dhyegofernando]: https://github.com/dhyegofernando
 [@dkniffin]: https://github.com/dkniffin

data/lib/active_admin/resource_controller/decorators.rb

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

data/lib/active_admin/version.rb

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

data/lib/active_admin/view_helpers/display_helper.rb

@@ -108,8 +108,8 @@ module ActiveAdmin
         when TrueClass, FalseClass
           true
         else
-          if resource.class.respond_to? :columns_hash
-            column = resource.class.columns_hash[attr.to_s] and column.type == :boolean
+          if resource.class.respond_to? :attribute_types
+            resource.class.attribute_types[attr.to_s].is_a?(ActiveModel::Type::Boolean)
           end
         end
       end

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

@@ -127,12 +127,24 @@ module ActiveAdmin
         html_options[:class] ||= "inputs"
         legend = args.shift if args.first.is_a?(::String)
         legend = html_options.delete(:name) if html_options.key?(:name)
-        legend_tag = legend ? "<legend><span>#{ERB::Util.html_escape(legend)}</span></legend>" : ""
-        fieldset_attrs = html_options.map { |k, v| %Q{#{k}="#{v}"} }.join(" ")
+        legend_tag = legend ? helpers.tag.legend(helpers.tag.span(legend), class: "fieldset-title") : ""
+        fieldset_attrs = tag_attributes html_options
         @opening_tag = "<fieldset #{fieldset_attrs}>#{legend_tag}<ol>"
         @closing_tag = "</ol></fieldset>"
         super(*(args << html_options), &block)
       end
+
+      private
+
+      def tag_attributes(html_options)
+        if Rails::VERSION::MAJOR <= 6
+          # Reimplement tag.attributes to backport support for Rails 6.1.
+          # TODO: this can be removed when support for Rails 6.x is dropped
+          helpers.tag.tag_options(html_options.to_h).to_s.strip.html_safe
+        else
+          helpers.tag.attributes html_options
+        end
+      end
     end
 
     class SemanticActionsProxy < FormtasticProxy

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

@@ -103,7 +103,10 @@ module ActiveAdmin
           # you pass in the :total_pages option. We issue a query to determine
           # if there is another page or not, but the limit/offset make this
           # query fast.
-          offset = collection.offset(collection.current_page * collection.limit_value).limit(1).count
+          offset_scope = collection.offset(collection.current_page * collection.limit_value)
+          # Support array collections. Kaminari::PaginatableArray does not respond to except
+          offset_scope = offset_scope.except(:select, :order) if offset_scope.respond_to?(:except)
+          offset = offset_scope.limit(1).count
           options[:total_pages] = collection.current_page + offset
           options[:right] = 0
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.5
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-02 00:00:00.000000000 Z
+date: 2024-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -533,7 +533,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Active Admin is a Ruby on Rails plugin for generating administration style