activeadmin 2.11.2 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26f9266cffc8d0e054be977056ba02e2c09803db4f3690235112df2dbaa5b054
-  data.tar.gz: 8d7a87d3e2f53f5279cf100129149710e3886a633c902c7cd657ad0008b6c397
+  metadata.gz: 8fee30bf6175502c7e29f5cba45777a52fd9d72f9433f7f3911ba324a24638ef
+  data.tar.gz: 8ad44b1980960d2e8abb3f1406f90c3a0cd01255f0fcb30b6a56bf3cb8db1ab6
 SHA512:
-  metadata.gz: f783a8a7dba38645b4c62d11c384c54ceff4a198ea90eaab237c5b87293e82033ddfcbf00e5d7fd15c346b12debdb402a5f96f9b86891576ef34cd87644d3dcd
-  data.tar.gz: 55cd5df702122eaac4dc70cc7a072754edc1141553056896268ac3c0c7176b8876a8bafac61fe75cec064d58d3d4b03e15b36e3d4c52102a5f6dfb5e44d47214
+  metadata.gz: 39beb44c14375cec330f99a1d63d38959523a0bbbcf90e55f6b938a71a8d2624b9f8fdb110839b7272b346acdd533bc3f0fcd3a78ca3c3250bf401c807fb4b13
+  data.tar.gz: 9b4d5fb6d6d2238925e315c639bb6625703102d111c482399eb79b02cd6f203f7145770c2985795c2a3f60f6822f2757efe1e5c57a8c4ede3716e023e2efc50e

data/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 ## Unreleased
 
+## 2.12.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.11.2..v2.12.0)
+
+### Enhancements
+
+* Add Ransack 3 compatibility. [#7453] by [@tagliala]
+
+### Bug Fixes
+
+* Fix pundit namespace detection. [#7144] by [@vlad-psh]
+
+### Documentation
+
+* Don't mention webpacker as the default asset generator in Rails. [#7377] by [@jaynetics]
+
+### Performance
+
+* Avoid duplicate work when downloading CSV. [#7336] by [@deivid-rodriguez]
+
 ## 2.11.2 [☰](https://github.com/activeadmin/activeadmin/compare/v2.11.1..v2.11.2)
 
 ### Bug Fixes
@@ -736,6 +754,7 @@ Please check [0-6-stable] for previous changes.
 [#6959]: https://github.com/activeadmin/activeadmin/pull/6959
 [#7095]: https://github.com/activeadmin/activeadmin/pull/7095
 [#7127]: https://github.com/activeadmin/activeadmin/pull/7127
+[#7144]: https://github.com/activeadmin/activeadmin/pull/7144
 [#7170]: https://github.com/activeadmin/activeadmin/pull/7170
 [#7181]: https://github.com/activeadmin/activeadmin/pull/7181
 [#7205]: https://github.com/activeadmin/activeadmin/pull/7205
@@ -744,12 +763,15 @@ Please check [0-6-stable] for previous changes.
 [#7262]: https://github.com/activeadmin/activeadmin/pull/7262
 [#7293]: https://github.com/activeadmin/activeadmin/pull/7293
 [#7332]: https://github.com/activeadmin/activeadmin/pull/7332
+[#7336]: https://github.com/activeadmin/activeadmin/pull/7336
 [#7340]: https://github.com/activeadmin/activeadmin/pull/7340
 [#7341]: https://github.com/activeadmin/activeadmin/pull/7341
 [#7349]: https://github.com/activeadmin/activeadmin/pull/7349
 [#7350]: https://github.com/activeadmin/activeadmin/pull/7350
+[#7377]: https://github.com/activeadmin/activeadmin/pull/7377
 [#7384]: https://github.com/activeadmin/activeadmin/pull/7384
 [#7394]: https://github.com/activeadmin/activeadmin/pull/7394
+[#7453]: https://github.com/activeadmin/activeadmin/pull/7453
 
 [@1000ship]: https://github.com/1000ship
 [@5t111111]: https://github.com/5t111111
@@ -801,6 +823,7 @@ Please check [0-6-stable] for previous changes.
 [@javawizard]: https://github.com/javawizard
 [@javierjulio]: https://github.com/javierjulio
 [@jawa]: https://github.com/jawa
+[@jaynetics]: https://github.com/jaynetics
 [@JiiHu]: https://github.com/JiiHu
 [@jiikko]: https://github.com/jiikko
 [@johnnyshields]: https://github.com/johnnyshields

data/docs/0-installation.md

@@ -114,7 +114,7 @@ If you're getting the error `wrong number of arguments (6 for 4..5)`, [read #270
 
 ## webpacker
 
-For new apps starting with Rails 6.0, Webpacker has become the default asset generator. You can **opt-in to using Webpacker for ActiveAdmin assets** as well by updating your configuration to turn on the `use_webpacker` option, either at installation time or manually.
+You can **opt-in to using Webpacker for ActiveAdmin assets** as well by updating your configuration to turn on the `use_webpacker` option, either at installation time or manually.
 
 * at active_admin installation:
 

data/docs/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.4.6)
+    activesupport (6.0.4.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -15,7 +15,7 @@ GEM
     coffee-script-source (1.11.1)
     colorator (1.1.0)
     commonmarker (0.23.4)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     dnsruby (1.61.9)
       simpleidn (~> 0.1)
     em-websocket (0.5.3)
@@ -51,9 +51,9 @@ GEM
     ffi (1.15.5)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    github-pages (225)
+    github-pages (226)
       github-pages-health-check (= 1.17.9)
-      jekyll (= 3.9.0)
+      jekyll (= 3.9.2)
       jekyll-avatar (= 0.7.0)
       jekyll-coffeescript (= 1.1.1)
       jekyll-commonmark-ghpages (= 0.2.0)
@@ -88,12 +88,12 @@ GEM
       jekyll-theme-time-machine (= 0.2.0)
       jekyll-titles-from-headings (= 0.5.3)
       jemoji (= 0.12.0)
-      kramdown (= 2.3.1)
+      kramdown (= 2.3.2)
       kramdown-parser-gfm (= 1.1.0)
       liquid (= 4.0.3)
       mercenary (~> 0.3)
       minima (= 2.5.1)
-      nokogiri (>= 1.12.5, < 2.0)
+      nokogiri (>= 1.13.4, < 2.0)
       rouge (= 3.26.0)
       terminal-table (~> 1.4)
     github-pages-health-check (1.17.9)
@@ -102,13 +102,13 @@ GEM
       octokit (~> 4.0)
       public_suffix (>= 3.0, < 5.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.14.0)
+    html-pipeline (2.14.1)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.0)
+    jekyll (3.9.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -216,7 +216,7 @@ GEM
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
-    kramdown (2.3.1)
+    kramdown (2.3.2)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
@@ -232,7 +232,7 @@ GEM
       jekyll-seo-tag (~> 2.1)
     minitest (5.15.0)
     multipart-post (2.1.1)
-    nokogiri (1.13.3)
+    nokogiri (1.13.4)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     octokit (4.22.0)
@@ -240,7 +240,7 @@ GEM
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     racc (1.6.0)
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
@@ -269,7 +269,7 @@ GEM
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.1)
     unicode-display_width (1.8.0)
     zeitwerk (2.5.4)
 

data/lib/active_admin/csv_builder.rb

@@ -43,7 +43,6 @@ module ActiveAdmin
     end
 
     def build(controller, csv)
-      @collection = controller.send :find_collection, except: :pagination
       columns = exec_columns controller.view_context
       bom = options[:byte_order_mark]
       column_names = options.delete(:column_names) { true }
@@ -55,13 +54,8 @@ module ActiveAdmin
         csv << CSV.generate_line(columns.map { |c| encode c.name, options }, **csv_options)
       end
 
-      ActiveRecord::Base.uncached do
-        (1..paginated_collection.total_pages).each do |page|
-          paginated_collection(page).each do |resource|
-            resource = controller.send :apply_decorator, resource
-            csv << CSV.generate_line(build_row(resource, columns, options), **csv_options)
-          end
-        end
+      controller.send(:in_paginated_batches) do |resource|
+        csv << CSV.generate_line(build_row(resource, columns, options), **csv_options)
       end
 
       csv
@@ -125,13 +119,5 @@ module ActiveAdmin
     def column_transitive_options
       @column_transitive_options ||= @options.slice(*COLUMN_TRANSITIVE_OPTIONS)
     end
-
-    def paginated_collection(page_no = 1)
-      @collection.public_send(Kaminari.config.page_method_name, page_no).per(batch_size)
-    end
-
-    def batch_size
-      1000
-    end
   end
 end

data/lib/active_admin/pundit_adapter.rb

@@ -31,13 +31,11 @@ module ActiveAdmin
     end
 
     def retrieve_policy(subject)
-      case subject
-      when nil then Pundit.policy!(user, namespace(resource))
-      when Class then Pundit.policy!(user, namespace(subject.new))
-      else Pundit.policy!(user, namespace(subject))
-      end
+      Pundit.policy!(user, namespace(policy_target(subject)))
     rescue Pundit::NotDefinedError => e
-      if default_policy_class
+      if (policy = compat_policy(subject))
+        policy
+      elsif default_policy_class
         default_policy(user, subject)
       else
         raise e
@@ -57,8 +55,41 @@ module ActiveAdmin
 
     private
 
+    def policy_target(subject)
+      case subject
+      when nil then resource
+      when Class then subject.new
+      else subject
+      end
+    end
+
+    # This method is needed to fallback to our previous policy searching logic.
+    # I.e.: when class name contains `default_policy_namespace` (eg: ShopAdmin)
+    # we should try to search it without namespace. This is because that's
+    # the only thing that worked in this case before we fixed our buggy namespace
+    # detection, so people are probably relying on it.
+    # This fallback might be removed in future versions of ActiveAdmin, so
+    # pundit_adapter search will work consistently with provided namespaces
+    def compat_policy(subject)
+      target = policy_target(subject)
+
+      return unless default_policy_namespace &&
+        target.class.to_s.include?(default_policy_module) &&
+        (policy = Pundit.policy(user, target))
+
+      policy_name = policy.class.to_s
+
+      Deprecation.warn "You have `pundit_policy_namespace` configured as `#{default_policy_namespace}`, " \
+        "but ActiveAdmin was unable to find policy #{default_policy_module}::#{policy_name}. " \
+        "#{policy_name} will be used instead. " \
+        "This behavior will be removed in future versions of ActiveAdmin. " \
+        "To fix this warning, move your #{policy_name} policy to the #{default_policy_module} namespace"
+
+      policy
+    end
+
     def namespace(object)
-      if default_policy_namespace && !object.class.to_s.include?(default_policy_namespace.to_s.camelize)
+      if default_policy_namespace && !object.class.to_s.match?(/^#{default_policy_module}::/)
         [default_policy_namespace.to_sym, object]
       else
         object
@@ -77,6 +108,10 @@ module ActiveAdmin
       ActiveAdmin.application.pundit_policy_namespace
     end
 
+    def default_policy_module
+      default_policy_namespace.to_s.camelize
+    end
+
   end
 
 end

data/lib/active_admin/resource_controller/data_access.rb

@@ -250,12 +250,13 @@ module ActiveAdmin
       end
 
       def apply_pagination(chain)
+        # skip pagination if CSV format was requested
+        return chain if params["format"] == "csv"
         # skip pagination if already was paginated by scope
         return chain if chain.respond_to?(:total_pages)
-        page_method_name = Kaminari.config.page_method_name
         page = params[Kaminari.config.param_name]
 
-        chain.public_send(page_method_name, page).per(per_page)
+        paginate(chain, page, per_page)
       end
 
       def collection_applies(options = {})
@@ -265,6 +266,16 @@ module ActiveAdmin
         COLLECTION_APPLIES & only - except
       end
 
+      def in_paginated_batches(&block)
+        ActiveRecord::Base.uncached do
+          (1..paginated_collection.total_pages).each do |page|
+            paginated_collection(page).each do |resource|
+              yield apply_decorator(resource)
+            end
+          end
+        end
+      end
+
       def per_page
         if active_admin_config.paginate
           dynamic_per_page || configured_per_page
@@ -318,6 +329,20 @@ module ActiveAdmin
       def create_another?
         params[:create_another].present?
       end
+
+      def paginated_collection(page_no = 1)
+        paginate(collection, page_no, batch_size)
+      end
+
+      def paginate(chain, page, per_page)
+        page_method_name = Kaminari.config.page_method_name
+
+        chain.public_send(page_method_name, page).per(per_page)
+      end
+
+      def batch_size
+        1000
+      end
     end
   end
 end

data/lib/active_admin/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 2.11.2
+  version: 2.12.0
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -143,22 +143,22 @@ dependencies:
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: The administration framework for Ruby on Rails.
 email:
 - deivid.rodriguez@riseup.net
@@ -578,7 +578,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.3.10
 signing_key:
 specification_version: 4
 summary: Active Admin is a Ruby on Rails plugin for generating administration style