cocoon 1.0.3 → 1.0.4

data/README.markdown

@@ -124,6 +124,15 @@ It takes four parameters:
 
 Optionally you could also leave out the name and supply a block that is captured to give the name (if you want to do something more complicated).
 
+There is an option to add a callback on insertion. The callback can be added as follows:
+
+    $("#todo_tasks a.add_fields").
+      data("insertion-callback",
+         function() {
+           $(this).find("textarea").autoResize({extraSpace:0}).change();
+         });
+
+
 ### link_to_remove_association
 
 This function will add a link to your markup that will, when clicked, dynamically remove the surrounding partial form.

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/cocoon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cocoon}
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Van der Auwera"]
-  s.date = %q{2011-03-15}
+  s.date = %q{2011-04-25}
   s.description = %q{Unobtrusive nested forms handling, using jQuery. Use this and discover cocoon-heaven.}
   s.email = %q{nathan@dixis.com}
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "spec/dummy/app/controllers/application_controller.rb",
      "spec/dummy/app/helpers/application_helper.rb",
      "spec/dummy/app/models/comment.rb",
+     "spec/dummy/app/models/person.rb",
      "spec/dummy/app/models/post.rb",
      "spec/dummy/app/views/layouts/application.html.erb",
      "spec/dummy/config.ru",
@@ -52,6 +53,7 @@ Gem::Specification.new do |s|
      "spec/dummy/config/routes.rb",
      "spec/dummy/db/migrate/20110306212208_create_posts.rb",
      "spec/dummy/db/migrate/20110306212250_create_comments.rb",
+     "spec/dummy/db/migrate/20110420222224_create_people.rb",
      "spec/dummy/db/schema.rb",
      "spec/dummy/public/404.html",
      "spec/dummy/public/422.html",
@@ -76,6 +78,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/spec_helper.rb",
      "spec/dummy/app/controllers/application_controller.rb",
+     "spec/dummy/app/models/person.rb",
      "spec/dummy/app/models/comment.rb",
      "spec/dummy/app/models/post.rb",
      "spec/dummy/app/helpers/application_helper.rb",
@@ -93,6 +96,7 @@ Gem::Specification.new do |s|
      "spec/dummy/config/boot.rb",
      "spec/dummy/db/schema.rb",
      "spec/dummy/db/migrate/20110306212208_create_posts.rb",
+     "spec/dummy/db/migrate/20110420222224_create_people.rb",
      "spec/dummy/db/migrate/20110306212250_create_comments.rb",
      "spec/cocoon_spec.rb",
      "spec/integration/navigation_spec.rb"

data/lib/cocoon/view_helpers.rb

@@ -59,6 +59,7 @@ module Cocoon
 
         html_options[:class] = [html_options[:class], "add_fields"].compact.join(' ')
         html_options[:'data-association'] = association.to_s.singularize
+        html_options[:'data-associations'] = association.to_s.pluralize
 
         new_object = f.object.class.reflect_on_association(association).klass.new
         html_options[:'data-template'] = CGI.escapeHTML(render_association(association, f, new_object))

data/lib/generators/cocoon/install/templates/cocoon.js

@@ -1,28 +1,48 @@
 $(document).ready(function() {
 
+  function replace_in_content(content, regexp_str, with_str) {
+      reg_exp = new RegExp(regexp_str);
+      content.replace(reg_exp, with_str)
+  }
+
+
   $('.add_fields').live('click', function() {
     var assoc   = $(this).attr('data-association');
+    var assocs  = $(this).attr('data-associations');
     var content = $(this).attr('data-template');
     var insertionPosition = $(this).attr('data-association-insertion-position');
     var insertionNode = $(this).attr('data-association-insertion-node');
+    var insertionCallback = $(this).data('insertion-callback');
     var regexp_braced = new RegExp('\\[new_' + assoc + '\\]', 'g');
+    var regexp_underscord = new RegExp('_new_' + assoc + '_', 'g');
     var new_id  = new Date().getTime();
+    var newcontent_braced = '[' + new_id + ']';
+    var newcontent_underscord = '_' + new_id + '_';
     var new_content = content.replace(regexp_braced, '[' + new_id + ']');
     if (new_content == content) {
-        regexp_braced = new RegExp('\\[new_' + assoc + 's\\]', 'g');
+        regexp_braced = new RegExp('\\[new_' + assocs + '\\]', 'g');
+        regexp_underscord = new RegExp('_new_' + assocs + '_', 'g');
         new_content = content.replace(regexp_braced, '[' + new_id + ']');
     }
+    new_content = new_content.replace(regexp_underscord, newcontent_underscord);
+
     if (insertionNode) {
       insertionNode = $(insertionNode);
     }
     else {
       insertionNode = $(this).parent();
     }
+
+    var contentNode = $(new_content);
     
     if (insertionPosition == 'after'){
-      insertionNode.after(new_content);
+      insertionNode.after(contentNode);
     } else {
-      insertionNode.before(new_content); 
+      insertionNode.before(contentNode); 
+    }
+
+    if(insertionCallback){
+      insertionCallback.call(contentNode);
     }
     
     return false;

data/spec/cocoon_spec.rb

@@ -21,12 +21,12 @@ describe Cocoon do
     context "without a block" do
       it "should accept a name" do
         result = @tester.link_to_add_association('add something', @form_obj, :comments)
-        result.to_s.should == '<a href="#" class="add_fields" data-association="comment" data-template="form&amp;lt;tag&amp;gt;">add something</a>'
+        result.to_s.should == '<a href="#" class="add_fields" data-association="comment" data-associations="comments" data-template="form&amp;lt;tag&amp;gt;">add something</a>'
       end
 
       it "should accept html options and pass them to link_to" do
         result = @tester.link_to_add_association('add something', @form_obj, :comments, {:class => 'something silly'})
-        result.to_s.should == '<a href="#" class="something silly add_fields" data-association="comment" data-template="form&amp;lt;tag&amp;gt;">add something</a>'
+        result.to_s.should == '<a href="#" class="something silly add_fields" data-association="comment" data-associations="comments" data-template="form&amp;lt;tag&amp;gt;">add something</a>'
       end
     end
 
@@ -35,14 +35,22 @@ describe Cocoon do
         result = @tester.link_to_add_association(@form_obj, :comments) do
           "some long name"
         end
-        result.to_s.should == '<a href="#" class="add_fields" data-association="comment" data-template="form&amp;lt;tag&amp;gt;">some long name</a>'
+        result.to_s.should == '<a href="#" class="add_fields" data-association="comment" data-associations="comments" data-template="form&amp;lt;tag&amp;gt;">some long name</a>'
       end
 
       it "should accept html options and pass them to link_to" do
         result = @tester.link_to_add_association(@form_obj, :comments, {:class => 'floppy disk'}) do
           "some long name"
         end
-        result.to_s.should == '<a href="#" class="floppy disk add_fields" data-association="comment" data-template="form&amp;lt;tag&amp;gt;">some long name</a>'
+        result.to_s.should == '<a href="#" class="floppy disk add_fields" data-association="comment" data-associations="comments" data-template="form&amp;lt;tag&amp;gt;">some long name</a>'
+      end
+
+    end
+
+    context "with an irregular plural" do
+      it "should use the correct plural" do
+        result = @tester.link_to_add_association('add something', @form_obj, :people)
+        result.to_s.should == '<a href="#" class="add_fields" data-association="person" data-associations="people" data-template="form&amp;lt;tag&amp;gt;">add something</a>'
       end
 
     end

data/spec/dummy/app/models/person.rb

@@ -0,0 +1,2 @@
+class Person < ActiveRecord::Base
+end

data/spec/dummy/app/models/post.rb

@@ -1,3 +1,4 @@
 class Post < ActiveRecord::Base
   has_many :comments
+  has_many :people
 end

data/spec/dummy/db/migrate/20110420222224_create_people.rb

@@ -0,0 +1,15 @@
+class CreatePeople < ActiveRecord::Migration
+  def self.up
+    create_table :people do |t|
+      t.string :name
+      t.string :description
+      t.integer :post_id
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :people
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Nathan Van der Auwera
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 +01:00
+date: 2011-04-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,6 +58,7 @@ files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/comment.rb
+- spec/dummy/app/models/person.rb
 - spec/dummy/app/models/post.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config.ru
@@ -77,6 +78,7 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20110306212208_create_posts.rb
 - spec/dummy/db/migrate/20110306212250_create_comments.rb
+- spec/dummy/db/migrate/20110420222224_create_people.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -106,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -916485471
+      hash: 180877711
       segments: 
       - 0
       version: "0"
@@ -128,6 +130,7 @@ summary: gem that enables easier nested forms with standard forms, formtastic an
 test_files: 
 - spec/spec_helper.rb
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/models/person.rb
 - spec/dummy/app/models/comment.rb
 - spec/dummy/app/models/post.rb
 - spec/dummy/app/helpers/application_helper.rb
@@ -145,6 +148,7 @@ test_files:
 - spec/dummy/config/boot.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/migrate/20110306212208_create_posts.rb
+- spec/dummy/db/migrate/20110420222224_create_people.rb
 - spec/dummy/db/migrate/20110306212250_create_comments.rb
 - spec/cocoon_spec.rb
 - spec/integration/navigation_spec.rb