cocoon 1.0.2 → 1.0.3

data/README.markdown

@@ -157,9 +157,8 @@ There is no limit to the amount of nesting, though.
 
 ## Todo
 
-* complete the sample projects -for simple_form- and normal rails forms
 * add more sample relations: has_many :through, belongs_to, ...
-* complete the test-coverage
+* improve the tests (test the javascript too)(if anybody wants to lend a hand ...?)
 
 ## Copyright
 

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/cocoon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cocoon}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   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-06}
+  s.date = %q{2011-03-15}
   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 = [
@@ -32,6 +32,8 @@ Gem::Specification.new do |s|
      "spec/dummy/Rakefile",
      "spec/dummy/app/controllers/application_controller.rb",
      "spec/dummy/app/helpers/application_helper.rb",
+     "spec/dummy/app/models/comment.rb",
+     "spec/dummy/app/models/post.rb",
      "spec/dummy/app/views/layouts/application.html.erb",
      "spec/dummy/config.ru",
      "spec/dummy/config/application.rb",
@@ -48,6 +50,9 @@ Gem::Specification.new do |s|
      "spec/dummy/config/initializers/session_store.rb",
      "spec/dummy/config/locales/en.yml",
      "spec/dummy/config/routes.rb",
+     "spec/dummy/db/migrate/20110306212208_create_posts.rb",
+     "spec/dummy/db/migrate/20110306212250_create_comments.rb",
+     "spec/dummy/db/schema.rb",
      "spec/dummy/public/404.html",
      "spec/dummy/public/422.html",
      "spec/dummy/public/500.html",
@@ -71,6 +76,8 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/spec_helper.rb",
      "spec/dummy/app/controllers/application_controller.rb",
+     "spec/dummy/app/models/comment.rb",
+     "spec/dummy/app/models/post.rb",
      "spec/dummy/app/helpers/application_helper.rb",
      "spec/dummy/config/environment.rb",
      "spec/dummy/config/initializers/session_store.rb",
@@ -84,6 +91,9 @@ Gem::Specification.new do |s|
      "spec/dummy/config/application.rb",
      "spec/dummy/config/routes.rb",
      "spec/dummy/config/boot.rb",
+     "spec/dummy/db/schema.rb",
+     "spec/dummy/db/migrate/20110306212208_create_posts.rb",
+     "spec/dummy/db/migrate/20110306212250_create_comments.rb",
      "spec/cocoon_spec.rb",
      "spec/integration/navigation_spec.rb"
   ]

data/lib/cocoon/view_helpers.rb

@@ -61,12 +61,9 @@ module Cocoon
         html_options[:'data-association'] = association.to_s.singularize
 
         new_object = f.object.class.reflect_on_association(association).klass.new
-        model_name = new_object.class.name.underscore
-        hidden_div = content_tag('div', :id => "#{model_name}_fields_template", :style => "display:none;") do
-          render_association(association, f, new_object)
-        end
+        html_options[:'data-template'] = CGI.escapeHTML(render_association(association, f, new_object))
 
-        hidden_div.html_safe + link_to(name, '#', html_options )
+        link_to(name, '#', html_options )
       end
     end
 

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

@@ -2,7 +2,7 @@ $(document).ready(function() {
 
   $('.add_fields').live('click', function() {
     var assoc   = $(this).attr('data-association');
-    var content = $(this).siblings('#' + assoc + '_fields_template').html();
+    var content = $(this).attr('data-template');
     var insertionPosition = $(this).attr('data-association-insertion-position');
     var insertionNode = $(this).attr('data-association-insertion-node');
     var regexp_braced = new RegExp('\\[new_' + assoc + '\\]', 'g');

data/spec/cocoon_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Cocoon do
-
   class TestClass < ActionView::Base
 
   end
@@ -11,4 +10,80 @@ describe Cocoon do
   it { should respond_to(:link_to_add_association) }
   it { should respond_to(:link_to_remove_association) }
 
-end
+  context "link_to_add_association" do
+    before(:each) do
+      @tester = TestClass.new
+      @post = Post.new
+      @form_obj = stub(:object => @post)
+      @tester.stub(:render_association).and_return('form<tag>')
+    end
+
+    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>'
+      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>'
+      end
+    end
+
+    context "with a block" do
+      it "the block gives the link text" 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>'
+      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>'
+      end
+
+    end
+
+  end
+
+  context "link_to_remove_association" do
+    before(:each) do
+      @tester = TestClass.new
+      @post = Post.new
+      @form_obj = stub(:object => @post, :object_name => @post.class.name)
+    end
+
+    context  "without a block" do
+      it "should accept a name" do
+        result = @tester.link_to_remove_association('remove something', @form_obj)
+        result.to_s.should == "<input id=\"Post__destroy\" name=\"Post[_destroy]\" type=\"hidden\" /><a href=\"#\" class=\"remove_fields dynamic\">remove something</a>"
+      end
+
+      it "should accept html options and pass them to link_to" do
+        result = @tester.link_to_remove_association('remove something', @form_obj, {:class => 'add_some_class', :'data-something' => 'bla'})
+        result.to_s.should == "<input id=\"Post__destroy\" name=\"Post[_destroy]\" type=\"hidden\" /><a href=\"#\" class=\"add_some_class remove_fields dynamic\" data-something=\"bla\">remove something</a>"
+      end
+
+    end
+
+    context "with a block" do
+      it "the block gives the name" do
+        result = @tester.link_to_remove_association(@form_obj) do
+          "remove some long name"
+        end
+        result.to_s.should == "<input id=\"Post__destroy\" name=\"Post[_destroy]\" type=\"hidden\" /><a href=\"#\" class=\"remove_fields dynamic\">remove some long name</a>"
+      end
+
+      it "should accept html options and pass them to link_to" do
+        result = @tester.link_to_remove_association(@form_obj, {:class => 'add_some_class', :'data-something' => 'bla'}) do
+          "remove some long name"
+        end
+        result.to_s.should == "<input id=\"Post__destroy\" name=\"Post[_destroy]\" type=\"hidden\" /><a href=\"#\" class=\"add_some_class remove_fields dynamic\" data-something=\"bla\">remove some long name</a>"
+      end
+    end
+  end
+
+end

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

@@ -0,0 +1,3 @@
+class Comment < ActiveRecord::Base
+  belongs_to :post
+end

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

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

data/spec/dummy/db/migrate/20110306212208_create_posts.rb

@@ -0,0 +1,14 @@
+class CreatePosts < ActiveRecord::Migration
+  def self.up
+    create_table :posts do |t|
+      t.string :title
+      t.text :body
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :posts
+  end
+end

data/spec/dummy/db/migrate/20110306212250_create_comments.rb

@@ -0,0 +1,15 @@
+class CreateComments < ActiveRecord::Migration
+  def self.up
+    create_table :comments do |t|
+      t.text :body
+      t.string :author
+      t.integer :post_id
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :comments
+  end
+end

data/spec/dummy/db/schema.rb

@@ -0,0 +1,30 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20110306212250) do
+
+  create_table "comments", :force => true do |t|
+    t.text     "body"
+    t.string   "author"
+    t.integer  "post_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "posts", :force => true do |t|
+    t.string   "title"
+    t.text     "body"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Nathan Van der Auwera
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-06 00:00:00 +01:00
+date: 2011-03-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,6 +57,8 @@ files:
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/comment.rb
+- spec/dummy/app/models/post.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
@@ -73,6 +75,9 @@ files:
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/db/migrate/20110306212208_create_posts.rb
+- spec/dummy/db/migrate/20110306212250_create_comments.rb
+- spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -101,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -715901887
+      hash: -916485471
       segments: 
       - 0
       version: "0"
@@ -123,6 +128,8 @@ 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/comment.rb
+- spec/dummy/app/models/post.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/config/environment.rb
 - spec/dummy/config/initializers/session_store.rb
@@ -136,5 +143,8 @@ test_files:
 - spec/dummy/config/application.rb
 - spec/dummy/config/routes.rb
 - spec/dummy/config/boot.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/db/migrate/20110306212208_create_posts.rb
+- spec/dummy/db/migrate/20110306212250_create_comments.rb
 - spec/cocoon_spec.rb
 - spec/integration/navigation_spec.rb