nested_form 0.2.1 → 0.2.2

data/spec/dummy/app/assets/javascripts/jquery_nested_form.js

@@ -13,8 +13,7 @@ jQuery(function($) {
 
       // Make the context correct by replacing new_<parents> with the generated ID
       // of each of the parent objects
-      var context = ($(link).closest('.fields').closestChild('input:first').attr('name') || '').replace(new RegExp('\[[a-z]+\]$'), '');
-
+      var context = ($(link).closest('.fields').find('input:first').attr('name') || '').replace(new RegExp('\[[a-z]+\]$'), '');
 
       // context will be something like this for a brand new form:
       // project[tasks_attributes][new_1255929127459][assignments_attributes][new_1255929128105]
@@ -70,34 +69,3 @@ jQuery(function($) {
   $('form a.add_nested_fields').live('click', nestedFormEvents.addFields);
   $('form a.remove_nested_fields').live('click', nestedFormEvents.removeFields);
 });
-
-
-// http://plugins.jquery.com/project/closestChild
-/*
- * Copyright 2011, Tobias Lindig
- *
- * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
- * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
- *
- */
-(function($) {
-  $.fn.closestChild = function(selector) {
-    // breadth first search for the first matched node
-    if (selector && selector != '') {
-      var queue = [];
-      queue.push(this);
-      while(queue.length > 0) {
-        var node = queue.shift();
-        var children = node.children();
-        for(var i = 0; i < children.length; ++i) {
-          var child = $(children[i]);
-          if (child.is(selector)) {
-            return child; //well, we found one
-          }
-          queue.push(child);
-        }
-      }
-    }
-    return $();//nothing found
-  };
-})(jQuery);

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

@@ -1,3 +1,5 @@
 class Task < ActiveRecord::Base
   belongs_to :project
+  has_many :milestones
+  accepts_nested_attributes_for :milestones
 end

data/spec/dummy/app/views/projects/new.html.erb

@@ -6,9 +6,14 @@
 
 <%= nested_form_for @project do |f| -%>
   <%= f.text_field :name %>
-  <%= f.fields_for :tasks do |ff| -%>
-    <%= ff.text_field :name %>
-    <%= ff.link_to_remove 'Remove' %>
+  <%= f.fields_for :tasks do |tf| -%>
+    <%= tf.text_field :name %>
+    <%= tf.fields_for :milestones do |mf| %>
+      <%= mf.text_field :name %>
+      <%= mf.link_to_remove 'Remove milestone' %>
+    <% end %>
+    <%= tf.link_to_add 'Add new milestone', :milestones %>
+    <%= tf.link_to_remove 'Remove' %>
   <% end -%>
   <%= f.link_to_add 'Add new task', :tasks %>
 <% end -%>

data/spec/dummy/config/boot.rb

@@ -1,10 +1,10 @@
 require 'rubygems'
 
-gemfile = ENV['BUNDLE_GEMFILE'] || File.expand_path('../../../../gemfiles/Gemfile.rails3_1', __FILE__)
+gemfile = ENV['BUNDLE_GEMFILE'] || File.expand_path('../../../../Gemfile', __FILE__)
 if File.exist?(gemfile)
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler'
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/form_spec.rb

@@ -30,4 +30,12 @@ describe 'NestedForm' do
     visit '/projects/new?type=prototype'
     check_form
   end
+
+  it 'generates correct name for the nested input', :js => true do
+    visit '/projects/new?type=jquery'
+    click_link 'Add new task'
+    click_link 'Add new milestone'
+    name = find('.fields .fields input[id$=name]')[:name]
+    name.should match(/\Aproject\[tasks_attributes\]\[new_\d+\]\[milestones_attributes\]\[new_\d+\]\[name\]\z/)
+  end
 end

data/vendor/assets/javascripts/jquery_nested_form.js

@@ -13,8 +13,7 @@ jQuery(function($) {
 
       // Make the context correct by replacing new_<parents> with the generated ID
       // of each of the parent objects
-      var context = ($(link).closest('.fields').closestChild('input:first').attr('name') || '').replace(new RegExp('\[[a-z]+\]$'), '');
-
+      var context = ($(link).closest('.fields').find('input:first').attr('name') || '').replace(new RegExp('\[[a-z]+\]$'), '');
 
       // context will be something like this for a brand new form:
       // project[tasks_attributes][new_1255929127459][assignments_attributes][new_1255929128105]
@@ -70,34 +69,3 @@ jQuery(function($) {
   $('form a.add_nested_fields').live('click', nestedFormEvents.addFields);
   $('form a.remove_nested_fields').live('click', nestedFormEvents.removeFields);
 });
-
-
-// http://plugins.jquery.com/project/closestChild
-/*
- * Copyright 2011, Tobias Lindig
- *
- * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
- * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
- *
- */
-(function($) {
-  $.fn.closestChild = function(selector) {
-    // breadth first search for the first matched node
-    if (selector && selector != '') {
-      var queue = [];
-      queue.push(this);
-      while(queue.length > 0) {
-        var node = queue.shift();
-        var children = node.children();
-        for(var i = 0; i < children.length; ++i) {
-          var child = $(children[i]);
-          if (child.is(selector)) {
-            return child; //well, we found one
-          }
-          queue.push(child);
-        }
-      }
-    }
-    return $();//nothing found
-  };
-})(jQuery);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nested_form
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake