bbenezech-nested_form 0.0.3 → 0.0.4

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+0.0.4
+
+Vendor added in gemspec (0.2.0 in Ryanb)
+
 0.0.3
 
 Added id (generated from name) to top-level wrapper for cleaner JS manipulation
@@ -10,12 +14,26 @@ Added a class on blueprint div so that it is possible for javascript to know if
 
 Initial release of the @fxposter version
 
+
+Below is Ryanb's changelog
+
+0.2.0 (February 7, 2012)
+
+* Integration tests (thanks fxposter) - issue #58
+
+* Improved simple_form and 3.1 support (thanks fxposter)
+
+* nested:fieldAdded event includes the newly added field (thanks harrigan)
+
+* other minor bug fixes
+
 0.1.1 (April 23, 2011)
 
 * Support HTML options and block in add/remove link - issue #31
 
 * Added new RegEx to generate new objects IDs correctly - issue #26 and issue #30
 
+
 0.1.0 (March 26, 2011)
 
 * Prefix new records with "new_" so there's no possible conflict with existing records - issue #21

data/vendor/assets/javascripts/jquery_nested_form.js

@@ -0,0 +1,71 @@
+jQuery(function($) {
+  window.NestedFormEvents = function() {
+    this.addFields = $.proxy(this.addFields, this);
+    this.removeFields = $.proxy(this.removeFields, this);
+  };
+
+  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
+
+      // Make the context correct by replacing new_<parents> with the generated ID
+      // of each of the parent objects
+      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]
+      // 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) || [];
+
+        for(var i = 0; i < parentNames.length; i++) {
+          if(parentIds[i]) {
+            content = content.replace(
+              new RegExp('(_' + parentNames[i] + ')_.+?_', 'g'),
+              '$1_' + parentIds[i] + '_');
+
+            content = content.replace(
+              new RegExp('(\\[' + parentNames[i] + '\\])\\[.+?\\]', 'g'),
+              '$1[' + parentIds[i] + ']');
+          }
+        }
+      }
+
+      // 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);
+
+      var field = this.insertFields(content, assoc, link);
+      $(link).closest("form")
+        .trigger({ type: 'nested:fieldAdded', field: field })
+        .trigger({ type: 'nested:fieldAdded:' + assoc, field: field });
+      return false;
+    },
+    insertFields: function(content, assoc, link) {
+      return $(content).insertBefore(link);
+    },
+    removeFields: function(e) {
+      var link = e.currentTarget;
+      var hiddenField = $(link).prev('input[type=hidden]');
+      hiddenField.val('1');
+      // if (hiddenField) {
+      //   $(link).v
+      //   hiddenField.value = '1';
+      // }
+      var field = $(link).closest('.fields');
+      field.hide();
+      $(link).closest("form").trigger({ type: 'nested:fieldRemoved', field: field });
+      return false;
+    }
+  };
+
+  window.nestedFormEvents = new NestedFormEvents();
+  $('form a.add_nested_fields').live('click', nestedFormEvents.addFields);
+  $('form a.remove_nested_fields').live('click', nestedFormEvents.removeFields);
+});

data/vendor/assets/javascripts/prototype_nested_form.js

@@ -0,0 +1,51 @@
+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
+
+	  // Make the context correct by replacing new_<parents> with the generated ID
+	  // of each of the parent objects
+	  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]
+	  // 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) || [];
+
+	    for(i = 0; i < parent_names.length; i++) {
+        if(parent_ids[i]) {
+          content = content.replace(
+            new RegExp('(_' + parent_names[i] + ')_.+?_', 'g'),
+            '$1_' + parent_ids[i] + '_');
+
+          content = content.replace(
+            new RegExp('(\\[' + parent_names[i] + '\\])\\[.+?\\]', 'g'),
+            '$1[' + parent_ids[i] + ']');
+        }
+	    }
+	  }
+
+	  // 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);
+
+	  el.insert({ before: content });
+	  return false;
+	}
+});
+
+document.observe('click', function(e, el) {
+  	if (el = e.findElement('form a.remove_nested_fields')) {
+		var hidden_field = el.previous(0);
+		if(hidden_field) {
+		  hidden_field.value = '1';
+		}
+		el.ancestors()[0].hide();
+		return false;
+	}
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bbenezech-nested_form
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000 Z
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70185571726600 !ruby/object:Gem::Requirement
+  requirement: &70352126786760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70185571726600
+  version_requirements: *70352126786760
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70185571725940 !ruby/object:Gem::Requirement
+  requirement: &70352126786040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70185571725940
+  version_requirements: *70352126786040
 description: Gem to conveniently handle multiple models in a single form with Rails
   3 and jQuery or Prototype. Version maintained by fxposter.
 email: ryan@railscasts.com
@@ -94,6 +94,8 @@ files:
 - spec/nested_form/builder_spec.rb
 - spec/nested_form/view_helper_spec.rb
 - spec/spec_helper.rb
+- vendor/assets/javascripts/jquery_nested_form.js
+- vendor/assets/javascripts/prototype_nested_form.js
 - CHANGELOG.rdoc
 - LICENSE
 - Rakefile