cocooned 2.2.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a59c32459a7aee2edc8eb770c60764f1de44003cceed283335b969c81541aa2
-  data.tar.gz: 1be857f2d25e18a1cc91087d5f8cc2c68ce1b3b3abdb468b6dd52751724aa5af
+  metadata.gz: b4f258af059810a6c416beec05676cb361a23922b25706daa7f9b2c8b9f0eacf
+  data.tar.gz: 21c5883b7dfd83c6b1f58b513f81af3bb04cf0704479611d20c29b6d19b4e1b0
 SHA512:
-  metadata.gz: 16645d6101fa1b8010e20ea13282d098a31e129bc23e8ee14fd6510278a6f4dc40421e68e486921143e2305fc183de38315479fda24a40779394fa1797477676
-  data.tar.gz: a4cc58468cde6ec46dd12defb9bbc0845aba6d846058425082c28a3ac81dfc9171e4c0fd9df7e9f942c1915cbc548287aa34fcf5eaaeec1d5859eb0e293c03f0
+  metadata.gz: 1e2613dbe355017c12b3f370c79721246c798661fb8a7ad6e73a243af0cc1fbe0ee12c605dbc78aa50a82e1ca4a83c7df5c5c1cdb3e42d97ac2486c4765bcadb
+  data.tar.gz: 1e2cd045d9f3aa4f9862309626831aa70d4d2c71e495783dbc332a5cb306af567eb9590ea093f9ea5a3fbca63657c87132f4fb5be4f14653292a7482a3b5d023

data/CHANGELOG.md

@@ -6,6 +6,23 @@ 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 (#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)
+
+### Fixed
+
+* Add support for Rails v7.2 and drop support for Rails < 6.1 (#70, thanks @mattmenefee)
+
 ## Version 2.2.1 (2024-05-20)
 
 ## Fixed

data/README.md

@@ -5,7 +5,7 @@
 
 Cocooned makes it easier to handle nested forms in Rails.
 
-Cocooned is form builder-agnostic: it works with standard Rails (>= 6.0, < 7.1) form helpers, [Formtastic](https://github.com/justinfrench/formtastic) or [SimpleForm](https://github.com/plataformatec/simple_form).
+Cocooned is form builder-agnostic: it works with standard Rails (>= 7.0, < 8.0) form helpers, [Formtastic](https://github.com/justinfrench/formtastic) or [SimpleForm](https://github.com/plataformatec/simple_form).
 
 1. [Background](#some-background)
 2. [Installation](#installation)

data/cocooned.gemspec

@@ -38,9 +38,9 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(excluded_dirs) || excluded_files.include?(f)
   end
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 2.7'
 
-  spec.add_dependency 'rails', '>= 6.0', '<= 7.2'
+  spec.add_dependency 'rails', '>= 7.0', '<= 8.0'
 
   spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'rake', '~> 13.0'

data/lib/cocooned/deprecation.rb

@@ -13,7 +13,7 @@ module Cocooned
 
     def initialize(deprecation_horizon = nil, gem_name = 'Cocooned')
       deprecation_horizon ||= format('%<major>d.0', major: Gem::Version.new(Cocooned::VERSION).segments.first + 1)
-      super(deprecation_horizon, gem_name)
+      super
     end
   end
 
@@ -22,15 +22,15 @@ module Cocooned
     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']

data/lib/cocooned/helpers/containers.rb

@@ -64,8 +64,7 @@ module Cocooned
       protected
 
       def cocooned_wrapper_defaults(options, additional_classes, mark)
-        # TODO: Replace with compact_blank when dropping support for Rails 6.0
-        classes = Array.wrap(options.delete(:class)).flat_map { |k| k.to_s.split }.reject(&:blank?)
+        classes = Array.wrap(options.delete(:class)).flat_map { |k| k.to_s.split }.compact_blank
 
         { class: (classes + additional_classes), data: { mark => true } }
       end

data/lib/cocooned/tags/add.rb

@@ -7,7 +7,6 @@ module Cocooned
         protected
 
         def association_options
-          # TODO: Replace with compact_blank when dropping support for Rails 6.0
           {
             association: association,
             template: html_template_name,
@@ -15,7 +14,7 @@ module Cocooned
             association_insertion_node: options.delete(:insertion_node),
             association_insertion_method: options.delete(:insertion_method),
             association_insertion_traversal: options.delete(:insertion_traversal)
-          }.reject { |_, value| value.blank? }
+          }.compact_blank
         end
       end
 
@@ -32,7 +31,7 @@ module Cocooned
       end
 
       def render(as: :link)
-        template.safe_join([super(as: as), html_template])
+        template.safe_join([super, html_template])
       end
 
       protected

data/lib/cocooned/tags/base.rb

@@ -47,14 +47,12 @@ module Cocooned
         @html_options ||= begin
           options[:class] = html_classes
           options[:data] = html_data
-          # TODO: Replace with compact_blank when dropping support for Rails 6.0
-          options.reject { |_, value| value.blank? }
+          options.compact_blank
         end
       end
 
       def html_classes
-        # TODO: Replace with compact_blank when dropping support for Rails 6.0
-        Array.wrap(options.delete(:class)).flat_map { |k| k.to_s.split }.reject(&:blank?)
+        Array.wrap(options.delete(:class)).flat_map { |k| k.to_s.split }.compact_blank
       end
     end
   end

data/lib/cocooned/tags/remove.rb

@@ -6,7 +6,7 @@ module Cocooned
       include Cocooned::TagsHelper::AssociationLabel
 
       def render(as: :link)
-        template.safe_join([hidden_field, super(as: as)])
+        template.safe_join([hidden_field, super])
       end
 
       protected

data/lib/cocooned/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cocooned
-  VERSION = '2.2.1'
+  VERSION = '2.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocooned
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Gaël-Ian Havard
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-20 00:00:00.000000000 Z
+date: 2024-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,20 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="