cocoon 1.0.0 → 1.0.1

data/README.markdown

@@ -94,13 +94,14 @@ There is an example project on github implementing it called [formtastic-cocoon-
 
 ### Using simple_form
 
-There is only line that needs to change, instead of writing `semantic_fields_for` you write `simple_fields_for`.
+This is almost identical to formtastic, instead of writing `semantic_fields_for` you write `simple_fields_for`.
+
+There is an example project on github implementing it called [cocoon_simple_form_demo](https://github.com/nathanvda/cocoon_simple_form_demo).
 
-I will provide a full example (and a sample project) later.
 
 ### Using standard rails forms
 
-I provide a full example (and a sample project) later.
+I will provide a full example (and a sample project) later.
 
 ## How it works
 
@@ -111,17 +112,31 @@ I define two helper functions:
 This function will add a link to your markup that will, when clicked, dynamically add a new partial form for the given association.
 This should be placed below the `semantic_fields_for`.
 
-It takes three parameters:
+It takes four parameters:
 
 - name: the text to show in the link
-- f: referring to the containing formtastic form-object
+- f: referring to the containing form-object
 - association: the name of the association (plural) of which a new instance needs to be added (symbol or string).
+- html_options: extra html-options (see `link_to`)
+  There are two extra options that allow to conrol the placement of the new link-data:
+  - `data-association-insertion-node` : the jquery selector of the node
+  - `data-association-insertion-position` : insert the new data `before` or `after` the given node.
+
+Optionally you could also leave out the name and supply a block that is captured to give the name (if you want to do something more complicated).
 
 ### link_to_remove_association
 
 This function will add a link to your markup that will, when clicked, dynamically remove the surrounding partial form.
 This should be placed inside the partial `_<association-object-singular>_fields`.
 
+It takes three parameters:
+
+- name: the text to show in the link
+- f: referring to the containing form-object
+- html_options: extra html-options (see `link_to`)
+
+Optionally you could also leave out the name and supply a block that is captured to give the name (if you want to do something more complicated).
+
 ### Partial
 
 The partial should be named `_<association-object_singular>_fields`, and should start with a div of class `.nested-fields`.
@@ -142,7 +157,8 @@ There is no limit to the amount of nesting, though.
 
 ## Todo
 
-* complete the sample projects for simple_form and normal rails forms
+* complete the sample projects -for simple_form- and normal rails forms
+* add more sample relations: has_many :through, belongs_to, ...
 * complete the test-coverage
 
 ## Copyright

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/cocoon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cocoon}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Van der Auwera"]
-  s.date = %q{2011-02-09}
+  s.date = %q{2011-03-03}
   s.description = %q{Unobtrusive nested forms handling, using jQuery. Use this and discover cocoon-heaven.}
   s.email = %q{nathan@dixis.com}
   s.extra_rdoc_files = [

data/lib/cocoon/view_helpers.rb

@@ -3,12 +3,31 @@ module Cocoon
 
 
     # this will show a link to remove the current association. This should be placed inside the partial.
-    #
+    # either you give
     # - *name* : the text of the link
     # - *f* : the form this link should be placed in
-    def link_to_remove_association(name, f)
-      is_dynamic = f.object.new_record?
-      f.hidden_field(:_destroy) + link_to(name, '#', :class => "remove_fields #{is_dynamic ? 'dynamic' : 'existing'}")
+    # - *html_options*:  html options to be passed to link_to (see <tt>link_to</tt>)
+    #
+    # or you use the form without *name* with a *&block*
+    # - *f* : the form this link should be placed in
+    # - *html_options*:  html options to be passed to link_to (see <tt>link_to</tt>)
+    # - *&block*:        the output of the block will be show in the link, see <tt>link_to</tt>
+    
+    def link_to_remove_association(*args, &block)
+      if block_given?
+        f            = args.first
+        html_options = args.second || {}
+        name         = capture(&block)
+        link_to_remove_association(name, f, html_options)
+      else
+        name         = args[0]
+        f            = args[1]
+        html_options = args[2] || {}
+
+        is_dynamic = f.object.new_record?
+        html_options[:class] = [html_options[:class], "remove_fields #{is_dynamic ? 'dynamic' : 'existing'}"].compact.join(' ')
+        f.hidden_field(:_destroy) + link_to(name, '#', html_options)
+      end
     end
 
     # :nodoc:
@@ -23,14 +42,32 @@ module Cocoon
     # - *name* :         the text to show in the link
     # - *f* :            the form this should come in (the formtastic form)
     # - *association* :  the associated objects, e.g. :tasks, this should be the name of the <tt>has_many</tt> relation.
-    #
-    def link_to_add_association(name, f, association)
-      new_object = f.object.class.reflect_on_association(association).klass.new
-      model_name = new_object.class.name.underscore
-      hidden_div = content_tag('div', :id => "#{model_name}_fields_template", :style => "display:none;") do
-        render_association(association, f, new_object)
+    # - *html_options*:  html options to be passed to <tt>link_to</tt> (see <tt>link_to</tt>)
+    # - *&block*:        see <tt>link_to</tt>
+
+    def link_to_add_association(*args, &block)
+      if block_given?
+        f            = args[0]
+        association  = args[1]
+        html_options = args[2] || {}
+        link_to_add_association(capture(&block), f, association, html_options)
+      else
+        name         = args[0]
+        f            = args[1]
+        association  = args[2]
+        html_options = args[3] || {}
+
+        html_options[:class] = [html_options[:class], "add_fields"].compact.join(' ')
+        html_options[:'data-association'] = association.to_s.singularize
+
+        new_object = f.object.class.reflect_on_association(association).klass.new
+        model_name = new_object.class.name.underscore
+        hidden_div = content_tag('div', :id => "#{model_name}_fields_template", :style => "display:none;") do
+          render_association(association, f, new_object)
+        end
+
+        hidden_div.html_safe + link_to(name, '#', html_options )
       end
-      hidden_div.html_safe + link_to(name, '#', :class => 'add_fields', :'data-association' => association.to_s.singularize)
     end
 
   end

data/lib/generators/cocoon/install/templates/cocoon.js

@@ -3,6 +3,8 @@ $(document).ready(function() {
   $('.add_fields').live('click', function() {
     var assoc   = $(this).attr('data-association');
     var content = $(this).siblings('#' + assoc + '_fields_template').html();
+    var insertionPosition = $(this).attr('data-association-insertion-position');
+    var insertionNode = $(this).attr('data-association-insertion-node');
     var regexp_braced = new RegExp('\\[new_' + assoc + '\\]', 'g');
     var new_id  = new Date().getTime();
     var new_content = content.replace(regexp_braced, '[' + new_id + ']');
@@ -10,7 +12,19 @@ $(document).ready(function() {
         regexp_braced = new RegExp('\\[new_' + assoc + 's\\]', 'g');
         new_content = content.replace(regexp_braced, '[' + new_id + ']');
     }
-    $(this).parent().before(new_content);
+    if (insertionNode) {
+      insertionNode = $(insertionNode);
+    }
+    else {
+      insertionNode = $(this).parent();
+    }
+    
+    if (insertionPosition == 'after'){
+      insertionNode.after(new_content);
+    } else {
+      insertionNode.before(new_content); 
+    }
+    
     return false;
   });
 
@@ -25,4 +39,5 @@ $(document).ready(function() {
     return false;
   });
 
-});
+});
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Nathan Van der Auwera
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 +01:00
+date: 2011-03-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 308252755
+      hash: -548597357
       segments: 
       - 0
       version: "0"