Added RegEx to solve issues #26 and #30

Author: eljuanchosf

CHANGELOG.rdoc

@@ -1,4 +1,6 @@
-0.1.0 (March 26, 2011)
+0.1.1 (April 18, 2011)
+
+* Added new RegEx to generate new objects IDs correctly - issue #26 and issue #30
 
 * Prefix new records with "new_" so there's no possible conflict with existing records - issue #21
 

README.rdoc

@@ -4,6 +4,9 @@ This is a Rails gem for conveniently manage multiple nested models in a single f
 
 This gem only works with Rails 3. See the {rails2 branch}[https://github.com/ryanb/nested_form/tree/rails2] for a plugin to work in Rails 2.
 
+== My fork
+
+This forks solves issues #26 and #30.
 
 == Setup
 
@@ -57,6 +60,8 @@ If you are using jQuery, <tt>nested:fieldAdded</tt> and <tt>nested:fieldRemoved<
 
 == Special Thanks
 
+First of all, thanks ro Ryan Bates for this gem. Awesome work.
+
 This gem was originally based on the solution by Tim Riley in his {complex-form-examples fork}[https://github.com/timriley/complex-form-examples/tree/unobtrusive-jquery-deep-fix2].
 
 Thank you Andrew Manshin for the Rails 3 transition, {Andrea Singh}[https://github.com/madebydna] for converting to a gem and {Peter Giacomo Lombardo}[https://github.com/pglombardo] for Prototype support.

lib/generators/nested_form/templates/jquery_nested_form.js

@@ -18,10 +18,13 @@ jQuery(function($) {
 
       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] + ']'
-          )
+            '$1[' + parent_ids[i] + ']');
         }
       }
     }

lib/generators/nested_form/templates/prototype_nested_form.js

@@ -17,12 +17,15 @@ document.observe('click', function(e, el) {
 	    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] + ']'
-	        )
-	      }
+        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] + ']');
+        }
 	    }
 	  }