nested_form 0.3.1 → 0.3.2

data/spec/form_spec.rb

@@ -47,4 +47,20 @@ describe 'NestedForm' do
     name = find('.fields .fields input[id$=name]')[:name]
     name.should match(/\Aproject\[tasks_attributes\]\[\d+\]\[milestones_attributes\]\[\d+\]\[name\]\z/)
   end
+
+  it 'generates correct name for the nested input (has_one => has_many)', :js => true do
+    visit '/companies/new?type=jquery'
+    click_link 'Add new task'
+    name = find('.fields .fields input[id$=name]')[:name]
+    name.should match(/\Acompany\[project_attributes\]\[tasks_attributes\]\[\d+\]\[name\]\z/)
+  end
+
+  it 'generates correct name for the nested input (has_one => has_many => has_many)', :js => true do
+    visit '/companies/new?type=jquery'
+    click_link 'Add new task'
+    click_link 'Add new milestone'
+    name = find('.fields .fields .fields input[id$=name]')[:name]
+    name.should match(/\Acompany\[project_attributes\]\[tasks_attributes\]\[\d+\]\[milestones_attributes\]\[\d+\]\[name\]\z/)
+  end
+
 end

data/spec/nested_form/builder_spec.rb

@@ -138,6 +138,18 @@ require "spec_helper"
 
         output.should match(/div.+data-blueprint="Task"/)
       end
+
+      it "doesn't render wrapper with nested_wrapper option" do
+        task = project.tasks.build
+        fields = subject.fields_for(:tasks, :nested_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

data/spec/nested_form/view_helper_spec.rb

@@ -48,8 +48,19 @@ describe NestedForm::ViewHelper do
   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") }
-    _view.nested_form_for(Project.new) {}
-    _view.output_buffer.should include("123456")
+    result = _view.nested_form_for(Project.new) {}
+    result.should include("123456")
+  end
+
+  if Rails.version >= "3.1.0"
+    it "should set multipart when there's a file field" do
+      _view.nested_form_for(Project.new) do |f|
+        f.fields_for(:tasks) do |t|
+          t.file_field :file
+        end
+        f.link_to_add "Add", :tasks
+      end.should include(" enctype=\"multipart/form-data\" ")
+    end
   end
 end
 

data/vendor/assets/javascripts/jquery_nested_form.js

@@ -1,4 +1,4 @@
-jQuery(function($) {
+(function($) {
   window.NestedFormEvents = function() {
     this.addFields = $.proxy(this.addFields, this);
     this.removeFields = $.proxy(this.removeFields, this);
@@ -21,7 +21,7 @@ jQuery(function($) {
       // or for an edit form:
       // project[tasks_attributes][0][assignments_attributes][1]
       if (context) {
-        var parentNames = context.match(/[a-z_]+_attributes/g) || [];
+        var parentNames = context.match(/[a-z_]+_attributes(?=\]\[(new_)?\d+\])/g) || [];
         var parentIds   = context.match(/[0-9]+/g) || [];
 
         for(var i = 0; i < parentNames.length; i++) {
@@ -39,8 +39,8 @@ 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_id);
+      var new_id  = this.newId();
+      content     = $.trim(content.replace(regexp, new_id));
 
       var field = this.insertFields(content, assoc, link);
       // bubble up event upto document (through form)
@@ -49,8 +49,16 @@ jQuery(function($) {
         .trigger({ type: 'nested:fieldAdded:' + assoc, field: field });
       return false;
     },
+    newId: function() {
+      return new Date().getTime();
+    },
     insertFields: function(content, assoc, link) {
-      return $(content).insertBefore(link);
+      var target = $(link).data('target');
+      if (target) {
+        return $(content).appendTo($(target));
+      } else {
+        return $(content).insertBefore(link);
+      }
     },
     removeFields: function(e) {
       var $link = $(e.currentTarget),
@@ -73,7 +81,7 @@ jQuery(function($) {
   $(document)
     .delegate('form a.add_nested_fields',    'click', nestedFormEvents.addFields)
     .delegate('form a.remove_nested_fields', 'click', nestedFormEvents.removeFields);
-});
+})(jQuery);
 
 // http://plugins.jquery.com/project/closestChild
 /*

data/vendor/assets/javascripts/prototype_nested_form.js

@@ -2,6 +2,7 @@ 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 target    = el.readAttribute('data-target');
     var blueprint = $(el.readAttribute('data-blueprint-id'));
     var content   = blueprint.readAttribute('data-blueprint'); // Fields template
 
@@ -14,7 +15,7 @@ document.observe('click', function(e, el) {
     // 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_names = context.match(/[a-z_]+_attributes(?=\]\[(new_)?\d+\])/g) || [];
       var parent_ids   = context.match(/[0-9]+/g) || [];
 
       for(i = 0; i < parent_names.length; i++) {
@@ -35,7 +36,12 @@ document.observe('click', function(e, el) {
     var new_id  = new Date().getTime();
     content     = content.replace(regexp, new_id);
 
-    var field = el.insert({ before: content });
+    var field;
+    if (target) {
+      field = $$(target)[0].insert(content);
+    } else {
+      field = el.insert({ before: content });
+    }
     field.fire('nested:fieldAdded', {field: field});
     field.fire('nested:fieldAdded:' + assoc, {field: field});
     return false;

metadata

@@ -2,7 +2,7 @@
 name: nested_form
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ryan Bates
@@ -10,10 +10,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
   type: :development
   requirement: !ruby/object:Gem::Requirement
     none: false
@@ -21,6 +20,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -29,7 +29,6 @@ dependencies:
         version: '0'
   name: rake
 - !ruby/object:Gem::Dependency
-  prerelease: false
   type: :development
   requirement: !ruby/object:Gem::Requirement
     none: false
@@ -37,6 +36,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -45,7 +45,6 @@ dependencies:
         version: '0'
   name: bundler
 - !ruby/object:Gem::Dependency
-  prerelease: false
   type: :development
   requirement: !ruby/object:Gem::Requirement
     none: false
@@ -53,6 +52,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -61,7 +61,6 @@ dependencies:
         version: '2.6'
   name: rspec-rails
 - !ruby/object:Gem::Dependency
-  prerelease: false
   type: :development
   requirement: !ruby/object:Gem::Requirement
     none: false
@@ -69,6 +68,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,6 +76,22 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: mocha
+- !ruby/object:Gem::Dependency
+  type: :development
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  name: capybara
 description: Gem to conveniently handle multiple models in a single form with Rails
   3 and jQuery or Prototype.
 email: ryan@railscasts.com
@@ -83,93 +99,100 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/generators/nested_form/install_generator.rb
+- lib/nested_form.rb
+- lib/nested_form/view_helper.rb
 - lib/nested_form/builder_mixin.rb
 - lib/nested_form/builders.rb
 - lib/nested_form/engine.rb
-- lib/nested_form/view_helper.rb
-- lib/nested_form.rb
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/javascripts/jquery.js
+- lib/generators/nested_form/install_generator.rb
+- spec/form_spec.rb
+- spec/events_spec.rb
+- spec/dummy/config.ru
+- spec/dummy/script/rails
+- spec/dummy/test/functional/projects_controller_test.rb
+- spec/dummy/test/unit/helpers/projects_helper_test.rb
+- spec/dummy/public/404.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/422.html
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/helpers/projects_helper.rb
+- spec/dummy/app/models/project.rb
+- spec/dummy/app/models/company.rb
+- spec/dummy/app/models/project_task.rb
+- spec/dummy/app/models/task.rb
+- spec/dummy/app/models/milestone.rb
+- spec/dummy/app/assets/javascripts/prototype.js
+- spec/dummy/app/assets/javascripts/projects.js
+- spec/dummy/app/assets/javascripts/prototype_nested_form.js
 - spec/dummy/app/assets/javascripts/jquery_events_test.js
 - spec/dummy/app/assets/javascripts/jquery_nested_form.js
-- spec/dummy/app/assets/javascripts/projects.js
-- spec/dummy/app/assets/javascripts/prototype.js
+- spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/javascripts/prototype_events_test.js
-- spec/dummy/app/assets/javascripts/prototype_nested_form.js
+- spec/dummy/app/assets/javascripts/jquery.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/assets/stylesheets/projects.css
+- spec/dummy/app/assets/stylesheets/companies.css
+- spec/dummy/app/views/projects/without_intermediate_inputs.html.erb
+- spec/dummy/app/views/projects/new.html.erb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/companies/new.html.erb
+- spec/dummy/app/controllers/companies_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/projects_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/helpers/projects_helper.rb
-- spec/dummy/app/models/milestone.rb
-- spec/dummy/app/models/project.rb
-- spec/dummy/app/models/project_task.rb
-- spec/dummy/app/models/task.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/projects/new.html.erb
-- spec/dummy/app/views/projects/without_intermediate_inputs.html.erb
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config.ru
-- spec/dummy/db/migrate/20110710143903_initial_tables.rb
-- spec/dummy/db/migrate/20120819164528_add_association_with_class_name.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/log/test.log
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/Rakefile
-- spec/dummy/script/rails
-- spec/dummy/test/functional/projects_controller_test.rb
-- spec/dummy/test/unit/helpers/projects_helper_test.rb
-- spec/dummy/tmp/cache/assets/C99/4D0/sprockets%2F5e30a6b911437f1428dc32c3ae182123
-- spec/dummy/tmp/cache/assets/C99/7D0/sprockets%2F79513e6956e0ee8624976e041fd5636d
-- spec/dummy/tmp/cache/assets/CAA/C90/sprockets%2F1e6c8ee1258009385ccf5b84015424b3
-- spec/dummy/tmp/cache/assets/CB2/CB0/sprockets%2F11cc8d161d71a716dd36f16849d90870
+- spec/dummy/log/development.log
+- spec/dummy/tmp/cache/assets/F48/5E0/sprockets%2F26cd6ffcffbebbe2fd6cd1a8f0c2debc
+- spec/dummy/tmp/cache/assets/D87/1F0/sprockets%2F61c9ceafb877fb740c67416ff6f782a9
 - spec/dummy/tmp/cache/assets/CB7/7F0/sprockets%2Fac97b043470f6fcc925c352f16956643
-- spec/dummy/tmp/cache/assets/CDB/8A0/sprockets%2Faed2a2575c376263c26e93b56b57051d
-- spec/dummy/tmp/cache/assets/D1F/A10/sprockets%2F60317e62cb324bfd9987e8da9636fd06
 - spec/dummy/tmp/cache/assets/D49/870/sprockets%2F90896142645585acc8baf56ad57e3afb
-- spec/dummy/tmp/cache/assets/D62/F00/sprockets%2F6ac03a007f26b1c18ed3d53498ad3eb8
-- spec/dummy/tmp/cache/assets/D79/BC0/sprockets%2F85a1db977361cc5130fcefb4637ff67e
-- spec/dummy/tmp/cache/assets/D87/1F0/sprockets%2F61c9ceafb877fb740c67416ff6f782a9
+- spec/dummy/tmp/cache/assets/E54/400/sprockets%2Fd0cbc16cc37efcf9dc41f242b5dbbf81
 - spec/dummy/tmp/cache/assets/DAD/4F0/sprockets%2F765acd1bf68dc90f7d3e61da78b1e659
+- spec/dummy/tmp/cache/assets/E3A/A60/sprockets%2F7c72c96cfc66454caf5fc8ca0fedd4f3
+- spec/dummy/tmp/cache/assets/CB2/CB0/sprockets%2F11cc8d161d71a716dd36f16849d90870
+- spec/dummy/tmp/cache/assets/D62/F00/sprockets%2F6ac03a007f26b1c18ed3d53498ad3eb8
 - spec/dummy/tmp/cache/assets/E03/3F0/sprockets%2F82b37ae9eccec44c1ef44cfdd07d8534
+- spec/dummy/tmp/cache/assets/CDB/8A0/sprockets%2Faed2a2575c376263c26e93b56b57051d
+- spec/dummy/tmp/cache/assets/D1F/A10/sprockets%2F60317e62cb324bfd9987e8da9636fd06
 - spec/dummy/tmp/cache/assets/E0A/CA0/sprockets%2F7fe72ac1c0db1a7e8e7f59cf25e8a39e
-- spec/dummy/tmp/cache/assets/E3A/A60/sprockets%2F7c72c96cfc66454caf5fc8ca0fedd4f3
-- 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/events_spec.rb
-- spec/form_spec.rb
-- spec/nested_form/builder_spec.rb
-- spec/nested_form/view_helper_spec.rb
+- spec/dummy/tmp/cache/assets/D79/BC0/sprockets%2F85a1db977361cc5130fcefb4637ff67e
+- spec/dummy/tmp/cache/assets/C99/4D0/sprockets%2F5e30a6b911437f1428dc32c3ae182123
+- spec/dummy/tmp/cache/assets/C99/7D0/sprockets%2F79513e6956e0ee8624976e041fd5636d
+- spec/dummy/tmp/cache/assets/CAA/C90/sprockets%2F1e6c8ee1258009385ccf5b84015424b3
+- spec/dummy/Rakefile
+- spec/dummy/db/development.sqlite3
+- spec/dummy/db/schema.rb
+- spec/dummy/db/migrate/20120819164528_add_association_with_class_name.rb
+- spec/dummy/db/migrate/20110710143903_initial_tables.rb
+- spec/dummy/db/migrate/20130203095901_create_company.rb
+- spec/dummy/db/test.sqlite3
+- spec/dummy/config/database.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/boot.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/spec_helper.rb
-- vendor/assets/javascripts/jquery_nested_form.js
+- spec/nested_form/view_helper_spec.rb
+- spec/nested_form/builder_spec.rb
 - vendor/assets/javascripts/prototype_nested_form.js
+- vendor/assets/javascripts/jquery_nested_form.js
 - CHANGELOG.rdoc
+- LICENSE
+- README.md
 - CONTRIBUTING.md
 - Gemfile
-- LICENSE
 - Rakefile
-- README.md
 homepage: http://github.com/ryanb/nested_form
 licenses: []
 post_install_message: