cocoon 1.0.19 → 1.0.20

data/History.md

@@ -1,5 +1,36 @@
 # Change History / Release Notes
 
+
+## 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.

data/VERSION

@@ -1 +1 @@
-1.0.19
+1.0.20

data/cocoon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cocoon"
-  s.version = "1.0.19"
+  s.version = "1.0.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Van der Auwera"]
-  s.date = "2012-04-07"
+  s.date = "2012-04-09"
   s.description = "Unobtrusive nested forms handling, using jQuery. Use this and discover cocoon-heaven."
   s.email = "nathan@dixis.com"
   s.extra_rdoc_files = [

data/lib/cocoon/view_helpers.rb

@@ -32,7 +32,7 @@ module Cocoon
 
     # :nodoc:
     def render_association(association, f, new_object, render_options={}, custom_partial=nil)
-      partial = setup_partial(custom_partial, association)
+      partial = get_partial_path(custom_partial, association)
       locals =  render_options.delete(:locals) || {}
       method_name = f.respond_to?(:semantic_fields_for) ? :semantic_fields_for : (f.respond_to?(:simple_fields_for) ? :simple_fields_for : :fields_for)
       f.send(method_name, association, new_object, {:child_index => "new_#{association}"}.merge(render_options)) do |builder|
@@ -57,24 +57,23 @@ module Cocoon
         f            = args[0]
         association  = args[1]
         html_options = args[2] || {}
-        options      = args[3] || {}
-        link_to_add_association(capture(&block), f, association, html_options, options)
+        link_to_add_association(capture(&block), f, association, html_options)
       else
         name         = args[0]
         f            = args[1]
         association  = args[2]
         html_options = args[3] || {}
-        options      = args[4] || {}
 
         render_options   = html_options.delete(:render_options)
         render_options ||= {}
+        override_partial = html_options.delete(:partial)
 
         html_options[:class] = [html_options[:class], "add_fields"].compact.join(' ')
         html_options[:'data-association'] = association.to_s.singularize
         html_options[:'data-associations'] = association.to_s.pluralize
 
         new_object = create_object(f, association)
-        html_options[:'data-template'] = CGI.escapeHTML(render_association(association, f, new_object, render_options, options[:partial])).html_safe
+        html_options[:'data-template'] = CGI.escapeHTML(render_association(association, f, new_object, render_options, override_partial)).html_safe
 
         link_to(name, '#', html_options )
       end
@@ -90,12 +89,8 @@ module Cocoon
       new_object = assoc.klass.new(*conditions)
     end
 
-    def setup_partial(partial, association)
-      if partial
-        partial
-      else
-        association.to_s.singularize + "_fields"
-      end
+    def get_partial_path(partial, association)
+      partial ? partial : association.to_s.singularize + "_fields"
     end
 
   end

data/spec/cocoon_spec.rb

@@ -28,6 +28,13 @@ describe Cocoon do
         result = @tester.link_to_add_association('add something', @form_obj, :comments, {:class => 'something silly'})
         result.to_s.should == '<a href="#" class="something silly add_fields" data-association="comment" data-associations="comments" data-template="form&lt;tag&gt;">add something</a>'
       end
+
+      it "allows to explicitly hand the wanted partial" do
+        @tester.unstub(:render_association)
+        @tester.should_receive(:render_association).with(anything(), anything(), anything(), anything(), "shared/partial").and_return('partiallll')
+        result = @tester.link_to_add_association('add something', @form_obj, :comments, :partial => "shared/partial")
+        result.to_s.should == '<a href="#" class="add_fields" data-association="comment" data-associations="comments" data-template="partiallll">add something</a>'
+      end
     end
 
     context "with a block" do
@@ -45,10 +52,10 @@ describe Cocoon do
         result.to_s.should == '<a href="#" class="floppy disk add_fields" data-association="comment" data-associations="comments" data-template="form&lt;tag&gt;">some long name</a>'
       end
 
-      it "accepts options and passes them to link_to" do
+      it "allows to explicitly hand the wanted partial" do
         @tester.unstub(:render_association)
         @tester.should_receive(:render_association).with(anything(), anything(), anything(), anything(), "shared/partial").and_return('partiallll')
-        result = @tester.link_to_add_association( @form_obj, :comments, {:class => 'floppy disk'}, {:partial => "shared/partial"}) do
+        result = @tester.link_to_add_association( @form_obj, :comments, :class => 'floppy disk', :partial => "shared/partial") do
           "some long name"
         end
         result.to_s.should == '<a href="#" class="floppy disk add_fields" data-association="comment" data-associations="comments" data-template="partiallll">some long name</a>'
@@ -81,14 +88,21 @@ describe Cocoon do
       end
     end
 
-    context "with extra render-options to pass locals to the partial" do
-      it "uses the correct plural" do
+    context "passing locals to the partial" do
+      it "when given: passes the locals to the partials" do
         @tester.unstub(:render_association)
         @form_obj.should_receive(:fields_for) { | association, new_object, options_hash, &block| block.call }
         @tester.should_receive(:render).with("person_fields", {:f=>nil, :dynamic=>true, :alfred=>"Judoka"}).and_return ("partiallll")
         result = @tester.link_to_add_association('add something', @form_obj, :people, :render_options => {:wrapper => 'inline', :locals => {:alfred => 'Judoka'}})
         result.to_s.should == '<a href="#" class="add_fields" data-association="person" data-associations="people" data-template="partiallll">add something</a>'
       end
+      it "if no locals are given it still works" do
+        @tester.unstub(:render_association)
+        @form_obj.should_receive(:fields_for) { | association, new_object, options_hash, &block| block.call }
+        @tester.should_receive(:render).with("person_fields", {:f=>nil, :dynamic=>true}).and_return ("partiallll")
+        result = @tester.link_to_add_association('add something', @form_obj, :people, :render_options => {:wrapper => 'inline'})
+        result.to_s.should == '<a href="#" class="add_fields" data-association="person" data-associations="people" data-template="partiallll">add something</a>'
+      end
     end
 
 
@@ -168,13 +182,13 @@ describe Cocoon do
       end
     end
 
-    context "setup_partial" do
+    context "get_partial_path" do
       it "generates the default partial name if no partial given" do
-        result = @tester.setup_partial(nil, :admin_comments)
+        result = @tester.get_partial_path(nil, :admin_comments)
         result.should == "admin_comment_fields"
       end
       it "uses the given partial name" do
-        result = @tester.setup_partial("comment_fields", :admin_comments)
+        result = @tester.get_partial_path("comment_fields", :admin_comments)
         result.should == "comment_fields"
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cocoon
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 63
   prerelease: 
   segments: 
   - 1
   - 0
-  - 19
-  version: 1.0.19
+  - 20
+  version: 1.0.20
 platform: ruby
 authors: 
 - Nathan Van der Auwera
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-07 00:00:00 Z
+date: 2012-04-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement