activeadmin-rails 1.7.0 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0fbadfbfdeab69087abd64f588056156b07290b03f628c964647eb2417cb271
-  data.tar.gz: 8cb8c6a961c9497bd41f88932248a2b631d78eebc160f3d96ee5350e5cc444d6
+  metadata.gz: 8ad955d098046e0a908d6f53f22a2270935149a031c22e4f17110aae675fec2e
+  data.tar.gz: cfe0421fe309a57bc56570e752b0c932f08a837e70d9d047477f3e26b178c9dc
 SHA512:
-  metadata.gz: 666e2d4ee9f3e8c429fb5b1860aa1928933d39afaad93712c82fbdff73b6476e3228da72f90bdbcda19ca8e80157cfed5d942c185e405cc3efec3f805a0c17bc
-  data.tar.gz: 59b7772b54d705c5560fe176278ddd5ce322af83e23951f1de92a4ee00b3d2d22c6c6ce09431c0cbd90864f89c962622207f1e44760f23b3cdd59de7de49113e
+  metadata.gz: 796317e632daaff7738a1fd4f63a2deeb9782709720d1c75ee9fe3bd57f67948e737eb89933a3e713229434f4b2f598e48726c54685634a9bbdf38676236ee45
+  data.tar.gz: 3bbe2316011379e3b5cede0121b0fb91af778145631d38faa6dad9282b1ebfc752b6e188a849c937bc19c6bf45aaeab5c2344ea231c9da0b289a9318612d8b99

data/.github/workflows/ci.yaml

@@ -14,6 +14,15 @@ jobs:
     strategy:
       matrix:
         include:
+          - ruby: { name: 3.3, value: 3.3.6 }
+            deps: rails_80
+            os: ubuntu-24.04
+          - ruby: { name: 3.3, value: 3.3.6 }
+            deps: rails_72
+            os: ubuntu-24.04
+          - ruby: { name: 3.3, value: 3.3.6 }
+            deps: rails_71
+            os: ubuntu-24.04
           - ruby: { name: 3.2, value: 3.2.2 }
             deps: rails_71
             os: ubuntu-22.04
@@ -23,10 +32,10 @@ jobs:
           - ruby: { name: 3.2, value: 3.2.2 }
             deps: rails_70_hotwire
             os: ubuntu-22.04
-          - ruby: { name: 3.0, value: 3.0.1 }
+          - ruby: { name: 3.1, value: 3.1.6 }
             deps: rails_70
             os: ubuntu-22.04
-          - ruby: { name: 3.0, value: 3.0.1 }
+          - ruby: { name: 3.1, value: 3.1.6 }
             deps: rails_70_hotwire
             os: ubuntu-22.04
           - ruby: { name: 3.1, value: 3.1.2 }
@@ -35,12 +44,6 @@ jobs:
           - ruby: { name: 3.1, value: 3.1.2 }
             deps: rails_61_turbolinks
             os: ubuntu-22.04
-          - ruby: { name: 3.0, value: 3.0.1 }
-            deps: rails_61
-            os: ubuntu-22.04
-          - ruby: { name: 3.0, value: 3.0.1 }
-            deps: rails_61_turbolinks
-            os: ubuntu-22.04
       fail-fast: false
 
     env:

data/.github/workflows/daily.yaml

@@ -14,6 +14,12 @@ jobs:
     strategy:
       matrix:
         include:
+          - ruby: { name: 3.3, value: 3.3.6 }
+            deps: rails_72
+            os: ubuntu-24.04
+          - ruby: { name: 3.3, value: 3.3.6 }
+            deps: rails_71
+            os: ubuntu-24.04
           - ruby: { name: 3.2, value: 3.2.2 }
             deps: rails_71
             os: ubuntu-22.04
@@ -23,10 +29,10 @@ jobs:
           - ruby: { name: 3.2, value: 3.2.2 }
             deps: rails_70_hotwire
             os: ubuntu-22.04
-          - ruby: { name: 3.0, value: 3.0.1 }
+          - ruby: { name: 3.1, value: 3.1.6 }
             deps: rails_70
             os: ubuntu-22.04
-          - ruby: { name: 3.0, value: 3.0.1 }
+          - ruby: { name: 3.1, value: 3.1.6 }
             deps: rails_70_hotwire
             os: ubuntu-22.04
           - ruby: { name: 3.1, value: 3.1.2 }
@@ -35,12 +41,6 @@ jobs:
           - ruby: { name: 3.1, value: 3.1.2 }
             deps: rails_61_turbolinks
             os: ubuntu-22.04
-          - ruby: { name: 3.0, value: 3.0.1 }
-            deps: rails_61
-            os: ubuntu-22.04
-          - ruby: { name: 3.0, value: 3.0.1 }
-            deps: rails_61_turbolinks
-            os: ubuntu-22.04
       fail-fast: false
 
     env:

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## 1.7.2 [☰](https://github.com/varyonic/activeadmin-rails/compare/v1.7.1...v1.7.2)
+
+#### Minor
+
+* Rails 8.0 support. [#54] by [@varyonic]
+
+## 1.7.1 [☰](https://github.com/varyonic/activeadmin-rails/compare/v1.7.0...v1.7.1)
+
+#### Minor
+
+* Rails 7.2 support. [#53] by [@varyonic]
+* Verify Ruby 3.3 support. [#50] by [@varyonic]
+
+### Bug Fixes
+
+* Fix streaming CSV export. [#52] by [@varyonic]
+
+### Security Fixes
+
+* Don't restrict jquery-ui-rails upgrades. [#49] by [@varyonic]
+
 ## 1.7.0 [☰](https://github.com/varyonic/activeadmin-rails/compare/v1.6.0...v1.7.0)
 
 This release replaces Arbre::Pages with a conventional Rails layout and view partials.
@@ -447,6 +468,11 @@ Please check [0-6-stable] for previous changes.
 [#42]: https://github.com/varyonic/activeadmin-rails/pull/42
 [#43]: https://github.com/varyonic/activeadmin-rails/pull/43
 [#45]: https://github.com/varyonic/activeadmin-rails/pull/45
+[#49]: https://github.com/varyonic/activeadmin-rails/pull/49
+[#50]: https://github.com/varyonic/activeadmin-rails/pull/50
+[#52]: https://github.com/varyonic/activeadmin-rails/pull/52
+[#53]: https://github.com/varyonic/activeadmin-rails/pull/53
+[#54]: https://github.com/varyonic/activeadmin-rails/pull/54
 
 [@5t111111]: https://github.com/5t111111
 [@aarek]: https://github.com/aarek

data/CONTRIBUTING.md

@@ -36,7 +36,7 @@ Make sure you're using a recent ruby and have the `bundler` gem installed.
 Select the Gemfile for your preferred Rails version, preferably the latest:
 
 ```sh
-export BUNDLE_GEMFILE=gemfiles/rails_71.gemfile
+export BUNDLE_GEMFILE=gemfiles/rails_80.gemfile
 ```
 
 Now install the development dependencies:

data/Gemfile

@@ -41,7 +41,7 @@ group :test do
   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
-  gem 'cucumber-rails', github: 'cucumber/cucumber-rails', require: false
+  gem 'cucumber-rails', require: false
   gem 'cucumber'
   gem 'database_cleaner'
   gem 'jasmine'

data/README.md

@@ -17,7 +17,6 @@ but Varyonic has no plans to provide commercial support - let us know if you do.
 [![Github Actions  ][actions_badge]][actions]
 [![Quality         ][codeclimate_badge]][codeclimate]
 [![Coverage        ][codecov_badge]][codecov]
-[![Inch CI         ][inch_badge]][inch]
 
 ## Goals
 
@@ -72,8 +71,6 @@ Tool                  | Description
 [codeclimate]: https://codeclimate.com/github/varyonic/activeadmin/maintainability
 [codecov_badge]: https://codecov.io/gh/varyonic/activeadmin/branch/main/graph/badge.svg
 [codecov]: https://codecov.io/gh/varyonic/activeadmin
-[inch_badge]: http://inch-ci.org/github/varyonic/activeadmin.svg?branch=main
-[inch]: http://inch-ci.org/github/varyonic/activeadmin
 
 [docs]: http://activeadmin.org/0-installation.html
 [demo]: http://demo.activeadmin.org/admin

data/activeadmin-rails.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'formtastic_i18n'
   s.add_dependency 'inherited_resources', '>= 1.13.1'
   s.add_dependency 'jquery-rails', '>= 4.2.0'
-  s.add_dependency 'jquery-ui-rails', '~> 6.0'
+  s.add_dependency 'jquery-ui-rails', '>= 6.0'
   s.add_dependency 'kaminari', '>= 1.0.1'
   s.add_dependency 'railties', '>= 5.0'
   s.add_dependency 'ransack', '>= 1.8.7'

data/features/step_definitions/format_steps.rb

@@ -24,11 +24,13 @@ end
 # Check first rows of the displayed CSV.
 Then /^I should download a CSV file with "([^"]*)" separator for "([^"]*)" containing:$/ do |sep, resource_name, table|
   body   = page.driver.response.body
-  content_type_header, content_disposition_header = %w[Content-Type Content-Disposition].map do |header_name|
+  content_type_header, content_disposition_header, last_modified_header = %w[Content-Type Content-Disposition Last-Modified].map do |header_name|
     page.response_headers[header_name]
   end
   expect(content_type_header).to eq 'text/csv; charset=utf-8'
   expect(content_disposition_header).to match /\Aattachment; filename=".+?\.csv"\z/
+  expect(last_modified_header).to_not be_nil
+  expect(Date.strptime(last_modified_header, "%a, %d %b %Y %H:%M:%S GMT")).to be_a(Date)
 
   csv = CSV.parse(body, col_sep: sep)
   table.raw.each_with_index do |expected_row, row_index|

data/features/step_definitions/web_steps.rb

@@ -20,6 +20,7 @@ When /^(.*) within (.*[^:]):$/ do |step_name, parent, table_or_string|
 end
 
 Given /^I am on (.+)$/ do |page_name|
+  Rails.application.reload_routes!
   visit path_to(page_name)
 end
 

data/gemfiles/rails_61.gemfile

@@ -7,9 +7,10 @@ gem "rails-i18n", "~> 6.0.x"
 gem "sass-rails", ">= 6.0.x"
 gem "sprockets", ">= 4.0.x"
 gem "bootsnap"
+gem "concurrent-ruby", "<= 1.3.4"
 gem "devise", "~> 4.4"
 gem "draper"
-gem 'sqlite3', platforms: :mri
+gem "sqlite3", "~> 1.4"
 gem "activerecord-jdbcsqlite3-adapter", ">= 60.0.x", platform: :jruby
 
 gemspec path: "../"

data/gemfiles/rails_61_turbolinks.gemfile

@@ -7,9 +7,10 @@ gem "rails-i18n", "~> 6.0.x"
 gem "sass-rails", ">= 6.0.x"
 gem "sprockets", ">= 4.0.x"
 gem "bootsnap"
+gem "concurrent-ruby", "<= 1.3.4"
 gem "devise", "~> 4.4"
 gem "draper"
-gem 'sqlite3', platforms: :mri
+gem "sqlite3", "~> 1.4"
 gem "activerecord-jdbcsqlite3-adapter", ">= 60.0.x", platform: :jruby
 
 gemspec path: "../"

data/gemfiles/rails_70.gemfile

@@ -7,9 +7,10 @@ gem "rails-i18n", ">= 6.0.x"
 gem "sass-rails", ">= 6.0.x"
 gem "sprockets", ">= 4.0.x"
 gem "bootsnap"
+gem "concurrent-ruby", "<= 1.3.4"
 gem "devise", "~> 4.4"
 gem "draper"
-gem 'sqlite3', platforms: :mri
+gem "sqlite3", "~> 1.4"
 gem "activerecord-jdbcsqlite3-adapter", ">= 60.0.x", platform: :jruby
 
 gemspec path: "../"

data/gemfiles/rails_70_hotwire.gemfile

@@ -7,9 +7,10 @@ gem "rails-i18n", ">= 6.0.x"
 gem "sass-rails", ">= 6.0.x"
 gem "sprockets", ">= 4.0.x"
 gem "bootsnap"
+gem "concurrent-ruby", "<= 1.3.4"
 gem "devise", "~> 4.9" # support for Hotwire + Turbo, default in Rails 7+
 gem "draper"
-gem 'sqlite3', platforms: :mri
+gem "sqlite3", "~> 1.4"
 gem "activerecord-jdbcsqlite3-adapter", ">= 60.0.x", platform: :jruby
 
 gemspec path: "../"

data/gemfiles/rails_71.gemfile

@@ -11,7 +11,7 @@ gem 'devise', '>= 4.9.3'
 gem 'rack', '~> 2.2'
 gem 'bootsnap'
 gem 'draper'
-gem 'sqlite3', platforms: :mri
+gem 'sqlite3', '~> 1.4'
 gem 'activerecord-jdbcsqlite3-adapter', '>= 60.0.x', platform: :jruby
 
 gemspec path: '../'

data/gemfiles/rails_72.gemfile

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+eval_gemfile(File.expand_path(File.join('..', 'Gemfile'), __dir__))
+
+gem 'rails', '~> 7.2.0'
+gem 'rails-i18n'
+gem 'inherited_resources', '>= 1.14.0'
+gem 'formtastic', '>= 5.0.0'
+gem 'ransack', '>= 4.1.0'
+gem 'devise', '>= 4.9.3'
+gem 'rack', '>= 2.2'
+gem 'bootsnap'
+gem 'draper'
+gem 'sqlite3', '>= 2.x'
+gem 'activerecord-jdbcsqlite3-adapter', '>= 70.0.x', platform: :jruby
+
+gemspec path: '../'

data/gemfiles/rails_80.gemfile

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+eval_gemfile(File.expand_path(File.join('..', 'Gemfile'), __dir__))
+
+gem 'rails', '~> 8.0.0'
+gem 'rails-i18n'
+gem 'inherited_resources', '>= 1.14.0'
+gem 'formtastic', '>= 5.0.0'
+gem 'ransack', '>= 4.1.0'
+gem 'devise', '>= 4.9.3'
+gem 'rack', '>= 2.2'
+gem 'bootsnap'
+gem 'draper'
+gem 'sqlite3', '>= 2.x'
+gem 'activerecord-jdbcsqlite3-adapter', '>= 70.0.x', platform: :jruby
+
+gemspec path: '../'

data/lib/active_admin/deprecation.rb

@@ -2,8 +2,12 @@ module ActiveAdmin
   module Deprecation
     module_function
 
+    def deprecator # :nodoc:
+      @deprecator ||= ActiveSupport::Deprecation.new
+    end
+
     def warn(message, callstack = caller)
-      ActiveSupport::Deprecation.warn "Active Admin: #{message}", callstack
+      deprecator.warn "Active Admin: #{message}"
     end
 
   end

data/lib/active_admin/resource_controller/streaming.rb

@@ -20,6 +20,7 @@ module ActiveAdmin
       def stream_resource(&block)
         headers['X-Accel-Buffering'] = 'no'
         headers['Cache-Control'] = 'no-cache'
+        headers["Last-Modified"] = Time.current.httpdate
 
         if ActiveAdmin.application.disable_streaming_in.include? Rails.env
           self.response_body = block[String.new]

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '1.7.0'
+  VERSION = '1.7.2'
 end

data/spec/requests/pages/layout_spec.rb

@@ -46,6 +46,7 @@ RSpec.describe 'layout', type: :request do
     it "should display appropriate text" do
       get edit_user_path(user), headers: { 'HTTP_USER_AGENT' => user_agent }
 
+      pending if ActiveAdmin::Dependency.rails >= '7.2' # Rails 7.2+ provides its own browser warning
       expect(page).to have_css 'div.unsupported_browser h1', text: /no longer supports Internet Explorer versions 8/
       expect(page).to have_css 'div.unsupported_browser p', text: /upgrade your browser/
       expect(page).to have_css 'div.unsupported_browser p', text: /turn off "Compatibility View"/

data/spec/support/rails_template.rb

@@ -211,6 +211,8 @@ directory File.expand_path('../templates/admin', __FILE__), 'app/admin'
 # Add predefined policies
 directory File.expand_path('../templates/policies', __FILE__), 'app/policies'
 
+directory File.expand_path("templates/public", __dir__), "public", force: true
+
 if ENV['RAILS_ENV'] != 'test'
   inject_into_file 'config/routes.rb', "\n  root to: redirect('admin')", after: /.*routes.draw do/
 end

data/spec/unit/batch_actions/resource_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe ActiveAdmin::BatchActions::ResourceExtension do
+RSpec.describe 'ActiveAdmin::BatchActions::ResourceExtension' do
 
   let(:resource) do
     namespace = ActiveAdmin::Namespace.new(ActiveAdmin::Application.new, :admin)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-rails
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.2
 platform: ruby
 authors:
 - Piers Chambers, Greg Bell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-30 00:00:00.000000000 Z
+date: 2025-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbo
@@ -84,14 +84,14 @@ dependencies:
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
@@ -474,6 +474,8 @@ files:
 - gemfiles/rails_70.gemfile
 - gemfiles/rails_70_hotwire.gemfile
 - gemfiles/rails_71.gemfile
+- gemfiles/rails_72.gemfile
+- gemfiles/rails_80.gemfile
 - lib/active_admin.rb
 - lib/active_admin/abstract_view_factory.rb
 - lib/active_admin/application.rb
@@ -672,6 +674,7 @@ files:
 - spec/support/templates/policies/store_policy.rb
 - spec/support/templates/policies/user_policy.rb
 - spec/support/templates/post_decorator.rb
+- spec/support/templates/public/favicon.ico
 - spec/unit/abstract_view_factory_spec.rb
 - spec/unit/action_builder_spec.rb
 - spec/unit/active_admin_spec.rb
@@ -789,7 +792,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: A rapid development framework for Ruby on Rails.
@@ -921,6 +924,7 @@ test_files:
 - spec/support/templates/policies/store_policy.rb
 - spec/support/templates/policies/user_policy.rb
 - spec/support/templates/post_decorator.rb
+- spec/support/templates/public/favicon.ico
 - spec/unit/abstract_view_factory_spec.rb
 - spec/unit/action_builder_spec.rb
 - spec/unit/active_admin_spec.rb