nested_form 0.1.0 → 0.1.1

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+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/README.rdoc

@@ -4,6 +4,8 @@ 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.
 
+An example project showing how this works is available in the {complex-nested-forms/nested_form branch}[https://github.com/ryanb/complex-form-examples/tree/nested_form].
+
 
 == Setup
 
@@ -22,7 +24,11 @@ Running the generator will add a file at <tt>public/javascripts/nested_form.js</
 
 == Usage
 
-Use the +nested_form_for+ helper method to enable the nesting.
+Imagine you have a <tt>Project</tt> model that <tt>has_many :tasks</tt>. To be able to use this gem, you'll need to add <tt>accepts_nested_attributes_for :tasks</tt> to your Project model. If you don't have the <tt>accepts_nested_attributes_for :tasks</tt> you'll get a Missing Block Error.
+
+This will create a <tt>tasks_attributes=</tt> method, so you may need to add it to the <tt>attr_accessible</tt> array. (<tt>attr_accessible :tasks_attributes</tt>)
+
+Then use the +nested_form_for+ helper method to enable the nesting.
 
   <%= nested_form_for @project do |f| %>
 
@@ -41,16 +47,18 @@ It is often desirable to move the nested fields into a partial to keep things or
 
   <%= f.fields_for :tasks %>
 
-In this case it will look for a partial called "task_fields" and pass the form builder as an f variable to it.
+In this case it will look for a partial called "task_fields" and pass the form builder as an +f+ variable to it.
 
 
 == Events
 
-If you are using jQuery, <tt>nested:fieldAdded<tt> and <tt>nested:fieldRemoved</tt> events are triggered on the +form+ element after adding and removing fields.
+If you are using jQuery, <tt>nested:fieldAdded</tt> and <tt>nested:fieldRemoved</tt> events are triggered on the +form+ element after adding and removing fields.
 
 
 == 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.

data/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] + ']');
         }
       }
     }

data/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] + ']');
+        }
 	    }
 	  }
 

data/lib/nested_form/builder.rb

@@ -1,6 +1,23 @@
 module NestedForm
   class Builder < ::ActionView::Helpers::FormBuilder
-    def link_to_add(name, association)
+    # Adds a link to insert a new associated records. The first argument is the name of the link, the second is the name of the association.
+    #
+    #   f.link_to_add("Add Task", :tasks)
+    #
+    # You can pass HTML options in a hash at the end and a block for the content.
+    #
+    #   <%= f.link_to_add(:tasks, :class => "add_task", :href => new_task_path) do %>
+    #     Add Task
+    #   <% end %>
+    #
+    # See the README for more details on where to call this method.
+    def link_to_add(*args, &block)
+      options = args.extract_options!.symbolize_keys
+      association = args.pop
+      options[:class] = [options[:class], "add_nested_fields"].compact.join(" ")
+      options["data-association"] = association
+      args << (options.delete(:href) || "javascript:void(0)")
+      args << options
       @fields ||= {}
       @template.after_nested_form(association) do
         model_object = object.class.reflect_on_association(association).klass.new
@@ -9,11 +26,26 @@ module NestedForm
         output.safe_concat('</div>')
         output
       end
-      @template.link_to(name, "javascript:void(0)", :class => "add_nested_fields", "data-association" => association)
+      @template.link_to(*args, &block)
     end
 
-    def link_to_remove(name)
-      hidden_field(:_destroy) + @template.link_to(name, "javascript:void(0)", :class => "remove_nested_fields")
+    # Adds a link to remove the associated record. The first argment is the name of the link.
+    #
+    #   f.link_to_remove("Remove Task")
+    #
+    # You can pass HTML options in a hash at the end and a block for the content.
+    #
+    #   <%= f.link_to_remove(:class => "remove_task", :href => "#") do %>
+    #     Remove Task
+    #   <% end %>
+    #
+    # See the README for more details on where to call this method.
+    def link_to_remove(*args, &block)
+      options = args.extract_options!.symbolize_keys
+      options[:class] = [options[:class], "remove_nested_fields"].compact.join(" ")
+      args << (options.delete(:href) || "javascript:void(0)")
+      args << options
+      hidden_field(:_destroy) + @template.link_to(*args, &block)
     end
 
     def fields_for_with_nested_attributes(association_name, args, block)

data/lib/nested_form/view_helper.rb

@@ -14,7 +14,7 @@ module NestedForm
       @associations ||= []
       @after_nested_form_callbacks ||= []
       unless @associations.include?(association)
-        @associations << association 
+        @associations << association
         @after_nested_form_callbacks << block
       end
     end

data/spec/nested_form/builder_spec.rb

@@ -9,12 +9,16 @@ describe NestedForm::Builder do
       @builder = NestedForm::Builder.new(:item, @project, @template, {}, proc {})
     end
 
-    it "should have an add link" do
+    it "has an add link which behaves similar to a Rails link_to" do
       @builder.link_to_add("Add", :tasks).should == '<a href="javascript:void(0)" class="add_nested_fields" data-association="tasks">Add</a>'
+      @builder.link_to_add("Add", :tasks, :class => "foo", :href => "url").should == '<a href="url" class="foo add_nested_fields" data-association="tasks">Add</a>'
+      @builder.link_to_add(:tasks) { "Add" }.should == '<a href="javascript:void(0)" class="add_nested_fields" data-association="tasks">Add</a>'
     end
 
-    it "should have a remove link" do
+    it "has a remove link which behaves similar to a Rails link_to" do
       @builder.link_to_remove("Remove").should == '<input id="item__destroy" name="item[_destroy]" type="hidden" value="false" /><a href="javascript:void(0)" class="remove_nested_fields">Remove</a>'
+      @builder.link_to_remove("Remove", :class => "foo", :href => "url").should == '<input id="item__destroy" name="item[_destroy]" type="hidden" value="false" /><a href="url" class="foo remove_nested_fields">Remove</a>'
+      @builder.link_to_remove { "Remove" }.should == '<input id="item__destroy" name="item[_destroy]" type="hidden" value="false" /><a href="javascript:void(0)" class="remove_nested_fields">Remove</a>'
     end
 
     it "should wrap nested fields each in a div with class" do
@@ -31,6 +35,6 @@ describe NestedForm::Builder do
       @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>'
-    end 
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: nested_form
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ryan Bates
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-26 00:00:00 -07:00
+date: 2011-04-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency