cocoon 1.0.13 → 1.0.14

data/History.md

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

data/README.markdown

@@ -149,6 +149,13 @@ It takes three parameters:
 
 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).
 
+Inside the `html_options` you can add an option `:render_options`, and the containing hash will be handed down to the form-builder for the inserted
+form. E.g. especially when using `twitter-bootstrap` and `simple_form` together, the `simple_fields_for` needs the option `:wrapper => 'inline'` which can
+be handed down as follows:
+
+    = link_to_add_association 'add something', f, :something, :render_options => {:wrapper => 'inline' }
+
+
 ### Callbacks (upon insert and remove of items)
 
 There is an option to add a callback on insertion or removal. If in your view you have the following snippet to select an `onwer`

data/VERSION

@@ -1 +1 @@
-1.0.13
+1.0.14

data/cocoon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cocoon}
-  s.version = "1.0.13"
+  s.version = "1.0.14"
 
   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-10-12}
+  s.date = %q{2011-10-22}
   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

@@ -31,8 +31,9 @@ module Cocoon
     end
 
     # :nodoc:
-    def render_association(association, f, new_object)
-      f.fields_for(association, new_object, :child_index => "new_#{association}") do |builder|
+    def render_association(association, f, new_object, render_options={})
+      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|
         render(association.to_s.singularize + "_fields", :f => builder, :dynamic => true)
       end
     end
@@ -57,12 +58,15 @@ module Cocoon
         association  = args[2]
         html_options = args[3] || {}
 
+        render_options = html_options.delete(:render_options)
+        render_options ||={}
+
         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 = f.object.class.reflect_on_association(association).klass.new
-        html_options[:'data-template'] = CGI.escapeHTML(render_association(association, f, new_object)).html_safe
+        html_options[:'data-template'] = CGI.escapeHTML(render_association(association, f, new_object, render_options)).html_safe
 
         link_to(name, '#', html_options )
       end

data/spec/cocoon_spec.rb

@@ -52,7 +52,48 @@ describe Cocoon do
         result = @tester.link_to_add_association('add something', @form_obj, :people)
         result.to_s.should == '<a href="#" class="add_fields" data-association="person" data-associations="people" data-template="form&lt;tag&gt;">add something</a>'
       end
+    end
+
+    it "tttt" do
+      @post.class.reflect_on_association(:people).klass.new.should be_a(Person)
+    end
+
+    context "with extra render-options for rendering the child relation" do
+      it "should use the correct plural" do
+        @tester.should_receive(:render_association).with(:people, @form_obj, anything, {:wrapper => 'inline'})
+        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="form&lt;tag&gt;">add something</a>'
+      end
+    end
+
+    context "when using formtastic" do
+      before(:each) do
+        @tester.unstub(:render_association)
+        @form_obj.stub(:semantic_fields_for).and_return('form<tagzzz>')
+      end
+      it "calls semantic_fields_for and not fields_for" do
+        @form_obj.should_receive(:semantic_fields_for)
+        @form_obj.should_receive(:fields_for).never
+        result = @tester.link_to_add_association('add something', @form_obj, :people)
+        result.to_s.should == '<a href="#" class="add_fields" data-association="person" data-associations="people" data-template="form&lt;tagzzz&gt;">add something</a>'
 
+      end
+    end
+    context "when using simple_form" do
+      before(:each) do
+        @tester.unstub(:render_association)
+        @form_obj.stub(:simple_fields_for).and_return('form<tagxxx>')
+      end
+      it "responds_to :simple_fields_for" do
+        @form_obj.should respond_to(:simple_fields_for)
+      end
+      it "calls simple_fields_for and not fields_for" do
+        @form_obj.should_receive(:simple_fields_for)
+        @form_obj.should_receive(:fields_for).never
+        result = @tester.link_to_add_association('add something', @form_obj, :people)
+        result.to_s.should == '<a href="#" class="add_fields" data-association="person" data-associations="people" data-template="form&lt;tagxxx&gt;">add something</a>'
+
+      end
     end
 
   end

data/spec/dummy/app/models/person.rb

@@ -1,2 +1,3 @@
 class Person < ActiveRecord::Base
+  belongs_to :post
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cocoon
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 1
   - 0
-  - 13
-  version: 1.0.13
+  - 14
+  version: 1.0.14
 platform: ruby
 authors: 
 - Nathan Van der Auwera
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-12 00:00:00 +02:00
+date: 2011-10-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency