cocooned 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec1afe38e7db15aee028d1890edcb0cb661bf62c696b2a79aa5102c573a8a1fe
-  data.tar.gz: df9f13885a634db0e7b3f1f1348573b0aa6bfa1f73a488de918dbaf3cf07dc15
+  metadata.gz: '09dea153d60f4775a1971687cd1559ee09ef878f97ce865088ab76189db919e7'
+  data.tar.gz: dea0da54a7111ac9723faec4ea74f3f058e3db2884aecd14233b0e13c74881e5
 SHA512:
-  metadata.gz: 8562d9fe1b0a704991ad1ba284e3e219a62e9da606b8791aa5ffbca23647f80abed6d3826f730533d7bb2dbb12c3b3c9ecfd2d670d17f6929ad0c72ca027f37e
-  data.tar.gz: 4e3157dbe296abd6b18162e34e7f98d8cba90ad14c7f449cb9cc56ad66bca9a8cee31c6a04d3ed8cbbf35832e420c2b05adccb1e9ea0ad1f5c82ac058c5bd2d7
+  metadata.gz: aa27825fcb619f22b8bf86472a367c2ad131b8b84fffbabc2a80a7b90d50aa42a0a5dbaf8c873c751e7f043a527a044d4bce84706f3c1808297c26bcf3d658f5
+  data.tar.gz: b1338f4ff4433fd28cd967475d49dddc638df8b2e579d75675316ac8cacf8e3a318e4651c118060f576e25b46a11214b8b97b6109c2db8758036050311c153fc

data/CHANGELOG.md

@@ -6,6 +6,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## 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
+
+* Add UMD build of Coconned missing in 2.2.0 
+
 ## Version 2.2.0 (2024-05-20)
 
 ## Added

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 (>= 6.1, < 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/app/assets/javascripts/cocooned.js

@@ -248,63 +248,10 @@
     }
   }
 
-  /**
-   * Borrowed from Lodash
-   * See https://lodash.com/docs/#escapeRegExp
-   */
-  const reRegExpChar = /[\\^$.*+?()[\]{}|]/g;
-  const reHasRegExpChar = RegExp(reRegExpChar.source);
-
-  class Replacement {
-    attribute
-
-    constructor (attribute, name, startDelimiter, endDelimiter = null) {
-      this.attribute = attribute;
-
-      this.#name = name;
-      this.#startDelimiter = startDelimiter;
-      this.#endDelimiter = endDelimiter || startDelimiter;
-    }
-
-    apply (node, id) {
-      const value = node.getAttribute(this.attribute);
-      if (!this.#regexp.test(value)) {
-        return
-      }
-
-      node.setAttribute(this.attribute, value.replace(this.#regexp, this.#replacement(id)));
-    }
-
-    /* Protected and private attributes and methods */
-    #name
-    #startDelimiter
-    #endDelimiter
-
-    #replacement (id) {
-      return `${this.#startDelimiter}${id}${this.#endDelimiter}$1`
-    }
-
-    get #regexp () {
-      const escaped = this.#escape(`${this.#startDelimiter}${this.#name}${this.#endDelimiter}`);
-      return new RegExp(`${escaped}(.*?)`, 'g')
-    }
-
-    #escape (string) {
-      return (string && reHasRegExpChar.test(string))
-        ? string.replace(reRegExpChar, '\\$&')
-        : (string || '')
-    }
-  }
-
   class Builder {
-    constructor (documentFragment, association) {
+    constructor (documentFragment, replacements) {
       this.#documentFragment = documentFragment;
-      this.#association = association;
-      this.#replacements = [
-        new Replacement('for', association, '_'),
-        new Replacement('id', association, '_'),
-        new Replacement('name', association, '[', ']')
-      ];
+      this.#replacements = replacements;
     }
 
     build (id) {
@@ -314,13 +261,14 @@
     }
 
     /* Protected and private attributes and methods */
-    #association
     #documentFragment
     #replacements
 
     #applyReplacements (node, id) {
       this.#replacements.forEach(replacement => {
-        node.querySelectorAll(`*[${replacement.attribute}]`).forEach(node => replacement.apply(node, id));
+        node.querySelectorAll(`${replacement.tag}[${replacement.attribute}]`).forEach(node => {
+          return replacement.apply(node, id)
+        });
       });
 
       node.querySelectorAll('template').forEach(template => {
@@ -478,7 +426,10 @@
         return null
       }
 
-      return new Builder(template.content, `new_${this.#dataset.association}`)
+      return new Builder(
+        template.content,
+        this.#cocooned.replacementsFor(`new_${this.#dataset.association}`)
+      )
     }
 
     _extractCount () {
@@ -675,6 +626,56 @@
     }
   }
 
+  /**
+   * Borrowed from Lodash
+   * See https://lodash.com/docs/#escapeRegExp
+   */
+  const reRegExpChar = /[\\^$.*+?()[\]{}|]/g;
+  const reHasRegExpChar = RegExp(reRegExpChar.source);
+
+  class Replacement {
+    attribute
+    tag
+
+    constructor ({ tag = '*', attribute, association, delimiters }) {
+      this.attribute = attribute;
+      this.tag = tag;
+
+      this.#association = association;
+      this.#startDelimiter = delimiters[0];
+      this.#endDelimiter = delimiters[delimiters.length - 1];
+    }
+
+    apply (node, id) {
+      const value = node.getAttribute(this.attribute);
+      if (!this.#regexp.test(value)) {
+        return
+      }
+
+      node.setAttribute(this.attribute, value.replace(this.#regexp, this.#replacement(id)));
+    }
+
+    /* Protected and private attributes and methods */
+    #association
+    #startDelimiter
+    #endDelimiter
+
+    #replacement (id) {
+      return `${this.#startDelimiter}${id}${this.#endDelimiter}$1`
+    }
+
+    get #regexp () {
+      const escaped = this.#escape(`${this.#startDelimiter}${this.#association}${this.#endDelimiter}`);
+      return new RegExp(`${escaped}(.*?)`, 'g')
+    }
+
+    #escape (string) {
+      return (string && reHasRegExpChar.test(string))
+        ? string.replace(reRegExpChar, '\\$&')
+        : (string || '')
+    }
+  }
+
   function clickHandler$1 (callback) {
     return e => {
       e.preventDefault();
@@ -708,6 +709,18 @@
   }
 
   const coreMixin = (Base) => class extends Base {
+    static registerReplacement ({ tag = '*', attribute, delimiters }) {
+      this.__replacements.push({ tag, attribute, delimiters });
+    }
+
+    static get replacements () {
+      return this.__replacements
+    }
+
+    static replacementsFor (association) {
+      return this.replacements.map(r => new Replacement({ association, ...r }))
+    }
+
     static get selectors () {
       return {
         ...super.selectors,
@@ -736,6 +749,21 @@
         })
       );
     }
+
+    replacementsFor (association) {
+      return this.constructor.replacementsFor(association)
+    }
+
+    /* Protected and private attributes and methods */
+    static __replacements = [
+      // Default attributes
+      { tag: 'label', attribute: 'for', delimiters: ['_'] },
+      { tag: '*', attribute: 'id', delimiters: ['_'] },
+      { tag: '*', attribute: 'name', delimiters: ['[', ']'] },
+
+      // Compatibility with Trix. See #65 on Github.
+      { tag: 'trix-editor', attribute: 'input', delimiters: ['_'] }
+    ]
   };
 
   let Cocooned$1 = class Cocooned extends coreMixin(Base) {

data/cocooned.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   end
   spec.required_ruby_version = '>= 2.6'
 
-  spec.add_dependency 'rails', '>= 6.0', '<= 7.2'
+  spec.add_dependency 'rails', '>= 6.1', '<= 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
 

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.0'
+  VERSION = '2.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocooned
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.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-08-23 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: '6.1'
     - - "<="
       - !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: '6.1'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement