cocoon 1.0.15 → 1.0.16

data/README.markdown

@@ -121,7 +121,7 @@ and inside the `_task_fields` partial we write:
 
 That is all there is to it!
 
-There is an example project on github implementing it called [formtastic-cocoon-demo](https://github.com/nathanvda/formtastic_cocoon_demo).
+There is an example project on github implementing it called [cocoon_formtastic_demo](https://github.com/nathanvda/cocoon_formtastic_demo).
 
 ### Using simple_form
 

data/Rakefile

@@ -7,7 +7,7 @@ rescue LoadError
 end
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'

data/VERSION

@@ -1 +1 @@
-1.0.15
+1.0.16

data/cocoon.gemspec

@@ -4,21 +4,20 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{cocoon}
-  s.version = "1.0.15"
+  s.name = "cocoon"
+  s.version = "1.0.16"
 
   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-12-08}
-  s.description = %q{Unobtrusive nested forms handling, using jQuery. Use this and discover cocoon-heaven.}
-  s.email = %q{nathan@dixis.com}
+  s.date = "2012-03-12"
+  s.description = "Unobtrusive nested forms handling, using jQuery. Use this and discover cocoon-heaven."
+  s.email = "nathan@dixis.com"
   s.extra_rdoc_files = [
     "README.markdown"
   ]
   s.files = [
     ".travis.yml",
     "Gemfile",
-    "Gemfile.lock",
     "History.md",
     "MIT-LICENSE",
     "README.markdown",
@@ -72,10 +71,10 @@ Gem::Specification.new do |s|
     "spec/integration/navigation_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/nathanvda/cocoon}
+  s.homepage = "http://github.com/nathanvda/cocoon"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{gem that enables easier nested forms with standard forms, formtastic and simple-form}
+  s.rubygems_version = "1.8.15"
+  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

data/lib/cocoon/view_helpers.rb

@@ -31,10 +31,11 @@ module Cocoon
     end
 
     # :nodoc:
-    def render_association(association, f, new_object, render_options={})
+    def render_association(association, f, new_object, render_options={}, custom_partial=nil)
+      partial = setup_partial(custom_partial, association)
       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)
+        render(partial, :f => builder, :dynamic => true)
       end
     end
 
@@ -51,26 +52,46 @@ 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)
       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 ||={}
+        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, render_options)).html_safe
+        new_object = create_object(f, association)
+        html_options[:'data-template'] = CGI.escapeHTML(render_association(association, f, new_object, render_options, options[:partial])).html_safe
 
         link_to(name, '#', html_options )
       end
     end
 
+    # creates new association object with its conditions, like
+    # `` has_many :admin_comments, class_name: "Comment", conditions: { author: "Admin" }
+    # will create new Comment with author "Admin"
+
+    def create_object(f, association)
+      assoc      = f.object.class.reflect_on_association(association)
+      conditions = assoc.conditions.flatten
+      new_object = assoc.klass.new(*conditions)
+    end
+
+    def setup_partial(partial, association)
+      if partial
+        partial
+      else
+        association.to_s.singularize + "_fields"
+      end
+    end
+
   end
 end

data/spec/cocoon_spec.rb

@@ -19,12 +19,12 @@ describe Cocoon do
     end
 
     context "without a block" do
-      it "should accept a name" do
+      it "accepts a name" do
         result = @tester.link_to_add_association('add something', @form_obj, :comments)
         result.to_s.should == '<a href="#" class="add_fields" data-association="comment" data-associations="comments" data-template="form&lt;tag&gt;">add something</a>'
       end
 
-      it "should accept html options and pass them to link_to" do
+      it "accepts html options and pass them to link_to" 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
@@ -38,7 +38,7 @@ describe Cocoon do
         result.to_s.should == '<a href="#" class="add_fields" data-association="comment" data-associations="comments" data-template="form&lt;tag&gt;">some long name</a>'
       end
 
-      it "should accept html options and pass them to link_to" do
+      it "accepts html options and pass them to link_to" do
         result = @tester.link_to_add_association(@form_obj, :comments, {:class => 'floppy disk'}) do
           "some long name"
         end
@@ -48,7 +48,7 @@ describe Cocoon do
     end
 
     context "with an irregular plural" do
-      it "should use the correct plural" do
+      it "uses the correct plural" 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
@@ -59,8 +59,8 @@ describe Cocoon do
     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'})
+      it "uses the correct plural" do
+        @tester.should_receive(:render_association).with(:people, @form_obj, anything, {:wrapper => 'inline'}, nil)
         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
@@ -105,13 +105,13 @@ describe Cocoon do
       @form_obj = stub(:object => @post, :object_name => @post.class.name)
     end
 
-    context  "without a block" do
-      it "should accept a name" do
+    context "without a block" do
+      it "accepts a name" do
         result = @tester.link_to_remove_association('remove something', @form_obj)
         result.to_s.should == "<input id=\"Post__destroy\" name=\"Post[_destroy]\" type=\"hidden\" /><a href=\"#\" class=\"remove_fields dynamic\">remove something</a>"
       end
 
-      it "should accept html options and pass them to link_to" do
+      it "accepts html options and pass them to link_to" do
         result = @tester.link_to_remove_association('remove something', @form_obj, {:class => 'add_some_class', :'data-something' => 'bla'})
         result.to_s.should == "<input id=\"Post__destroy\" name=\"Post[_destroy]\" type=\"hidden\" /><a href=\"#\" class=\"add_some_class remove_fields dynamic\" data-something=\"bla\">remove something</a>"
       end
@@ -126,13 +126,31 @@ describe Cocoon do
         result.to_s.should == "<input id=\"Post__destroy\" name=\"Post[_destroy]\" type=\"hidden\" /><a href=\"#\" class=\"remove_fields dynamic\">remove some long name</a>"
       end
 
-      it "should accept html options and pass them to link_to" do
+      it "accepts html options and pass them to link_to" do
         result = @tester.link_to_remove_association(@form_obj, {:class => 'add_some_class', :'data-something' => 'bla'}) do
           "remove some long name"
         end
         result.to_s.should == "<input id=\"Post__destroy\" name=\"Post[_destroy]\" type=\"hidden\" /><a href=\"#\" class=\"add_some_class remove_fields dynamic\" data-something=\"bla\">remove some long name</a>"
       end
     end
+
+    context "association with conditions" do
+      it "should create correct association" do
+        result = @tester.create_object(@form_obj, :admin_comments)
+        result.author.should == "Admin"
+      end
+    end
+
+    context "setup_partial" do
+      it "generates the default partial name if no partial given" do
+        result = @tester.setup_partial(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.should == "comment_fields"
+      end
+    end
   end
 
 end

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

@@ -1,4 +1,5 @@
 class Post < ActiveRecord::Base
   has_many :comments
+  has_many :admin_comments, :class_name => "Comment", :conditions => { :author => "Admin" }
   has_many :people
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cocoon
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 55
   prerelease: 
   segments: 
   - 1
   - 0
-  - 15
-  version: 1.0.15
+  - 16
+  version: 1.0.16
 platform: ruby
 authors: 
 - Nathan Van der Auwera
@@ -15,11 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-08 00:00:00 +01:00
-default_executable: 
+date: 2012-03-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +29,11 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  name: rails
   version_requirements: *id001
+  name: rails
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +43,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: sqlite3-ruby
   version_requirements: *id002
+  name: sqlite3-ruby
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -59,11 +57,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: json_pure
   version_requirements: *id003
+  name: json_pure
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -73,11 +71,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: jeweler
   version_requirements: *id004
+  name: jeweler
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -89,11 +87,11 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  name: rspec-rails
   version_requirements: *id005
+  name: rspec-rails
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -105,11 +103,11 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  name: rspec
   version_requirements: *id006
+  name: rspec
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -121,11 +119,11 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  name: actionpack
   version_requirements: *id007
+  name: actionpack
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -135,11 +133,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: simplecov
   version_requirements: *id008
+  name: simplecov
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -149,11 +147,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: generator_spec
   version_requirements: *id009
+  name: generator_spec
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -165,9 +163,10 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  name: rspec
   version_requirements: *id010
+  name: rspec
   prerelease: false
+  type: :development
 description: Unobtrusive nested forms handling, using jQuery. Use this and discover cocoon-heaven.
 email: nathan@dixis.com
 executables: []
@@ -179,7 +178,6 @@ extra_rdoc_files:
 files: 
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - History.md
 - MIT-LICENSE
 - README.markdown
@@ -232,7 +230,6 @@ files:
 - spec/generators/install_generator_spec.rb
 - spec/integration/navigation_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/nathanvda/cocoon
 licenses: []
 
@@ -262,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: gem that enables easier nested forms with standard forms, formtastic and simple-form

data/Gemfile.lock

@@ -1,125 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.1.3)
-      actionpack (= 3.1.3)
-      mail (~> 2.3.0)
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-    activesupport (3.1.3)
-      multi_json (~> 1.0)
-    arel (2.2.1)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    generator_spec (0.8.4)
-      rails (>= 3.0, < 4.0)
-      rspec-rails
-    git (1.2.5)
-    hike (1.2.1)
-    i18n (0.6.0)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    json (1.6.3)
-    json_pure (1.6.3)
-    mail (2.3.0)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.0.4)
-    polyglot (0.3.3)
-    rack (1.3.5)
-    rack-cache (1.1)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.1.3)
-      actionmailer (= 3.1.3)
-      actionpack (= 3.1.3)
-      activerecord (= 3.1.3)
-      activeresource (= 3.1.3)
-      activesupport (= 3.1.3)
-      bundler (~> 1.0)
-      railties (= 3.1.3)
-    railties (3.1.3)
-      actionpack (= 3.1.3)
-      activesupport (= 3.1.3)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.11)
-      json (~> 1.4)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    rspec-rails (2.7.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.7.0)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    sprockets (2.0.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  actionpack (>= 3.0.0)
-  generator_spec
-  jeweler
-  json_pure
-  rails (>= 3.0.0)
-  rspec (>= 2.6.0)
-  rspec-rails (>= 2.6.0)
-  simplecov
-  sqlite3-ruby