cocoon 1.0.20 → 1.0.21

data/README.markdown

@@ -105,8 +105,8 @@ Inside our `projects/_form` partial we then write:
       = render 'task_fields', :f => task
     .links
       = link_to_add_association 'add task', f, :tasks
-  -f.buttons do
-    = f.submit 'Save'
+  -f.actions do
+    = f.action :submit
 ````
 
 and inside the `_task_fields` partial we write:

data/VERSION

@@ -1 +1 @@
-1.0.20
+1.0.21

data/cocoon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cocoon"
-  s.version = "1.0.20"
+  s.version = "1.0.21"
 
   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-09"
+  s.date = "2012-05-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

@@ -84,9 +84,13 @@ module Cocoon
     # will create new Comment with author "Admin"
 
     def create_object(f, association)
-      assoc      = f.object.class.reflect_on_association(association)
-      conditions = assoc.respond_to?(:conditions) ? assoc.conditions.flatten : []
-      new_object = assoc.klass.new(*conditions)
+      assoc = f.object.class.reflect_on_association(association)
+
+      if assoc.collection?
+        f.object.send(association).build
+      else
+        f.object.send("build_#{association}")
+      end
     end
 
     def get_partial_path(partial, association)

data/spec/cocoon_spec.rb

@@ -175,11 +175,16 @@ describe Cocoon do
       end
     end
 
-    context "association with conditions" do
-      it "should create correct association" do
+    context "create_object" do
+      it "should create correct association with conditions" do
         result = @tester.create_object(@form_obj, :admin_comments)
         result.author.should == "Admin"
       end
+
+      it "should create correct association for belongs_to associations" do
+        result = @tester.create_object(stub(:object => Comment.new), :post)
+        result.should be_a Post
+      end
     end
 
     context "get_partial_path" do

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

@@ -1,3 +1,5 @@
 class Comment < ActiveRecord::Base
   belongs_to :post
+
+  attr_protected :author
 end

metadata

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