diff --git a/CHANGELOG.md b/CHANGELOG.md index 826057c..8190fa6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +## Version 2.4.0 (2024-10-01) + ### Fixed -* Drop support for Rails < 7.0 (TODO: add PR number) +* Drop support for Rails < 7.0 (#73, thanks @mattmenefee) + +### Changed + +* Reintroduce Ruby 2.7 to the test matrix (#80) + So tested rubies are the same as supported Rails versions minimum requirements. ## Version 2.3.0 (2024-08-23) diff --git a/Gemfile.lock b/Gemfile.lock index ed2029d..7855097 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - cocooned (2.3.0) + cocooned (2.4.0) rails (>= 7.0, <= 8.0) GEM diff --git a/lib/cocooned/deprecation.rb b/lib/cocooned/deprecation.rb index 46508d9..a7d6c6f 100644 --- a/lib/cocooned/deprecation.rb +++ b/lib/cocooned/deprecation.rb @@ -22,15 +22,15 @@ module Deprecated # :nodoc: module Helpers # :nodoc: module Tags # :nodoc: # @deprecated: Please use {#cocooned_add_item_link} instead - def link_to_add_association(*args, &block) - cocooned_add_item_link(*args, &block) + def link_to_add_association(...) + cocooned_add_item_link(...) end deprecate link_to_add_association: 'Use :cocooned_add_link instead', deprecator: Deprecation['3.0'] # @deprecated: Please use {#cocooned_remove_item_link} instead - def link_to_remove_association(*args, &block) - cocooned_remove_item_link(*args, &block) + def link_to_remove_association(...) + cocooned_remove_item_link(...) end deprecate link_to_remove_association: 'Use :cocooned_remove_item_link instead', deprecator: Deprecation['3.0'] diff --git a/lib/cocooned/version.rb b/lib/cocooned/version.rb index 6e5fb1e..dd1b61d 100644 --- a/lib/cocooned/version.rb +++ b/lib/cocooned/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Cocooned - VERSION = '2.3.0' + VERSION = '2.4.0' end diff --git a/npm/__tests__/fixtures/rails.json b/npm/__tests__/fixtures/rails.json index bb23183..acfafa2 100644 --- a/npm/__tests__/fixtures/rails.json +++ b/npm/__tests__/fixtures/rails.json @@ -1 +1 @@ -{"link":"
\n\n
\n \n \n
\n\n

Items

\n
\n \n
\n Add item\n
\n
\n
\n \n
\n
","button":"
\n\n
\n \n \n
\n\n

Items

\n
\n \n
\n \n
\n
\n
\n \n
\n
"} +{"link":"
\n\n
\n \n \n
\n\n

Items

\n
\n \n
\n Add item\n
\n
\n
\n \n
\n
","button":"
\n\n
\n \n \n
\n\n

Items

\n
\n \n
\n \n
\n
\n
\n \n
\n
"} diff --git a/spec/support/tag.rb b/spec/support/tag.rb index 067d8de..fd05f1a 100644 --- a/spec/support/tag.rb +++ b/spec/support/tag.rb @@ -7,8 +7,8 @@ def html(*args, **options, &block) Nokogiri::HTML5.fragment(tag.render(as: :link)) end - def tag(*args, **options, &block) - html(*args, **options, &block).at('a') + def tag(...) + html(...).at('a') end end @@ -18,8 +18,8 @@ def html(*args, **options, &block) Nokogiri::HTML5.fragment(tag.render(as: :button)) end - def tag(*args, **options, &block) - html(*args, **options, &block).at('button') + def tag(...) + html(...).at('button') end end end