cocoon 1.2.10 → 1.2.11

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MmRkODE5NTEyY2EyYjMyNjYyODExYjcwY2VlZmVhNTVmMzAxNDdhNA==
-  data.tar.gz: !binary |-
-    NzBmOTNkOTIzZjY0YmMxY2I3NjM0OTNiNTU1MDUzMzhjYzgxNDcwNA==
+SHA1:
+  metadata.gz: 1b41a3b05044110e35f9ac65dca30cdcb96455a4
+  data.tar.gz: b98f78e8fb764b7de9d6aedfd86a1e50f6359390
 SHA512:
-  metadata.gz: !binary |-
-    MzZhOGI4MWM3NWYzOWUyYmI4NWMwMjkxMjQyMjY2NDZmZTY5YjA2Nzc3ZjUz
-    MDM5NWI2NDBlNmEzZTMzNWI2N2E5NWUzM2YxZWVmYzgyZTIyZDJiMmIxYzU2
-    ZjgxZjIzODQ4ZWYxNDVhZGYyNjc0NGU5NzQxMGVhNDA2NzhhNmU=
-  data.tar.gz: !binary |-
-    YjZlYTBmYzc0NzljYWM1ODU5M2NjZWEyNzYyNWUxZmUwYzkyZWIzMWE1ZDg1
-    NTA4YTViYWNkYTYyMmUzY2MyZTljNWMzODhlM2E5MzgwMjA1NTBmMDI1NTY5
-    M2IyMzBhZGY2ODlhMzc1MzhkNjMyNmU3ZTE2MzljODQ5OTRmNDI=
+  metadata.gz: '08fcb909826ebaa9728e62e0af6ba8392e655d5cedc03685aeccd90ee60e9247a5b4314b495e3024d82cc8de832569a03c224d6d125923ec4f392bb5870beafb'
+  data.tar.gz: 1790076ada7fee16d634da3d17fc37cdb9cf5178285fc422285b57fa3ed831811e301c4fbf2ae5731f7ce5e49bb2d83207821105fccf37726310f0a336f8e252

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 2.0.0
   - 2.1.5
   - 2.2.6
   - 2.3.2

data/Gemfile

@@ -3,9 +3,9 @@ source "http://rubygems.org"
 
 group :development, :test do
   gem "rails", ">=4.0.0"
-  gem "sqlite3"
+  gem "sqlite3", '1.3.13'
   gem "json_pure"
-  gem "jeweler", "~> 1.8"
+  gem "jeweler", "~> 2.3"
   gem "rspec-rails", "~> 3.0.0"
   gem "rspec",       "~> 3.0.0"
   gem "actionpack",  ">=4.0.0"
@@ -19,7 +19,7 @@ group :development, :test do
   platforms :rbx do
     gem 'rubysl'
     gem 'rubysl-test-unit'
-    gem 'psych'
+    gem 'psych', '~> 2.2'
     gem 'racc'
     gem 'rubinius-developer_tools'
   end

data/README.markdown

@@ -8,13 +8,13 @@ Nested forms are forms that handle nested models and attributes in one form;
 e.g. a project with its tasks or an invoice with its line items.
 
 Cocoon is form builder-agnostic, so it works with standard Rails, [Formtastic](https://github.com/justinfrench/formtastic), or [SimpleForm](https://github.com/plataformatec/simple_form).
-It is compatible with rails 3 and rails 4.
+It is compatible with rails 3, 4 and 5.
 
 This project is not related to [Apache Cocoon](http://cocoon.apache.org/).
 
 ## Prerequisites
 
-This gem depends on jQuery, so it's most useful in a Rails 3 project where you are already using jQuery.
+This gem depends on jQuery, so it's most useful in a Rails project where you are already using jQuery.
 Furthermore, I would advise you to use either [Formtastic](https://github.com/justinfrench/formtastic) or [SimpleForm](https://github.com/plataformatec/simple_form).
 
 ## Installation
@@ -318,8 +318,9 @@ a new nested object.
 This used to have a side-effect: for each call of `link_to_add_association` a new element was added to the association.
 This is no longer the case.
 
-For backward compatibility we keep this option for now. Or if for some specific reason you would
-really need an object to be _not_ created on the association.
+For backward compatibility we keep this option for now. Or if for some specific reason you would really need an object
+to be _not_ created on the association, for example if you did not want `after_add` callback to be triggered on
+the association.
 
 Example use:
 
@@ -358,9 +359,9 @@ Example:
 
 On insertion or removal the following events are triggered:
 
-* `cocoon:before-insert`: called before inserting a new nested child
+* `cocoon:before-insert`: called before inserting a new nested child, can be [canceled](#canceling-a-callback)
 * `cocoon:after-insert`: called after inserting
-* `cocoon:before-remove`: called before removing the nested child
+* `cocoon:before-remove`: called before removing the nested child, can be [canceled](#canceling-a-callback)
 * `cocoon:after-remove`: called after removal
 
 To listen to the events in your JavaScript:
@@ -435,6 +436,21 @@ $(this).data('remove-timeout', 1000);
 
 You could also immediately add this to your view, on the `.nested-fields` container (or the `wrapper_class` element you are using).
 
+#### Canceling a Callback
+
+You can cancel an action from occurring, either an insertion or removal, within the `before-<action>` callback by calling `event.preventDefault()` anywhere within the callback.
+
+For example:
+
+```javascript
+  $('#container').on('cocoon:before-insert', function(event, insertedItem) {
+    var confirmation = confirm("Are you sure?");
+    if( confirmation === false ){
+      event.preventDefault();
+    }
+  });
+```
+
 ### Control the Insertion Behaviour
 
 The default insertion location is at the back of the current container. But we have added two `data-` attributes that are read to determine the insertion-node and -method.

data/VERSION

@@ -1 +1 @@
-1.2.10
+1.2.11

data/app/assets/javascripts/cocoon.js

@@ -84,14 +84,17 @@
     $.each(new_contents, function(i, node) {
       var contentNode = $(node);
 
-      insertionNodeElem.trigger('cocoon:before-insert', [contentNode]);
+      var before_insert = jQuery.Event('cocoon:before-insert');
+      insertionNodeElem.trigger(before_insert, [contentNode]);
 
-      // allow any of the jquery dom manipulation methods (after, before, append, prepend, etc)
-      // to be called on the node.  allows the insertion node to be the parent of the inserted
-      // code and doesn't force it to be a sibling like after/before does. default: 'before'
-      var addedContent = insertionNodeElem[insertionMethod](contentNode);
+      if (!before_insert.isDefaultPrevented()) {
+        // allow any of the jquery dom manipulation methods (after, before, append, prepend, etc)
+        // to be called on the node.  allows the insertion node to be the parent of the inserted
+        // code and doesn't force it to be a sibling like after/before does. default: 'before'
+        var addedContent = insertionNodeElem[insertionMethod](contentNode);
 
-      insertionNodeElem.trigger('cocoon:after-insert', [contentNode]);
+        insertionNodeElem.trigger('cocoon:after-insert', [contentNode]);
+      }
     });
   });
 
@@ -103,19 +106,22 @@
 
     e.preventDefault();
 
-    trigger_node.trigger('cocoon:before-remove', [node_to_delete]);
-
-    var timeout = trigger_node.data('remove-timeout') || 0;
-
-    setTimeout(function() {
-      if ($this.hasClass('dynamic')) {
-          node_to_delete.remove();
-      } else {
-          $this.prev("input[type=hidden]").val("1");
-          node_to_delete.hide();
-      }
-      trigger_node.trigger('cocoon:after-remove', [node_to_delete]);
-    }, timeout);
+    var before_remove = jQuery.Event('cocoon:before-remove');
+    trigger_node.trigger(before_remove, [node_to_delete]);
+
+    if (!before_remove.isDefaultPrevented()) {
+      var timeout = trigger_node.data('remove-timeout') || 0;
+
+      setTimeout(function() {
+        if ($this.hasClass('dynamic')) {
+            node_to_delete.remove();
+        } else {
+            $this.prev("input[type=hidden]").val("1");
+            node_to_delete.hide();
+        }
+        trigger_node.trigger('cocoon:after-remove', [node_to_delete]);
+      }, timeout);
+    }
   });
 
 

data/cocoon.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: cocoon 1.2.10 ruby lib
+# stub: cocoon 1.2.11 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "cocoon".freeze
-  s.version = "1.2.10"
+  s.version = "1.2.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Nathan Van der Auwera".freeze]
-  s.date = "2017-05-11"
+  s.date = "2017-10-26"
   s.description = "Unobtrusive nested forms handling, using jQuery. Use this and discover cocoon-heaven.".freeze
   s.email = "nathan@dixis.com".freeze
   s.extra_rdoc_files = [
@@ -82,7 +82,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/nathanvda/cocoon".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.6.10".freeze
+  s.rubygems_version = "2.6.14".freeze
   s.summary = "gem that enables easier nested forms with standard forms, formtastic and simple-form".freeze
 
   if s.respond_to? :specification_version then
@@ -90,9 +90,9 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rails>.freeze, [">= 4.0.0"])
-      s.add_development_dependency(%q<sqlite3>.freeze, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>.freeze, ["= 1.3.13"])
       s.add_development_dependency(%q<json_pure>.freeze, [">= 0"])
-      s.add_development_dependency(%q<jeweler>.freeze, ["~> 1.8"])
+      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3"])
       s.add_development_dependency(%q<rspec-rails>.freeze, ["~> 3.0.0"])
       s.add_development_dependency(%q<rspec>.freeze, ["~> 3.0.0"])
       s.add_development_dependency(%q<actionpack>.freeze, [">= 4.0.0"])
@@ -102,14 +102,14 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<generator_spec>.freeze, [">= 0"])
       s.add_development_dependency(%q<rubysl>.freeze, [">= 0"])
       s.add_development_dependency(%q<rubysl-test-unit>.freeze, [">= 0"])
-      s.add_development_dependency(%q<psych>.freeze, [">= 0"])
+      s.add_development_dependency(%q<psych>.freeze, ["~> 2.2"])
       s.add_development_dependency(%q<racc>.freeze, [">= 0"])
       s.add_development_dependency(%q<rubinius-developer_tools>.freeze, [">= 0"])
     else
       s.add_dependency(%q<rails>.freeze, [">= 4.0.0"])
-      s.add_dependency(%q<sqlite3>.freeze, [">= 0"])
+      s.add_dependency(%q<sqlite3>.freeze, ["= 1.3.13"])
       s.add_dependency(%q<json_pure>.freeze, [">= 0"])
-      s.add_dependency(%q<jeweler>.freeze, ["~> 1.8"])
+      s.add_dependency(%q<jeweler>.freeze, ["~> 2.3"])
       s.add_dependency(%q<rspec-rails>.freeze, ["~> 3.0.0"])
       s.add_dependency(%q<rspec>.freeze, ["~> 3.0.0"])
       s.add_dependency(%q<actionpack>.freeze, [">= 4.0.0"])
@@ -119,15 +119,15 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<generator_spec>.freeze, [">= 0"])
       s.add_dependency(%q<rubysl>.freeze, [">= 0"])
       s.add_dependency(%q<rubysl-test-unit>.freeze, [">= 0"])
-      s.add_dependency(%q<psych>.freeze, [">= 0"])
+      s.add_dependency(%q<psych>.freeze, ["~> 2.2"])
       s.add_dependency(%q<racc>.freeze, [">= 0"])
       s.add_dependency(%q<rubinius-developer_tools>.freeze, [">= 0"])
     end
   else
     s.add_dependency(%q<rails>.freeze, [">= 4.0.0"])
-    s.add_dependency(%q<sqlite3>.freeze, [">= 0"])
+    s.add_dependency(%q<sqlite3>.freeze, ["= 1.3.13"])
     s.add_dependency(%q<json_pure>.freeze, [">= 0"])
-    s.add_dependency(%q<jeweler>.freeze, ["~> 1.8"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.3"])
     s.add_dependency(%q<rspec-rails>.freeze, ["~> 3.0.0"])
     s.add_dependency(%q<rspec>.freeze, ["~> 3.0.0"])
     s.add_dependency(%q<actionpack>.freeze, [">= 4.0.0"])
@@ -137,7 +137,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<generator_spec>.freeze, [">= 0"])
     s.add_dependency(%q<rubysl>.freeze, [">= 0"])
     s.add_dependency(%q<rubysl-test-unit>.freeze, [">= 0"])
-    s.add_dependency(%q<psych>.freeze, [">= 0"])
+    s.add_dependency(%q<psych>.freeze, ["~> 2.2"])
     s.add_dependency(%q<racc>.freeze, [">= 0"])
     s.add_dependency(%q<rubinius-developer_tools>.freeze, [">= 0"])
   end

metadata

@@ -1,241 +1,237 @@
 --- !ruby/object:Gem::Specification
 name: cocoon
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.2.11
 platform: ruby
 authors:
 - Nathan Van der Auwera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.13
 - !ruby/object:Gem::Dependency
   name: json_pure
   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: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS44
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS44
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   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: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MTAuMQ==
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MTAuMQ==
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   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: generator_spec
   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: rubysl
   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: rubysl-test-unit
   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: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: racc
   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: rubinius-developer_tools
   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'
 description: Unobtrusive nested forms handling, using jQuery. Use this and discover
@@ -246,7 +242,7 @@ extensions: []
 extra_rdoc_files:
 - README.markdown
 files:
-- .travis.yml
+- ".travis.yml"
 - Gemfile
 - History.md
 - MIT-LICENSE
@@ -317,17 +313,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: gem that enables easier nested forms with standard forms, formtastic and