simple_nested_form 0.0.1 → 0.0.2

data/lib/generators/simple_nested_form/templates/simple_nested_form.js

@@ -1,5 +1,11 @@
 jQuery(function($) {
-  $("form a.add_nested_fields").live("click", function() {
+  function fire(obj, name, data) {
+    var event = new $.Event(name);
+    obj.trigger(event, data);
+    return event.result !== false;
+  }
+
+  $("form").delegate("a[data-association]", "click", function() {
     var association = $(this).attr("data-association");
     var content     = $("#" + association + "_fields_blueprint").html();
 
@@ -21,18 +27,31 @@ jQuery(function($) {
 
     content = content.replace(new RegExp("new_" + association, "g"), new Date().getTime());
 
-    $(this).before(content);
+    if(fire($(this), 'nestedFields:beforeAdd', [content, association])) {
+      $(this).before(content);
+      $(this).trigger('nestedFields:afterAdd', [$(this).prev(), association]);
+    }
+
     return false;
   });
 
-  $("form a.remove_nested_fields").live("click", function() {
+  $("form").delegate("a[data-remove-association]", "click", function() {
     var destroyField = $(this).prev("input[type=hidden]")[0];
+    var element = $(this).closest(".fields");
 
-    if (destroyField) {
-      destroyField.value = "1";
+    if(fire($(this), "nestedFields:beforeRemove", [element])) {
+      if (destroyField) {
+        destroyField.value = "1";
+      }
+
+      var waitForPossibleAnimations = setInterval(function() {
+        if(!element.is(":animated")) {
+          clearInterval(waitForPossibleAnimations);
+          element.hide();
+        }
+      }, 100);
     }
 
-    $(this).closest(".fields").hide();
     return false;
   });
 });

data/lib/simple_nested_form/builder.rb

@@ -1,8 +1,19 @@
 module SimpleNestedForm
   class Builder < ::SimpleForm::FormBuilder
-    delegate :content_tag, :link_to, :after_nested_form, :to => :@template
+    delegate :content_tag, :link_to, :after_nested_form, :capture, :to => :@template
+
+    def link_to_add(*args, &block)
+      if block_given?
+        association = args.first
+        options     = args.second || {}
+      else
+        name        = args.first
+        association = args.second
+        options     = args.third || {}
+      end
+
+      options.merge!(:"data-association" => association)
 
-    def link_to_add(name, association)
       after_nested_form(association) do
         model_object = object.class.reflect_on_association(association).klass.new
 
@@ -11,11 +22,28 @@ module SimpleNestedForm
         end
       end
 
-      link_to(name, "javascript:void(0)", :class => "add_nested_fields", :"data-association" => association)
+      if block_given?
+        link_to(capture(&block), "javascript:void(0)", options)
+      else
+        link_to(name, "javascript:void(0)", options)
+      end
     end
 
-    def link_to_remove(name = "remove")
-      hidden_field(:_destroy) + link_to(name, "javascript:void(0)" , :class => "remove_nested_fields")
+    def link_to_remove(*args, &block)
+      if block_given?
+        options = args.first || {}
+      else
+        name    = args.first
+        options = args.second || {}
+      end
+
+      options.merge!(:"data-remove-association" => 1)
+
+      hidden_field(:_destroy) + if block_given?
+        link_to(capture(&block), "javascript:void(0)", options)
+      else
+        link_to(name, "javascript:void(0)", options)
+      end
     end
 
     def fields_for(record_or_name_or_array, *args, &block)

data/lib/simple_nested_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleNestedForm
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/simple_nested_form/builder_spec.rb

@@ -16,35 +16,75 @@ describe SimpleNestedForm::Builder do
     end
   end
 
-  describe "link to add" do
-    subject { Nokogiri::HTML(builder.link_to_add("Add me plz", :tasks)).css("a").first }
+  shared_examples_for "a link_to_add" do |link_name|
+    let(:link) { builder.link_to_add(link_name, :tasks, :class => "add") }
 
-    its(:text) { should == "Add me plz" }
+    subject { Nokogiri::HTML(link).css("a").first }
 
-    it "contains a class named add_nested_fields" do
-      subject.attr("class").should include "add_nested_fields"
-    end
+    its(:text) { should == link_name }
 
     it "contains an attribute named data-association" do
       subject.attr("data-association").should == "tasks"
     end
+
+    describe "options" do
+      it "contains a class named add" do
+        subject.attr("class").should include "add"
+      end
+    end
   end
 
-  describe "link to remove" do
-    let(:output) { Nokogiri::HTML(builder.link_to_remove("Remove me plz")) }
+  shared_examples_for "a link_to_remove" do |link_name|
+    let(:link) { builder.link_to_remove(link_name, :class => "remove") }
 
-    describe "the link itself" do
-      subject { output.css("a").first }
+    subject { Nokogiri::HTML(link).css("a").first }
 
-      its(:text) { should == "Remove me plz" }
+    its(:text) { should == link_name }
 
-      it "contains a class named remove_nested_fields" do
-        subject.attr("class").should include "remove_nested_fields"
-      end
+    it "contains an attribute named data-remove-association" do
+      subject.attr("data-remove-association").should be_present
     end
 
     it "generate a destroy hidden field" do
-      output.css("input[type='hidden'][name*='_destroy']").should have(1).element
+      Nokogiri::HTML(link).css("input[type='hidden'][name*='_destroy']").should have(1).element
+    end
+
+    describe "options" do
+      it "contains a class named add" do
+        subject.attr("class").should include "remove"
+      end
+    end
+  end
+
+  describe "link to add" do
+    context "without a block" do
+      it_should_behave_like "a link_to_add", "Add me plz" do
+        let(:link) { builder.link_to_add("Add me plz", :tasks, :class => "add") }
+      end
+    end
+    
+    context "with a block" do
+      it_should_behave_like "a link_to_add", "A label in a block baby!" do
+        let(:link) do
+          builder.link_to_add(:tasks, :class => "add") { "A label in a block baby!" }
+        end
+      end
+    end
+  end
+
+  describe "link to remove" do
+    context "without a block" do
+      it_should_behave_like "a link_to_remove", "Remove me plz" do
+        let(:link) { builder.link_to_remove("Remove me plz", :class => "remove") }
+      end
+    end
+    
+    context "with a block" do
+      it_should_behave_like "a link_to_remove", "Remove me plz" do
+        let(:link) do
+          builder.link_to_remove(:class => "remove") { "Remove me plz" }
+        end
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_nested_form
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Rodrigo Navarro
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 -03:00
+date: 2011-03-08 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency