activeadmin-rb 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16c418b00684a2594838518e317b5be1842f91c2d7f86862c5177bb7646ac00d
-  data.tar.gz: a58b8f8f1168ed57fca7bc000e30c883d643dbbb06a9d5d32021f5b428feff75
+  metadata.gz: 6f9390b0a2c779b367ff02ed61abf9ac18ba6d381c910528ace2face7aeb9b0e
+  data.tar.gz: 71eb79f51168913a392fa61864a1decc6afdda47e731a5e0bf9b3e449706e120
 SHA512:
-  metadata.gz: 5529e188e3f1973fed618e82d36067f8bf70a38ce1f6ce3c5f7d70aef5794636bcbbe4d1c231d510cbabd989a75aaf8e63622a10cf9099c242e7a8866d47e915
-  data.tar.gz: 6cbd6dd46a6a44f8075f901a497e6b15b23e305b9d84c0cb333ed4d241f9a087289fa37d9c14429a1c6495e398bfac0da30d4e5f353bb0f462230843c592e7fe
+  metadata.gz: e6c6fc6b71b50a8f9199431030c432c12e5730a6f65a8c7f11b937771e3db87293cfac2fa6cc12113ab00fe79804f91ec6318a28ccdafa80199bfeb211fc8ab1
+  data.tar.gz: 24dd5fb4179da63737456f605ad77fffc1001955a892f1dcad90111da5d47e482ddc5764f5c77270003fdd059790a8507f5423ef5efa30c1150a2fd0a1d75f5c

data/.github/workflows/ci.yaml

@@ -19,7 +19,7 @@ jobs:
 
         os: [ubuntu-20.04]
 
-        deps: [rails_61, rails_60]
+        deps: [rails_70, rails_61]
 
     env:
       COVERAGE: false

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.6.0 [☰](https://github.com/varyonic/activeadmin-rb/compare/v1.5.2...v1.6.0)
+
+### Enhancements
+
+* Add Rails 7 Support. [#7235] by [@tagliala]
+
+### Bug Fixes
+
+* Fix frozen string error when downloading CSV and streaming disabled. [#7332] by [@deivid-rodriguez]
+
 ## 1.5.2 [☰](https://github.com/varyonic/activeadmin-rb/compare/v1.5.1...v1.5.2)
 
 * Fix Ruby 2.7 warnings about keyword args. [#6000], [#6237] by [@vcsjones] and [@deivid-rodriguez]
@@ -354,6 +364,8 @@ Please check [0-6-stable] for previous changes.
 [#5800]: https://github.com/activeadmin/activeadmin/pull/5800
 [#6000]: https://github.com/activeadmin/activeadmin/pull/6000
 [#6237]: https://github.com/activeadmin/activeadmin/pull/6237
+[#7235]: https://github.com/activeadmin/activeadmin/pull/7235
+[#7332]: https://github.com/activeadmin/activeadmin/pull/7332
 
 [@5t111111]: https://github.com/5t111111
 [@aarek]: https://github.com/aarek
@@ -405,6 +417,7 @@ Please check [0-6-stable] for previous changes.
 [@shekibobo]: https://github.com/shekibobo
 [@shouya]: https://github.com/shouya
 [@stefsava]: https://github.com/stefsava
+[@tagliala]: https://github.com/tagliala
 [@stereoscott]: https://github.com/stereoscott
 [@tiagotex]: https://github.com/tiagotex
 [@timoschilling]: https://github.com/timoschilling

data/Gemfile

@@ -35,6 +35,7 @@ group :development, :test do
 end
 
 group :test do
+  gem 'cuprite'
   gem 'capybara'
   gem 'simplecov', require: false # Test coverage generator. Go to /coverage/ after running tests
   gem 'codecov', require: false # Test coverage website. Go to https://codecov.io
@@ -45,5 +46,4 @@ group :test do
   gem 'launchy'
   gem 'rspec-rails'
   gem 'i18n-spec'
-  gem 'poltergeist'
 end

data/Rakefile

@@ -25,7 +25,7 @@ task :setup, [:parallel, :dir, :template] do |_t, opts|
     env = { 'BUNDLE_GEMFILE' => ENV['BUNDLE_GEMFILE'] }
     env['INSTALL_PARALLEL'] = 'yes' if opts[:parallel]
 
-    Bundler.with_clean_env { Kernel.exec(env, command) }
+    Bundler.with_unbundled_env { Kernel.exec(env, command) }
 
     Rake::Task['parallel:after_setup_hook'].invoke if opts[:parallel]
   end

data/features/index/format_as_csv.feature

@@ -27,6 +27,20 @@ Feature: Format as CSV
     Then I should download a CSV file for "my-articles" containing:
     | Id  | Title       | Body | Published date | Position | Starred | Foo    | Created at | Updated at |
 
+  Scenario: Default with streaming disabled
+    Given a configuration of:
+    """
+      ActiveAdmin.application.disable_streaming_in = ["test"]
+
+      ActiveAdmin.register Post
+    """
+    And a post with the title "Hello World" exists
+    When I am on the index page for posts
+    And I follow "CSV"
+    Then I should download a CSV file for "posts" containing:
+    | Id  | Title       | Body | Published date | Position | Starred | Foo    |Created at | Updated at |
+    | \d+ | Hello World |      |                |          |         |        |(.*)       | (.*)       |
+
   Scenario: With CSV format customization
     Given a configuration of:
     """

data/features/step_definitions/batch_action_steps.rb

@@ -58,9 +58,6 @@ Given /^I submit the batch action form with "([^"]*)"$/ do |action|
 end
 
 When /^I click "(.*?)" and accept confirmation$/ do |link|
-  # Use this implementation instead if poltergeist ever implements it
-  # page.driver.accept_modal(:confirm) { click_link(link) }
-
   click_link(link)
   expect(page).to have_content("Are you sure you want to delete these posts?")
   click_button("OK")

data/features/step_definitions/format_steps.rb

@@ -2,10 +2,12 @@ require 'csv'
 
 Around '@csv' do |scenario, block|
   default_csv_options = ActiveAdmin.application.csv_options
+  default_disable_streaming_in = ActiveAdmin.application.disable_streaming_in
 
   begin
     block.call
   ensure
+    ActiveAdmin.application.disable_streaming_in = default_disable_streaming_in
     ActiveAdmin.application.csv_options = default_csv_options
   end
 end

data/features/support/env.rb

@@ -47,13 +47,13 @@ After do
   end
 end
 
-require 'capybara/rails'
-require 'capybara/cucumber'
-require 'capybara/session'
-require 'capybara/poltergeist'
-require 'phantomjs/poltergeist'
+require "capybara/cuprite"
 
-Capybara.javascript_driver = :poltergeist
+Capybara.register_driver(:cuprite) do |app|
+  Capybara::Cuprite::Driver.new(app, process_timeout: 30, timeout: 30)
+end
+
+Capybara.javascript_driver = :cuprite
 
 Capybara.server = :webrick
 
@@ -95,7 +95,7 @@ end
 Before do
   # We are caching classes, but need to manually clear references to
   # the controllers. If they aren't clear, the router stores references
-  ActiveSupport::Dependencies.clear
+  ActiveSupport::Dependencies.clear if Rails::VERSION::MAJOR < 7
 
   # Reload Active Admin
   ActiveAdmin.unload!

data/gemfiles/rails_60.gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 eval_gemfile(File.expand_path(File.join("..", "Gemfile"), __dir__))
 
 gem "rails", "~> 6.0.0"
-gem "rails-i18n", ">= 6.0.x"
+gem "rails-i18n", "~> 6.0"
 gem "sass-rails", ">= 6.0.x"
 gem "sprockets", ">= 4.0.x"
 gem "bootsnap"

data/gemfiles/rails_61.gemfile

@@ -2,8 +2,8 @@ source "https://rubygems.org"
 
 eval_gemfile(File.expand_path(File.join("..", "Gemfile"), __dir__))
 
-gem "rails", ">= 6.0.x"
-gem "rails-i18n", ">= 6.0.x"
+gem "rails", "~> 6.1.0"
+gem "rails-i18n", "~> 6.0.x"
 gem "sass-rails", ">= 6.0.x"
 gem "sprockets", ">= 4.0.x"
 gem "bootsnap"

data/gemfiles/rails_70.gemfile

@@ -0,0 +1,17 @@
+source "https://rubygems.org"
+
+eval_gemfile(File.expand_path(File.join("..", "Gemfile"), __dir__))
+
+gem "rails", ">= 7.0.0.rc"
+gem "rails-i18n", ">= 6.0.x"
+gem "sass-rails", ">= 6.0.x"
+gem "sprockets", ">= 4.0.x"
+gem "bootsnap"
+gem "devise", "~> 4.4"
+gem "draper"
+gem "inherited_resources", github: "varyonic/inherited_resources", branch: "rails-7"
+gem "ransack", ">= 2.0" # 2.x for Rails 5.2+ only.
+gem 'sqlite3', platforms: :mri
+gem "activerecord-jdbcsqlite3-adapter", ">= 60.0.x", platform: :jruby
+
+gemspec path: "../"

data/lib/active_admin/base_controller/authorization.rb

@@ -79,7 +79,7 @@ module ActiveAdmin
       def active_admin_authorization_adapter
         adapter = active_admin_namespace.authorization_adapter
         if adapter.is_a? String
-          ActiveSupport::Dependencies.constantize adapter
+          adapter.constantize
         else
           adapter
         end

data/lib/active_admin/engine.rb

@@ -1,6 +1,7 @@
 module ActiveAdmin
   class Engine < ::Rails::Engine
-    initializer "active_admin.load_app_path" do |app|
+    # Set default values for app_path and load_paths before running initializers
+    initializer "active_admin.load_app_path", before: :load_config_initializers do |app|
       ActiveAdmin::Application.setting :app_path, app.root
       ActiveAdmin::Application.setting :load_paths, [File.expand_path('app/admin', app.root)]
     end

data/lib/active_admin/resource.rb

@@ -96,11 +96,11 @@ module ActiveAdmin
     # The class this resource wraps. If you register the Post model, Resource#resource_class
     # will point to the Post class
     def resource_class
-      ActiveSupport::Dependencies.constantize(resource_class_name)
+      resource_class_name.constantize
     end
 
     def decorator_class
-      ActiveSupport::Dependencies.constantize(decorator_class_name) if decorator_class_name
+      decorator_class_name&.constantize
     end
 
     def resource_table_name

data/lib/active_admin/resource_controller/streaming.rb

@@ -22,14 +22,14 @@ module ActiveAdmin
         headers['Cache-Control'] = 'no-cache'
 
         if ActiveAdmin.application.disable_streaming_in.include? Rails.env
-          self.response_body = block['']
+          self.response_body = block[String.new]
         else
           self.response_body = Enumerator.new &block
         end
       end
 
       def csv_filename
-        "#{resource_collection_name.to_s.gsub('_', '-')}-#{Time.zone.now.to_date.to_s(:default)}.csv"
+        "#{resource_collection_name.to_s.gsub('_', '-')}-#{Time.zone.now.to_date.to_formatted_s(:default)}.csv"
       end
 
       def stream_csv

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '1.5.2'
+  VERSION = '1.6.0'
 end

data/spec/bug_report_templates_spec.rb

@@ -3,7 +3,7 @@ require 'open3'
 
 RSpec.describe 'bug_report_templates' do
   subject do
-    Bundler.with_clean_env do
+    Bundler.with_unbundled_env do
       Dir.chdir(chdir_path) do
         Open3.capture2e(
           {'ACTIVE_ADMIN_PATH' => active_admin_root},

data/spec/support/rails_template.rb

@@ -123,7 +123,7 @@ RUBY
 
 # TODO: remove this line after the STI pre-loading is fixed
 # The test commenting.feature/Commenting on a STI subclass fails with zeitwerk autoloader
-inject_into_file 'config/environments/test.rb', "\n  config.autoloader = :classic\n", after: 'Rails.application.configure do' if Rails::VERSION::MAJOR >= 6
+inject_into_file 'config/environments/test.rb', "\n  config.autoloader = :classic\n", after: 'Rails.application.configure do' if Rails::VERSION::MAJOR == 6
 
 # Add our local Active Admin to the application
 gem 'activeadmin-rb', path: '../..'

data/spec/unit/filters/active_filter_spec.rb

@@ -178,7 +178,7 @@ RSpec.describe ActiveAdmin::Filters::ActiveFilter do
     end
 
     it "should use the association's primary key to find the associated record" do
-      allow(ActiveSupport::Dependencies).to receive(:constantize).with("::SuperPost").and_return(resource_klass)
+      stub_const("::SuperPost", resource_klass)
 
       resource.add_filter(:kategory)
 
@@ -210,7 +210,7 @@ RSpec.describe ActiveAdmin::Filters::ActiveFilter do
     end
 
     it "should use the association's primary key to find the associated record" do
-      allow(ActiveSupport::Dependencies).to receive(:constantize).with("::#{resource_klass.name}").and_return(resource_klass)
+      stub_const("::#{resource_klass.name}", resource_klass)
 
       expect(subject.values.first).to eq user
     end

data/spec/unit/resource_spec.rb

@@ -241,8 +241,8 @@ module ActiveAdmin
       let(:resource) { namespace.register(Post) }
       let(:post) { double }
       before do
-        allow(Post).to receive(:find_by).with("id" => "12345") { post }
-        allow(Post).to receive(:find_by).with("id" => "54321") { nil }
+        allow(Post).to receive(:find_by).with({"id" => "12345"}) { post }
+        allow(Post).to receive(:find_by).with({"id" => "54321"}) { nil }
       end
 
       it 'can find the resource' do
@@ -265,7 +265,7 @@ module ActiveAdmin
         before do
           allow(Post).to receive(:primary_key).and_return 'something_else'
           allow(Post).to receive(:find_by).
-              with("something_else" => "55555") { different_post }
+              with({"something_else" => "55555"}) { different_post }
         end
 
         it 'can find the post by the custom primary key' do

data/spec/unit/view_helpers/form_helper_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe ActiveAdmin::ViewHelpers::FormHelper do
     let(:default_options) { { builder: ActiveAdmin::FormBuilder } }
 
     it 'calls semantic_form_for with the ActiveAdmin form builder' do
-      expect(view).to receive(:semantic_form_for).with(resource, builder: ActiveAdmin::FormBuilder)
+      expect(view).to receive(:semantic_form_for).with(resource, { builder: ActiveAdmin::FormBuilder })
       view.active_admin_form_for(resource)
     end
 
@@ -16,7 +16,7 @@ RSpec.describe ActiveAdmin::ViewHelpers::FormHelper do
       # We can't use a stub here because options gets marshalled, and a new
       # instance built. Any constant will work.
       custom_builder = Object
-      expect(view).to receive(:semantic_form_for).with(resource, builder: custom_builder)
+      expect(view).to receive(:semantic_form_for).with(resource, { builder: custom_builder })
       view.active_admin_form_for(resource, builder: custom_builder)
     end
   end

data/tasks/local.rake

@@ -20,6 +20,6 @@ task :local do
   env = { 'BUNDLE_GEMFILE' => ENV['BUNDLE_GEMFILE'] }
 
   Dir.chdir(app_folder) do
-    Bundler.with_clean_env { Kernel.exec(env, command) }
+    Bundler.with_unbundled_env { Kernel.exec(env, command) }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-rb
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Greg Bell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-08 00:00:00.000000000 Z
+date: 2022-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -462,6 +462,7 @@ files:
 - gemfiles/rails_52.gemfile
 - gemfiles/rails_60.gemfile
 - gemfiles/rails_61.gemfile
+- gemfiles/rails_70.gemfile
 - lib/active_admin.rb
 - lib/active_admin/abstract_view_factory.rb
 - lib/active_admin/application.rb
@@ -790,7 +791,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: The administration framework for Ruby on Rails.