diff --git a/.rubocop.yml b/.rubocop.yml index 9e5fca4..d5f2aa3 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -559,9 +559,6 @@ RSpec/SpecFilePathFormat: RSpec/SpecFilePathSuffix: Enabled: true -RSpec/StringAsInstanceDoubleConstant: - Enabled: true - RSpec/StubbedMock: Enabled: false diff --git a/CHANGELOG.md b/CHANGELOG.md index eb824bf..15447a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## unreleased [☰](https://github.com/activeadmin/arbre/compare/v2.1.0...master) +## 2.2.0 [☰](https://github.com/activeadmin/arbre/compare/v2.1.0...v2.2.0) * Add some missing HTML5 elements [#655][] by [@tagliala][] diff --git a/Gemfile.lock b/Gemfile.lock index 4a629aa..d71b228 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - arbre (2.1.0) + arbre (2.2.0) activesupport (>= 7.0) GEM @@ -99,7 +99,7 @@ GEM activesupport (>= 3.0.0) railties (>= 3.0.0) thor (>= 0.14.6) - concurrent-ruby (1.3.4) + concurrent-ruby (1.3.5) connection_pool (2.5.0) crass (1.0.6) date (3.4.1) @@ -109,14 +109,15 @@ GEM erubi (1.13.1) globalid (1.2.1) activesupport (>= 6.1) - i18n (1.14.6) + i18n (1.14.7) concurrent-ruby (~> 1.0) io-console (0.8.0) - irb (1.14.3) + irb (1.15.1) + pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.9.1) - language_server-protocol (3.17.0.3) + language_server-protocol (3.17.0.4) logger (1.6.5) loofah (2.24.0) crass (~> 1.0.2) @@ -141,30 +142,33 @@ GEM timeout net-smtp (0.5.0) nio4r (2.7.4) - nokogiri (1.18.1) + nokogiri (1.18.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.18.1-aarch64-linux-gnu) + nokogiri (1.18.2-aarch64-linux-gnu) racc (~> 1.4) - nokogiri (1.18.1-arm64-darwin) + nokogiri (1.18.2-arm64-darwin) racc (~> 1.4) - nokogiri (1.18.1-x86_64-darwin) + nokogiri (1.18.2-x86_64-darwin) racc (~> 1.4) - nokogiri (1.18.1-x86_64-linux-gnu) + nokogiri (1.18.2-x86_64-linux-gnu) racc (~> 1.4) parallel (1.26.3) - parser (3.3.6.0) + parser (3.3.7.0) ast (~> 2.4.1) racc + pp (0.6.2) + prettyprint + prettyprint (0.2.0) pry (0.15.2) coderay (~> 1.1) method_source (~> 1.0) - psych (5.2.2) + psych (5.2.3) date stringio public_suffix (6.0.1) racc (1.8.1) - rack (3.1.8) + rack (3.1.9) rack-session (2.1.0) base64 (>= 0.1.0) rack (>= 3.0.0) @@ -203,7 +207,7 @@ GEM zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.2.1) - rdoc (6.10.0) + rdoc (6.11.0) psych (>= 4.0.0) regexp_parser (2.10.0) reline (0.6.0) @@ -230,17 +234,17 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.2) - rubocop (1.70.0) + rubocop (1.71.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.36.2, < 2.0) + rubocop-ast (>= 1.38.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.37.0) + rubocop-ast (1.38.0) parser (>= 3.3.1.0) rubocop-capybara (2.21.0) rubocop (~> 1.41) @@ -249,7 +253,7 @@ GEM rubocop-performance (1.23.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rspec (3.3.0) + rubocop-rspec (3.4.0) rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.4.1) @@ -267,7 +271,7 @@ GEM timeout (0.4.3) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (3.1.3) + unicode-display_width (3.1.4) unicode-emoji (~> 4.0, >= 4.0.4) unicode-emoji (4.0.4) uri (1.0.2) @@ -305,4 +309,4 @@ DEPENDENCIES simplecov-cobertura BUNDLED WITH - 2.6.2 + 2.6.3 diff --git a/gemfiles/rails_70/Gemfile b/gemfiles/rails_70/Gemfile index aa95040..216df43 100644 --- a/gemfiles/rails_70/Gemfile +++ b/gemfiles/rails_70/Gemfile @@ -16,6 +16,8 @@ group :rails do gem 'combustion' gem 'capybara' + gem "concurrent-ruby", "1.3.4" # Ref: rails/rails#54260 + # FIXME: relax this dependency when Ruby 3.1 support will be dropped gem "zeitwerk", "~> 2.6.18" end diff --git a/gemfiles/rails_70/Gemfile.lock b/gemfiles/rails_70/Gemfile.lock index 49a4bc8..ffd4ac2 100644 --- a/gemfiles/rails_70/Gemfile.lock +++ b/gemfiles/rails_70/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../.. specs: - arbre (2.1.0) + arbre (2.2.0) activesupport (>= 7.0) GEM @@ -98,7 +98,7 @@ GEM erubi (1.13.1) globalid (1.2.1) activesupport (>= 6.1) - i18n (1.14.6) + i18n (1.14.7) concurrent-ruby (~> 1.0) loofah (2.24.0) crass (~> 1.0.2) @@ -122,17 +122,18 @@ GEM net-protocol (0.2.2) timeout net-smtp (0.5.0) + net-protocol nio4r (2.7.4) - nokogiri (1.18.1) + nokogiri (1.18.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.18.1-aarch64-linux-gnu) + nokogiri (1.18.2-aarch64-linux-gnu) racc (~> 1.4) - nokogiri (1.18.1-arm64-darwin) + nokogiri (1.18.2-arm64-darwin) racc (~> 1.4) - nokogiri (1.18.1-x86_64-darwin) + nokogiri (1.18.2-x86_64-darwin) racc (~> 1.4) - nokogiri (1.18.1-x86_64-linux-gnu) + nokogiri (1.18.2-x86_64-linux-gnu) racc (~> 1.4) pry (0.15.2) coderay (~> 1.1) @@ -226,6 +227,7 @@ DEPENDENCIES arbre! capybara combustion + concurrent-ruby (= 1.3.4) pry rails (~> 7.0.0) rake @@ -236,4 +238,4 @@ DEPENDENCIES zeitwerk (~> 2.6.18) BUNDLED WITH - 2.6.2 + 2.6.3 diff --git a/gemfiles/rails_71/Gemfile.lock b/gemfiles/rails_71/Gemfile.lock index 7cb8c80..b6e99d3 100644 --- a/gemfiles/rails_71/Gemfile.lock +++ b/gemfiles/rails_71/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../.. specs: - arbre (2.1.0) + arbre (2.2.0) activesupport (>= 7.0) GEM @@ -104,7 +104,7 @@ GEM activesupport (>= 3.0.0) railties (>= 3.0.0) thor (>= 0.14.6) - concurrent-ruby (1.3.4) + concurrent-ruby (1.3.5) connection_pool (2.5.0) crass (1.0.6) date (3.4.1) @@ -114,10 +114,11 @@ GEM erubi (1.13.1) globalid (1.2.1) activesupport (>= 6.1) - i18n (1.14.6) + i18n (1.14.7) concurrent-ruby (~> 1.0) io-console (0.8.0) - irb (1.14.3) + irb (1.15.1) + pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) logger (1.6.5) @@ -145,26 +146,29 @@ GEM timeout net-smtp (0.5.0) nio4r (2.7.4) - nokogiri (1.18.1) + nokogiri (1.18.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.18.1-aarch64-linux-gnu) + nokogiri (1.18.2-aarch64-linux-gnu) racc (~> 1.4) - nokogiri (1.18.1-arm64-darwin) + nokogiri (1.18.2-arm64-darwin) racc (~> 1.4) - nokogiri (1.18.1-x86_64-darwin) + nokogiri (1.18.2-x86_64-darwin) racc (~> 1.4) - nokogiri (1.18.1-x86_64-linux-gnu) + nokogiri (1.18.2-x86_64-linux-gnu) racc (~> 1.4) + pp (0.6.2) + prettyprint + prettyprint (0.2.0) pry (0.15.2) coderay (~> 1.1) method_source (~> 1.0) - psych (5.2.2) + psych (5.2.3) date stringio public_suffix (6.0.1) racc (1.8.1) - rack (3.1.8) + rack (3.1.9) rack-session (2.1.0) base64 (>= 0.1.0) rack (>= 3.0.0) @@ -202,7 +206,7 @@ GEM thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) rake (13.2.1) - rdoc (6.10.0) + rdoc (6.11.0) psych (>= 4.0.0) regexp_parser (2.10.0) reline (0.6.0) @@ -273,4 +277,4 @@ DEPENDENCIES zeitwerk (~> 2.6.18) BUNDLED WITH - 2.6.2 + 2.6.3 diff --git a/gemfiles/rails_72/Gemfile.lock b/gemfiles/rails_72/Gemfile.lock index 17cdd5b..58fabab 100644 --- a/gemfiles/rails_72/Gemfile.lock +++ b/gemfiles/rails_72/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../.. specs: - arbre (2.1.0) + arbre (2.2.0) activesupport (>= 7.0) GEM @@ -98,7 +98,7 @@ GEM activesupport (>= 3.0.0) railties (>= 3.0.0) thor (>= 0.14.6) - concurrent-ruby (1.3.4) + concurrent-ruby (1.3.5) connection_pool (2.5.0) crass (1.0.6) date (3.4.1) @@ -108,10 +108,11 @@ GEM erubi (1.13.1) globalid (1.2.1) activesupport (>= 6.1) - i18n (1.14.6) + i18n (1.14.7) concurrent-ruby (~> 1.0) io-console (0.8.0) - irb (1.14.3) + irb (1.15.1) + pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) logger (1.6.5) @@ -138,26 +139,29 @@ GEM timeout net-smtp (0.5.0) nio4r (2.7.4) - nokogiri (1.18.1) + nokogiri (1.18.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.18.1-aarch64-linux-gnu) + nokogiri (1.18.2-aarch64-linux-gnu) racc (~> 1.4) - nokogiri (1.18.1-arm64-darwin) + nokogiri (1.18.2-arm64-darwin) racc (~> 1.4) - nokogiri (1.18.1-x86_64-darwin) + nokogiri (1.18.2-x86_64-darwin) racc (~> 1.4) - nokogiri (1.18.1-x86_64-linux-gnu) + nokogiri (1.18.2-x86_64-linux-gnu) racc (~> 1.4) + pp (0.6.2) + prettyprint + prettyprint (0.2.0) pry (0.15.2) coderay (~> 1.1) method_source (~> 1.0) - psych (5.2.2) + psych (5.2.3) date stringio public_suffix (6.0.1) racc (1.8.1) - rack (3.1.8) + rack (3.1.9) rack-session (2.1.0) base64 (>= 0.1.0) rack (>= 3.0.0) @@ -195,7 +199,7 @@ GEM thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) rake (13.2.1) - rdoc (6.10.0) + rdoc (6.11.0) psych (>= 4.0.0) regexp_parser (2.10.0) reline (0.6.0) @@ -267,4 +271,4 @@ DEPENDENCIES zeitwerk (~> 2.6.18) BUNDLED WITH - 2.6.2 + 2.6.3 diff --git a/lib/arbre/version.rb b/lib/arbre/version.rb index 925febf..a309b85 100644 --- a/lib/arbre/version.rb +++ b/lib/arbre/version.rb @@ -1,4 +1,4 @@ # frozen_string_literal: true module Arbre - VERSION = "2.1.0" + VERSION = "2.2.0" end