cocooned 1.4.1 → 2.0.0

data/lib/cocooned/tags.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Cocooned
+  module Tags # :nodoc:
+    autoload :Base, 'cocooned/tags/base'
+
+    autoload :Add, 'cocooned/tags/add'
+    autoload :Down, 'cocooned/tags/down'
+    autoload :Remove, 'cocooned/tags/remove'
+    autoload :Up, 'cocooned/tags/up'
+  end
+end

data/lib/cocooned/tags_helper.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+module Cocooned
+  module TagsHelper # :nodoc:
+    module DefaultLabel # :nodoc:
+      protected
+
+      def default_label
+        keys = default_label_i18n_keys.collect(&:to_sym) + [action.to_s.humanize]
+        I18n.t(keys.first, default: keys.drop(1))
+      end
+
+      def default_label_i18n_keys
+        i18n_namespaces.collect { |ns| "#{ns}.defaults.#{action}" }
+      end
+
+      def i18n_namespaces
+        %w[cocooned]
+      end
+
+      def action
+        self.class.name.demodulize.underscore
+      end
+    end
+
+    module AssociationLabel # :nodoc:
+      protected
+
+      def default_label_i18n_keys
+        super + i18n_namespaces.collect { |ns| "#{ns}.#{association}.#{action}" }
+      end
+
+      # Extract association name from form's object_name.
+      # Ex: 'items' from 'list[items_attributes][0]'
+      def association
+        matches = form.object_name.scan(/\[([^\]]+)\]\[[^\]]+\]\z/).flatten
+        return matches.first.delete_suffix('_attributes') if matches.size.positive?
+
+        form.object.class.to_s.tableize
+      end
+    end
+
+    module DataAttributes # :nodoc:
+      protected
+
+      def html_data
+        html_data_normalize(options.delete(:data) || {})
+      end
+
+      # Normalize keys as underscored symbol to ease future lookups (as we
+      # won't need to check for dashed or underscored option names everytime)
+      def html_data_normalize(data)
+        data.transform_keys { |key| key.to_s.underscore.to_sym }
+      end
+    end
+
+    module Renderer # :nodoc:
+      protected
+
+      def renderer
+        Association::Renderer.new(template, form, association, builder.build, renderer_options)
+      end
+
+      def renderer_options
+        extract_options(:locals, :partial, :form_name, :form_options)
+      end
+
+      def builder
+        Association::Builder.new(form.object, association, builder_options)
+      end
+
+      def builder_options
+        extract_options(:wrap_object, :force_non_association_create)
+      end
+
+      def extract_options(*names)
+        names.each_with_object({}) do |name, extracted|
+          extracted[name] = options.delete(name) if options.key?(name)
+        end
+      end
+    end
+  end
+end

data/lib/cocooned/version.rb

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

data/lib/cocooned.rb

@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
+require 'cocooned/deprecation'
 require 'cocooned/railtie'
 
-module Cocooned
+module Cocooned # :nodoc:
+  autoload :Association, 'cocooned/association'
+  autoload :Helpers, 'cocooned/helpers'
+  autoload :Tags, 'cocooned/tags'
+  autoload :TagsHelper, 'cocooned/tags_helper'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocooned
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Gaël-Ian Havard
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,7 +17,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<="
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<="
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -46,132 +46,78 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: jasmine
+  name: formtastic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rake
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Easier nested form. Supports standard Rails forms, Formtastic and SimpleForm.
+        version: '5.1'
+description: " Easier nested form in Rails with capabilities to add, remove, reorder
+  or limit nested items. Works with standard Rails form builder, Formtastic or SimpleForm,
+  and with or without jQuery. "
 email:
 - gael-ian@notus.sh
 - nathan@dixis.com
@@ -179,27 +125,46 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- History.md
+- CHANGELOG.md
 - LICENSE
 - README.md
-- Rakefile
 - app/assets/javascripts/cocoon.js
 - app/assets/javascripts/cocooned.js
 - app/assets/stylesheets/cocoon.css
 - app/assets/stylesheets/cocooned.css
 - cocooned.gemspec
 - lib/cocooned.rb
-- lib/cocooned/association_builder.rb
+- lib/cocooned/association.rb
+- lib/cocooned/association/builder.rb
+- lib/cocooned/association/renderer.rb
+- lib/cocooned/deprecation.rb
 - lib/cocooned/helpers.rb
-- lib/cocooned/helpers/cocoon_compatibility.rb
-- lib/cocooned/helpers/deprecate.rb
+- lib/cocooned/helpers/containers.rb
+- lib/cocooned/helpers/tags.rb
+- lib/cocooned/helpers/tags/add.rb
+- lib/cocooned/helpers/tags/down.rb
+- lib/cocooned/helpers/tags/remove.rb
+- lib/cocooned/helpers/tags/up.rb
 - lib/cocooned/railtie.rb
+- lib/cocooned/tags.rb
+- lib/cocooned/tags/add.rb
+- lib/cocooned/tags/base.rb
+- lib/cocooned/tags/down.rb
+- lib/cocooned/tags/remove.rb
+- lib/cocooned/tags/up.rb
+- lib/cocooned/tags_helper.rb
 - lib/cocooned/version.rb
-homepage: http://github.com/notus-sh/cocooned
+homepage: https://github.com/notus-sh/cocooned
 licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
+  rubygems_mfa_required: 'true'
+  bug_tracker_uri: https://github.com/notus-sh/cocooned/issues
+  changelog_uri: https://github.com/notus-sh/cocooned/blob/main/CHANGELOG.md
+  homepage_uri: https://github.com/notus-sh/cocooned
+  source_code_uri: https://github.com/notus-sh/cocooned
+  funding_uri: https://opencollective.com/notus-sh
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -208,15 +173,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
-summary: Unobtrusive Rails nested forms handling, with or without jQuery.
+summary: Form builder agnostic handling of Rails nested forms
 test_files: []

data/History.md

@@ -1,283 +0,0 @@
-# Change History / Release Notes
-
-## Version 2.0.0 (Not released yet)
-
-* Remove dependency to jQuery
-
-## Version 1.4.0
-
-### Breaking changes
-
-* Drop support for Rails < 5.0 and Ruby < 2.5
-* Pass the original browser event to all event handlers _via_ e.originalEvent. (See [jQuery Event object](https://api.jquery.com/category/events/event-object/)).
-
-### New features
-
-* Add support for @hotwired/turbo
-  
-### Bug fixes and other changes
-
-* Prevent side effects on options passed to view helpers.
-* Use form builder to add the hidden `_destroy` field instead of `hidden_field`.
-* Update deprecation warnings to postpone compatibility drop with the original `cocoon` to 3.0 (instead of 2.0)
-
-## Version 1.3.2
-
-* Compatibility with Mongoid 7+
-
-## Version 1.3.1
-
-* Use UMD pattern to load the Cocooned module
-* Now publish packages on both rubygems.org and npmjs.com
-
-## Version 1.3.0
-
-### Breaking changes
-
-* Drop support for Rubinius, Ruby < 2.2 and Rails < 4.0
-* Drop support for custom wrapper class on item containers (originaly supported _via_ an option on `link_to_remove_association`).
-
-### Deprecated
-
-The gem has been renamed to `cocooned`:
-
-* `link_to_add_association` has been renamed `cocooned_add_item_link`
-* Generated add links class `add_fields` has been renamed `cocooned-add`
-* `link_to_remove_association` has been renamed `cocooned_remove_item_link`
-* Generated remove links class `remove_fields` has been renamed `cocooned-remove`
-* `cocoon:*` and `*.cocoon` Javascript events have been renamed to `cocooned:*` and `*.cocooned`  
-  (ex: `cocooned:before-insert`, `click.cocooned`)
-* The `cocoon` i18n scope have been renamed to `cocooned`
-* The `.nested-fields` default item wrapper class have been renamed to `cocooned-item`
-
-Other deprecations:
-
-* `link_to_add_association`/`cocooned_add_item_link` no longer require a `:render_options` hash to pass locals to the nested partial
-
-### Non-breaking changes
-
-* Refactor cocoon javascript as a self-contained object with same functionalities
-* Automatically remove `required` attributes on destroyed elements (thanks @markkhair)
-* Add extra properties on events (thanks @ayaman)
-* Add a basic package.json to be used with Webpack (thanks @dmfrancisco)
-* Compatibility with jQuery 3 (thanks @mstmfm)
-* Namespace click handlers (thanks @chrise86)
-* Drop support for Ruby 1.9 (thanks @simi)
-* Remove Jeweller (thanks @brixen, @tlynam)
-
-## Version 1.2.11
-
-* Allow events to be cancelled in the 'before' callbacks (thanks @wgordon17)
-
-## Version 1.2.10
-
-* Use lazy-loading in initializer
-
-## Version 1.2.9
-
-* Allow function pass to association-insertion-node (thanks @Liooo)
-
-## Version 1.2.8
-
-* Compatibility with Turbolinks
-
-## Version 1.2.7
-
-* Fix SimpleForm/Formtastic detections (thanks @mfrederickson)
-* Add default captions for add and remove links through I18n (thanks @ViliusLuneckas)
-
-## Version 1.2.6
-
-* added some explicit documentation we use haml. Fixed the formtastic example.
-* "unfreeze" frozen objects. Fixes #193.
-* IE8 jquery fix (thanks @niuage).
-* merged #191 which fixes an issue with a monkeypatched CGI. For more info, see
-  ticket #191. Thanks gsmendoza.
-
-## Version 1.2.5
-
-* fix gem dependencies: we added gems to allow building for rubinius, but those are only
-  needed when developing
-
-## Version 1.2.4
-
-* the wrapper class is now configurable. Before it was assumed to be `nested-fields`.
-  Now it is configurable by handing. See #180. Thanks Yoav Matchulsky.
-* fix build on travis-ci for rubinius (thanks brixen).
-
-## Version 1.2.3
-
-* add license info
-
-## Version 1.2.2
-
-* added option to add multiple items on one click. See #175.
-* cleaned up javascript code. See #171.
-
-
-## Version 1.2.1
-
-* added a `:form_name` parameter (fixes #153) which allows to use a self-chosen
-  parameter in the nested views. Up until now `f` was assumed (and enforced).
-* improvement of creation of the objects on the association (thanks to Dirk von Grünigen). This
-  alleviates the need for the `:force_non_association_create` option in most cases.
-  That option is for now still kept.
-* after validation errors, already deleted (but not saved) nested elements, will remain deleted
-  (e.g. the state is remembered, and they remain hidden, and will be correctly deleted on next
-  succesfull save) (fixes #136).
-
-## Version 1.2.0
-
-* support for rails 4.0
-
-## Version 1.1.2
-
-* pull #118 (thanks @ahmozkya): remove the deprecated `.live` function, and use `.on` instead.
-  Note: at least jquery 1.7 is required now!
-
-## Version 1.1.1
-
-* added the to be added/deleted element to the event, this allows to add animations/actions onto them
-* added extra option :wrap_object, allowing to use Decorators instead of the association object
-* added an option :force_non_association_create, that will allow to use `link_to_add_association` inside the fields-partial
-
-## Version 1.1.0
-
-* BREAKING: the triggered javascript events `removal-callback`, `after-removal-callback`, and `insertion-callback` are renamed to the more correct and symmetric
-  `cocoon:after-insert, cocoon:before-insert, cocoon:after-remove, cocoon:before-remove`. Also the events are namespaced to prevent collisions with other libraries.
-* allow created objects to be decorated with a callable. This is especially useful if you are using Draper or some decorator instead of the plain model in your views.
-* it is now possible to specify a relative node, and use standard jquery traversal methods on insertion
-* trigger insertion event on correct `insertionNode`
-* thanks to #90 cocoon now supports non-AR associations and array-fields, you just have to supply your own `build_<association>` methods
-
-I would really really like to thank all contributors, check them out https://github.com/nathanvda/cocoon/graphs/contributors
-They made cocoon way more awesome than I could have done in my lonesome.
-
-## Version 1.0.22
-
-* Fix that it still works for mongoid
-
-## Version 1.0.21
-
-* Use association build methods instead of assoc.klass.new. This avoids mass-assignment errors and other misbehaviors around attribute accessibility.
-
-
-## Version 1.0.20
-
-* improved handing of the `:partial`: remove the extra options-hash, and just make it use the single hash, so now we can just write
-
-     = link_to_add_association 'add something', f, :tasks, :partial => 'shared/task_fields'
-     = link_to_add_association 'add something', f, :tasks, :class => 'your-special-class', :partial => 'shared/task_fields'
-
-
-## Version 1.0.19
-
-* pull #53 (@CuriousCurmudgeon): fixed some bugs introduced in previous version (ooooops! Thanks!!!)
-
-## Version 1.0.18
-
-* pull in #51 (@erwin): adding an `after-removal-callback` in javascript, very useful if you want to recalculate e.g. total-items or indexes
-* pull in #42 (@zacstewart): allow to hand extra `:locals` to the partial
-* updated documentation
-
-## Version 1.0.17
-
-* fix: make sure that cocoon still works for rails 3.0, where the `conditions` is not available yet
-
-## Version 1.0.16
-
-* merged pull request #33 (@fl00r): added the a custom partial option! genius :)
-  Also the creation of the nested objects takes any available conditions into account.
-  Now you can write
-
-     = link_to_add_association 'add something', f, :tasks, {}, :partial => 'shared/task_fields'
-
-## Version 1.0.15
-
-* added `data-association-insertion-method` that gives more control over where to insert the new nested fields.
-  It takes a jquery method as parameter that inserts the new data. `before`, `after`, `append`, `prepend`, etc. Default: `before`.
-* `data-association-insertion-position` is still available and acts as an alias. Probably this will be deprecated in the future.
-
-
-## Version 1.0.14
-
-* When playing with `simple_form` and `twitter-bootstrap`, I noticed it is crucial that I call the correct nested-fields function.
-  That is: `fields_for` for standard forms, `semantic_fields_for` in formtastic and `simple_fields_for` for simple_form.
-  Secondly, this was not enough, I needed to be able to hand down options to that method. So in the `link_to_add_association` method you
-  can now an extra option `:render_options` and that hash will be handed to the association-builder.
-
-  This allows the nested fields to be built correctly with `simple_form` for `twitter-bootstrap`.
-
-## Version 1.0.13
-
-* A while ago we added the option to add a javascript callback on inserting a new associated object, I now made sure we can add a callback on insertion
-  and on removal of a new item. One example where this was useful for me is visible in the demo project `cocoon_simple_form_demo` where I implemented a
-  `belongs_to` relation, and either select from a list, or add a new element.
-  So: the callback-mechanism has changed, and now the callback is bound to the parent container, instead of the link itself. This is because we can also
-  bind the removal callback there (as the removal link is inserted in the html dynamically).
-
-  For more info, see the `README`.
-
-## Version 1.0.12
-
-* using "this" in `association-insertion-node` is now possible
-
-If you are using rails < 3.1, you should run
-
-    rails g cocoon:install
-
-to install the new `cocoon.js` to your `public/javascripts` folder.
-
-
-## Version 1.0.11
-
-
-## Version 1.0.10
-
-* Fuck! Built the gem with 1.9.2 again. Built the gem again with 1.8.7.
-
-## Version 1.0.9
-
-* is now rails 3.1 compatible. If you are not using Rails 3.1 yet, this should have no effect.
-  For rails 3.1 the cocoon.js no longer needs to be installed using the `rails g cocoon:install`. It is
-  automatically used from the gem.
-
-## Version 1.0.8
-
-* Loosened the gem dependencies.
-
-## Version 1.0.7 (20/06/2011)
-
-Apparently, the gem 1.0.6 which was generated with ruby 1.9.2 gave the following error upon install:
-
-      uninitialized constant Psych::Syck (NameError)
-
-This is related to this bug: http://rubyforge.org/tracker/?group_id=126&atid=575&func=detail&aid=29163
-
-This should be fixed in the next release of rubygems, the fix should be to build the gem with ruby 1.8.7.
-Let's hope this works.
-
-## Version 1.0.6 (19/06/2011)
-
-* The javascript has been improved to consistently use `e.preventDefault` instead of returning false.
-
-Run
-
-    rails g cocoon:install
-
-to copy the new `cocoon.js` to your `public/javascripts` folder.
-
-
-## Version 1.0.5 (17/06/2011)
-
-* This release make sure that the `link_to_add_association` generates a correctly clickable
-  link in the newer rails 3 versions as well. In rails 3.0.8. the html was double escaped.
-
-If you are upgrading from 1.0.4, you just have to update the gem. No other actions needed. If you are updating
-from earlier versions, it is safer to do
-
-    rails g cocoon:install
-
-This will copy the new `cocoon.js` files to your `public/javascripts` folder.
-
-