cocoon 1.2.1 → 1.2.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzE3MjkzZDE4NTVjN2ZiNDU3MzMxYjg4ZGEyNmU5NDBkMzMwNWFlMw==
+  data.tar.gz: !binary |-
+    ZDViZDlhNjdkMDUwMTBkZmZmMDQ4OTgyMjc3NzJjYmQ2OGIwYjkzNA==
+SHA512:
+  metadata.gz: !binary |-
+    M2JjZGMyOGQzZDliYTM2NmM5Y2ZmMGZiZWRhMTQ3NDE1YjkzYWQ3MDRjOTI0
+    MWYwYjAzM2Q4OWIyYzBmYTlhNTQ4ZmM0YjJmYjYxZTlkZDM3MTQ2MGQyNmM1
+    YTJmZmNiZTYwM2VmNTY5OGFhZjU1ZjhhZGJmMTEzYmJlYjEwZWY=
+  data.tar.gz: !binary |-
+    ZTg4ZmVhZmE1MmEzMmQwNzVkOGMyMTViMTBkYTQ4ZmY5OTkzMWUxZmJmZGZi
+    ZDc2MjkxZTFkMzFhNmI5NGZjODE5YzQxMWNlOWJjNWI4NGZiMTFmNjBiNjQy
+    OTBkN2E4ZmVlNmJhMmRkMTQwOTAzZGE3ODA3OWZhMTdlOTMwZjY=

data/README.markdown

@@ -96,10 +96,11 @@ E.g. in your `ProjectsController`:
   end
 ```
 
-
-
 ## Examples
 
+Cocoon's default configuration requires `link_to_add_association` and associated partials to 
+be properly wrapped with elements. The examples below illustrate simple layouts.
+
 ### Formtastic
 
 In our `projects/_form` partial we'd write:

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/app/assets/javascripts/cocoon.js

@@ -2,9 +2,16 @@
 
   var cocoon_element_counter = 0;
 
-  function replace_in_content(content, regexp_str, with_str) {
-    reg_exp = new RegExp(regexp_str);
-    content.replace(reg_exp, with_str);
+  var create_new_id = function() {
+    return (new Date().getTime() + cocoon_element_counter++);
+  }
+  
+  var newcontent_braced = function(id) {
+    return '[' + id + ']$1';
+  }
+  
+  var newcontent_underscord = function(id) {
+    return '_' + id + '_$1';
   }
 
   $(document).on('click', '.add_fields', function(e) {
@@ -16,21 +23,35 @@
         insertionMethod       = $this.data('association-insertion-method') || $this.data('association-insertion-position') || 'before',
         insertionNode         = $this.data('association-insertion-node'),
         insertionTraversal    = $this.data('association-insertion-traversal'),
+        count                 = parseInt($this.data('count'), 10),
         regexp_braced         = new RegExp('\\[new_' + assoc + '\\](.*?\\s)', 'g'),
         regexp_underscord     = new RegExp('_new_' + assoc + '_(\\w*)', 'g'),
-        new_id                = new Date().getTime() + cocoon_element_counter++,
-        newcontent_braced     = '[' + new_id + ']',
-        newcontent_underscord = '_' + new_id + '_',
-        new_content           = content.replace(regexp_braced, '[' + new_id + ']$1');
+        new_id                = create_new_id(),
+        new_content           = content.replace(regexp_braced, newcontent_braced(new_id)),
+        new_contents          = [];
 
+    
     if (new_content == content) {
-        regexp_braced     = new RegExp('\\[new_' + assocs + '\\](.*?\\s)', 'g');
-        regexp_underscord = new RegExp('_new_' + assocs + '_(\\w*)', 'g');
-        new_content       = content.replace(regexp_braced, '[' + new_id + ']$1');
+      regexp_braced     = new RegExp('\\[new_' + assocs + '\\](.*?\\s)', 'g');
+      regexp_underscord = new RegExp('_new_' + assocs + '_(\\w*)', 'g');
+      new_content       = content.replace(regexp_braced, newcontent_braced(new_id));
     }
 
-    new_content = new_content.replace(regexp_underscord, newcontent_underscord + "$1");
-
+    new_content = new_content.replace(regexp_underscord, newcontent_underscord(new_id));
+    new_contents = [new_content];
+
+    count = (isNaN(count) ? 1 : Math.max(count, 1));
+    count -= 1;
+    
+    while (count) {
+      new_id      = create_new_id();
+      new_content = content.replace(regexp_braced, newcontent_braced(new_id));
+      new_content = new_content.replace(regexp_underscord, newcontent_underscord(new_id));
+      new_contents.push(new_content);
+      
+      count -= 1;
+    }
+    
     if (insertionNode){
       if (insertionTraversal){
         insertionNode = $this[insertionTraversal](insertionNode);
@@ -41,16 +62,18 @@
       insertionNode = $this.parent();
     }
 
-    var contentNode = $(new_content);
+    for (var i in new_contents) {
+      var contentNode = $(new_contents[i]);
 
-    insertionNode.trigger('cocoon:before-insert', [contentNode]);
+      insertionNode.trigger('cocoon: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 = insertionNode[insertionMethod](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 = insertionNode[insertionMethod](contentNode);
 
-    insertionNode.trigger('cocoon:after-insert', [contentNode]);
+      insertionNode.trigger('cocoon:after-insert', [contentNode]);
+    }
   });
 
   $(document).on('click', '.remove_fields.dynamic, .remove_fields.existing', function(e) {
@@ -66,10 +89,10 @@
 
     setTimeout(function() {
       if ($this.hasClass('dynamic')) {
-          $this.closest(".nested-fields").remove();
+          node_to_delete.remove();
       } else {
           $this.prev("input[type=hidden]").val("1");
-          $this.closest(".nested-fields").hide();
+          node_to_delete.hide();
       }
       trigger_node.trigger('cocoon:after-remove', [node_to_delete]);
     }, timeout);

data/cocoon.gemspec

@@ -2,14 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: cocoon 1.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "cocoon"
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Van der Auwera"]
-  s.date = "2013-09-25"
+  s.date = "2013-11-14"
   s.description = "Unobtrusive nested forms handling, using jQuery. Use this and discover cocoon-heaven."
   s.email = "nathan@dixis.com"
   s.extra_rdoc_files = [
@@ -80,11 +81,11 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/nathanvda/cocoon"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "2.1.11"
   s.summary = "gem that enables easier nested forms with standard forms, formtastic and simple-form"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rails>, [">= 4.0.0"])

data/lib/cocoon/view_helpers.rb

@@ -58,6 +58,7 @@ module Cocoon
     #          - *:wrap_object*    : a proc that will allow to wrap your object, especially suited when using
     #                                decorators, or if you want special initialisation   
     #          - *:form_name*      : the parameter for the form in the nested form partial. Default `f`.
+    #          - *:count*          : Count of how many objects will be added on a single click. Default `1`.
     # - *&block*:        see <tt>link_to</tt>
 
     def link_to_add_association(*args, &block)
@@ -78,6 +79,7 @@ module Cocoon
         wrap_object = html_options.delete(:wrap_object)
         force_non_association_create = html_options.delete(:force_non_association_create) || false
         form_parameter_name = html_options.delete(:form_name) || 'f'
+        count = html_options.delete(:count).to_i
 
         html_options[:class] = [html_options[:class], "add_fields"].compact.join(' ')
         html_options[:'data-association'] = association.to_s.singularize
@@ -87,8 +89,10 @@ module Cocoon
         new_object = wrap_object.call(new_object) if wrap_object.respond_to?(:call)
 
         html_options[:'data-association-insertion-template'] = CGI.escapeHTML(render_association(association, f, new_object, form_parameter_name, render_options, override_partial)).html_safe
+        
+        html_options[:'data-count'] = count if count > 0
 
-        link_to(name, '#', html_options )
+        link_to(name, '#', html_options)
       end
     end
 

data/spec/cocoon_spec.rb

@@ -238,6 +238,13 @@ describe Cocoon do
       end
     end
 
+    context 'when adding a count' do
+      before do
+        @html = @tester.link_to_add_association('add something', @form_obj, :comments, { :count => 3 })
+      end
+      it_behaves_like "a correctly rendered add link", { :extra_attributes => { 'data-count' => '3' } }
+    end
+
   end
 
   context "link_to_remove_association" do

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: cocoon
 version: !ruby/object:Gem::Version
-  version: 1.2.1
-  prerelease: 
+  version: 1.2.2
 platform: ruby
 authors:
 - Nathan Van der Auwera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -258,30 +235,26 @@ files:
 - spec/support/shared_examples.rb
 homepage: http://github.com/nathanvda/cocoon
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3336163965730752832
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: gem that enables easier nested forms with standard forms, formtastic and
   simple-form
 test_files: []