nested_form 0.2.3 → 0.3.0

data/spec/form_spec.rb

@@ -45,6 +45,6 @@ describe 'NestedForm' do
     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/)
+    name.should match(/\Aproject\[tasks_attributes\]\[\d+\]\[milestones_attributes\]\[\d+\]\[name\]\z/)
   end
 end

data/spec/nested_form/builder_spec.rb

@@ -19,9 +19,9 @@ require "spec_helper"
 
       describe '#link_to_add' do
         it "behaves similar to a Rails link_to" do
-          subject.link_to_add("Add", :tasks).should == '<a href="javascript:void(0)" class="add_nested_fields" data-association="tasks">Add</a>'
-          subject.link_to_add("Add", :tasks, :class => "foo", :href => "url").should == '<a href="url" class="foo add_nested_fields" data-association="tasks">Add</a>'
-          subject.link_to_add(:tasks) { "Add" }.should == '<a href="javascript:void(0)" class="add_nested_fields" data-association="tasks">Add</a>'
+          subject.link_to_add("Add", :tasks).should == '<a href="javascript:void(0)" class="add_nested_fields" data-association="tasks" data-blueprint-id="tasks_fields_blueprint">Add</a>'
+          subject.link_to_add("Add", :tasks, :class => "foo", :href => "url").should == '<a href="url" class="foo add_nested_fields" data-association="tasks" data-blueprint-id="tasks_fields_blueprint">Add</a>'
+          subject.link_to_add(:tasks) { "Add" }.should == '<a href="javascript:void(0)" class="add_nested_fields" data-association="tasks" data-blueprint-id="tasks_fields_blueprint">Add</a>'
         end
 
         context 'when missing association is provided' do
@@ -77,13 +77,58 @@ require "spec_helper"
         end
       end
 
-      it "should add task fields to hidden div after form" do
-        pending
-        output = ""
-        mock(@template).after_nested_form(:tasks) { |arg, block| output << block.call }
-        @builder.fields_for(:tasks) { "Task" }
-        @builder.link_to_add("Add", :tasks)
-        output.should == '<div id="tasks_fields_blueprint" style="display: none"><div class="fields">Task</div></div>'
+      it "wraps nested fields marked for destruction with an additional class" do
+        task = project.tasks.build
+        task.mark_for_destruction
+        fields = subject.fields_for(:tasks) { 'Task' }
+        fields.should eq('<div class="fields marked_for_destruction">Task</div>')
+      end
+
+      it "puts blueprint into data-blueprint attribute" do
+        task = project.tasks.build
+        task.mark_for_destruction
+        subject.fields_for(:tasks) { 'Task' }
+        subject.link_to_add('Add', :tasks)
+        output   = template.send(:after_nested_form_callbacks)
+        expected = ERB::Util.html_escape '<div class="fields">Task</div>'
+        output.should match(/div.+data-blueprint="#{expected}"/)
+      end
+
+      it "adds parent association name to the blueprint div id" do
+        task = project.tasks.build
+        task.milestones.build
+        subject.fields_for(:tasks, :builder => builder) do |tf|
+          tf.fields_for(:milestones, :builder => builder) { 'Milestone' }
+          tf.link_to_add('Add', :milestones)
+        end
+        output = template.send(:after_nested_form_callbacks)
+        output.should match(/div.+id="tasks_milestones_fields_blueprint"/)
+      end
+
+      it "doesn't render wrapper div" do
+        task = project.tasks.build
+        fields = subject.fields_for(:tasks, :wrapper => false) { 'Task' }
+
+        fields.should eq('Task')
+
+        subject.link_to_add 'Add', :tasks
+        output = template.send(:after_nested_form_callbacks)
+
+        output.should match(/div.+data-blueprint="Task"/)
+      end
+    end
+
+    context "with options" do
+      subject { builder.new(:item, project, template, {}, proc {}) }
+
+      context "when model_object given" do
+        it "should use it instead of new generated" do
+          subject.fields_for(:tasks) {|f| f.object.name }
+          subject.link_to_add("Add", :tasks, :model_object => Task.new(:name => 'for check'))
+          output   = template.send(:after_nested_form_callbacks)
+          expected = ERB::Util.html_escape '<div class="fields">for check</div>'
+          output.should match(/div.+data-blueprint="#{expected}"/)
+        end
       end
     end
   end

data/spec/nested_form/view_helper_spec.rb

@@ -37,6 +37,14 @@ describe NestedForm::ViewHelper do
     end
   end
 
+  if defined?(NestedForm::FormtasticBootstrapBuilder)
+    it "should pass instance of NestedForm::FormtasticBootstrapBuilder to semantic_bootstrap_nested_form_for block" do
+      _view.semantic_bootstrap_nested_form_for(Project.new) do |f|
+        f.should be_instance_of(NestedForm::FormtasticBootstrapBuilder)
+      end
+    end
+  end
+
   it "should append content to end of nested form" do
     _view.after_nested_form(:tasks) { _view.concat("123") }
     _view.after_nested_form(:milestones) { _view.concat("456") }

data/vendor/assets/javascripts/jquery_nested_form.js

@@ -7,21 +7,22 @@ jQuery(function($) {
   NestedFormEvents.prototype = {
     addFields: function(e) {
       // Setup
-      var link    = e.currentTarget;
-      var assoc   = $(link).attr('data-association');            // Name of child
-      var content = $('#' + assoc + '_fields_blueprint').html(); // Fields template
+      var link      = e.currentTarget;
+      var assoc     = $(link).data('association');                // Name of child
+      var blueprint = $('#' + $(link).data('blueprint-id'));
+      var content   = blueprint.data('blueprint');                // Fields template
 
-      // Make the context correct by replacing new_<parents> with the generated ID
+      // Make the context correct by replacing <parents> with the generated ID
       // of each of the parent objects
-      var context = ($(link).closest('.fields').closestChild('input, textarea').eq(0).attr('name') || '').replace(new RegExp('\[[a-z]+\]$'), '');
+      var context = ($(link).closest('.fields').closestChild('input, textarea, select').eq(0).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]
+      // project[tasks_attributes][1255929127459][assignments_attributes][1255929128105]
       // or for an edit form:
       // project[tasks_attributes][0][assignments_attributes][1]
       if (context) {
         var parentNames = context.match(/[a-z_]+_attributes/g) || [];
-        var parentIds   = context.match(/(new_)?[0-9]+/g) || [];
+        var parentIds   = context.match(/[0-9]+/g) || [];
 
         for(var i = 0; i < parentNames.length; i++) {
           if(parentIds[i]) {
@@ -39,7 +40,7 @@ jQuery(function($) {
       // Make a unique ID for the new child
       var regexp  = new RegExp('new_' + assoc, 'g');
       var new_id  = new Date().getTime();
-      content     = content.replace(regexp, "new_" + new_id);
+      content     = content.replace(regexp, new_id);
 
       var field = this.insertFields(content, assoc, link);
       // bubble up event upto document (through form)
@@ -69,9 +70,11 @@ jQuery(function($) {
   };
 
   window.nestedFormEvents = new NestedFormEvents();
-  $('form a.add_nested_fields').live('click', nestedFormEvents.addFields);
-  $('form a.remove_nested_fields').live('click', nestedFormEvents.removeFields);
+  $(document)
+    .delegate('form a.add_nested_fields',    'click', nestedFormEvents.addFields)
+    .delegate('form a.remove_nested_fields', 'click', nestedFormEvents.removeFields);
 });
+
 // http://plugins.jquery.com/project/closestChild
 /*
  * Copyright 2011, Tobias Lindig

data/vendor/assets/javascripts/prototype_nested_form.js

@@ -1,20 +1,21 @@
 document.observe('click', function(e, el) {
   if (el = e.findElement('form a.add_nested_fields')) {
     // Setup
-    var assoc   = el.readAttribute('data-association');           // Name of child
-    var content = $(assoc + '_fields_blueprint').innerHTML; // Fields template
+    var assoc     = el.readAttribute('data-association');      // Name of child
+    var blueprint = $(el.readAttribute('data-blueprint-id'));
+    var content   = blueprint.readAttribute('data-blueprint'); // Fields template
 
-    // Make the context correct by replacing new_<parents> with the generated ID
+    // Make the context correct by replacing <parents> with the generated ID
     // of each of the parent objects
-    var context = (el.getOffsetParent('.fields').firstDescendant().readAttribute('name') || '').replace(new RegExp('\[[a-z]+\]$'), '');
+    var context = (el.getOffsetParent('.fields').firstDescendant().readAttribute('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]
+    // project[tasks_attributes][1255929127459][assignments_attributes][1255929128105]
     // or for an edit form:
     // project[tasks_attributes][0][assignments_attributes][1]
     if(context) {
       var parent_names = context.match(/[a-z_]+_attributes/g) || [];
-      var parent_ids   = context.match(/(new_)?[0-9]+/g) || [];
+      var parent_ids   = context.match(/[0-9]+/g) || [];
 
       for(i = 0; i < parent_names.length; i++) {
         if(parent_ids[i]) {
@@ -32,7 +33,7 @@ document.observe('click', function(e, el) {
     // Make a unique ID for the new child
     var regexp  = new RegExp('new_' + assoc, 'g');
     var new_id  = new Date().getTime();
-    content     = content.replace(regexp, "new_" + new_id);
+    content     = content.replace(regexp, new_id);
 
     var field = el.insert({ before: content });
     field.fire('nested:fieldAdded', {field: field});

metadata

@@ -1,90 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: nested_form
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 3
-  version: 0.2.3
 platform: ruby
-authors: 
+authors:
 - Ryan Bates
 - Andrea Singh
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-23 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: Gem to conveniently handle multiple models in a single form with Rails 3 and jQuery or Prototype.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Gem to conveniently handle multiple models in a single form with Rails
+  3 and jQuery or Prototype.
 email: ryan@railscasts.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/generators/nested_form/install_generator.rb
 - lib/nested_form/builder_mixin.rb
 - lib/nested_form/builders.rb
@@ -161,7 +159,6 @@ files:
 - spec/dummy/tmp/cache/assets/E54/400/sprockets%2Fd0cbc16cc37efcf9dc41f242b5dbbf81
 - spec/dummy/tmp/cache/assets/EB7/AB0/sprockets%2F801d29a5debdbfbfb4eef14d70d9bcdb
 - spec/dummy/tmp/cache/assets/F48/5E0/sprockets%2F26cd6ffcffbebbe2fd6cd1a8f0c2debc
-- spec/dummy/tmp/capybara/capybara-201208212241496415482929.html
 - spec/events_spec.rb
 - spec/form_spec.rb
 - spec/nested_form/builder_spec.rb
@@ -170,45 +167,33 @@ files:
 - vendor/assets/javascripts/jquery_nested_form.js
 - vendor/assets/javascripts/prototype_nested_form.js
 - CHANGELOG.rdoc
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - Rakefile
 - README.md
-has_rdoc: true
 homepage: http://github.com/ryanb/nested_form
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 19
-      segments: 
-      - 1
-      - 3
-      - 4
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.4
 requirements: []
-
 rubyforge_project: nested_form
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Gem to conveniently handle multiple models in a single form.
 test_files: []
-

data/spec/dummy/tmp/capybara/capybara-201208212241496415482929.html

@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-  <title>Dummy</title>
-
-    <script type="text/javascript" src="/assets/jquery.js"></script>
-<script type="text/javascript" src="/assets/jquery_nested_form.js"></script>
-<script type="text/javascript" src="/assets/jquery_events_test.js"></script>
-</head>
-<body>
-
-<form method="post" id="new_project" class="new_project" action="/projects" accept-charset="UTF-8"><div style="margin:0;padding:0;display:inline"><input type="hidden" value="✓" name="utf8" /></div>    <div class="fields">        <div class="fields">
-      <input type="text" size="30" name="project[tasks_attributes][new_1345578109395][milestones_attributes][new_1345578109485][name]" id="project_tasks_attributes_new_1345578109395_tasks_milestones_attributes_new_1345578109485_name" />
-      <input type="hidden" value="false" name="project[tasks_attributes][new_1345578109395][milestones_attributes][new_1345578109485][_destroy]" id="project_tasks_attributes_new_1345578109395_tasks_milestones_attributes_new_1345578109485__destroy" /><a data-association="milestones" class="remove_nested_fields" href="javascript:void(0)">Remove milestone</a>
-</div><div class="fields">
-      <input type="text" size="30" name="project[tasks_attributes][new_1345578109395][milestones_attributes][new_1345578109485][name]" id="project_tasks_attributes_new_1345578109395_tasks_milestones_attributes_new_1345578109485_milestones_name" />
-      <input type="hidden" value="false" name="project[tasks_attributes][new_1345578109395][milestones_attributes][new_1345578109485][_destroy]" id="project_tasks_attributes_new_1345578109395_tasks_milestones_attributes_new_1345578109485_milestones__destroy" /><a data-association="milestones" class="remove_nested_fields" href="javascript:void(0)">Remove milestone</a>
-</div><a data-association="milestones" class="add_nested_fields" href="javascript:void(0)">Add new milestone</a>
-    <input type="hidden" value="false" name="project[tasks_attributes][new_1345578109395][_destroy]" id="project_tasks_attributes_new_1345578109395__destroy" /><a data-association="tasks" class="remove_nested_fields" href="javascript:void(0)">Remove</a>
-</div><a data-association="tasks" class="add_nested_fields" href="javascript:void(0)">Add new task</a>
-</form><div style="display: none" id="tasks_fields_blueprint"><div class="fields">        <a data-association="milestones" class="add_nested_fields" href="javascript:void(0)">Add new milestone</a>
-    <input type="hidden" value="false" name="project[tasks_attributes][new_tasks][_destroy]" id="project_tasks_attributes_new_tasks__destroy" /><a data-association="tasks" class="remove_nested_fields" href="javascript:void(0)">Remove</a>
-</div></div> <div style="display: none" id="milestones_fields_blueprint"><div class="fields">
-      <input type="text" size="30" name="project[tasks_attributes][new_tasks][milestones_attributes][new_milestones][name]" id="project_tasks_attributes_new_tasks_milestones_attributes_new_milestones_name" />
-      <input type="hidden" value="false" name="project[tasks_attributes][new_tasks][milestones_attributes][new_milestones][_destroy]" id="project_tasks_attributes_new_tasks_milestones_attributes_new_milestones__destroy" /><a data-association="milestones" class="remove_nested_fields" href="javascript:void(0)">Remove milestone</a>
-</div></div>
-
-<div id="console"><p>Added some field</p><p>Added task field</p><p>Added some field</p><p>Added milestone field</p><p>Added some field</p><p>Added milestone field</p></div>
-
-
-
-</body></html>