dry_forms 0.0.1 → 0.1.0

data/.gitignore

@@ -13,9 +13,11 @@ tmtags
 ## VIM
 *.swp
 
+
 ## PROJECT::GENERAL
 coverage
 rdoc
-# pkg
+pkg
+dry_forms.gemspec
 
 ## PROJECT::SPECIFIC

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/generators/dry_forms_js/dry_forms_js_generator.rb

@@ -0,0 +1,8 @@
+class DryFormsJsGenerator < Rails::Generator::Base
+  def manifest
+    record do |m|
+      m.directory "public/javascripts"
+      m.file "jquery.dry_forms.associations.js", "public/javascripts/jquery.dry_forms.associations.js"
+    end
+  end
+end

data/generators/dry_forms_js/templates/jquery.dry_forms.associations.js

@@ -0,0 +1,48 @@
+// github.com/maca/dry_forms
+
+(function(a){
+  dryForms = {
+    associations :  {
+      removeAssociation : function(){
+        var fieldset = $(this).closest('fieldset');
+        fieldset.slideUp('slow').find('input.destroy').val('1');
+        return false;
+      },
+
+      addAssociation : function(){
+        var link        = $(this);
+        var association = link.attr('data-association');
+        var new_id      = new Date().getTime();
+        var regexp      = new RegExp('new_' + association, 'g');
+        var fields      = $(eval('fields_for_' + association).replace(regexp, association + "_" + new_id)).hide();
+        
+        fields.find('a.remove').click(dryForms.associations.removeAssociation);
+        this.addCallback(fields);
+      
+        link.before(fields);
+        fields.slideDown('slow');
+        return false;
+      }
+    }
+  };
+  
+  $.fn.createAssociation = function(opts){
+    var defaults = {
+      addCallback : function(){},
+      removeCallback : function(){}
+    };
+    $.extend(defaults, opts || {});
+    $('fieldset[data-association] a.remove').click(dryForms.associations.removeAssociation);
+    
+    return this.each(function(){
+      $(this).click(dryForms.associations.addAssociation);
+      $.extend(this, defaults);
+    });
+  };
+})(jQuery);
+
+
+// This may go in application.js
+jQuery(function(){
+  $('.add_fields').createAssociation();
+});

data/lib/dry_forms/builder_additions.rb

@@ -30,7 +30,7 @@ module DryForms
 
       association_class = @object.class.reflect_on_association(association.to_sym).klass
       singular_name     = association.singularize
-      fields            = association_fields association, &block
+      fields            = @object.send(association).map{ |obj| association_fields(association, obj, &block) }.join
       new_object        = @object.send(association).build options.delete(:default_attributes) || {}
       js_fields         = association_fields association, new_object, :child_index => "new_#{singular_name}", &block
 
@@ -51,16 +51,14 @@ module DryForms
     end
 
     private
-    def association_fields association, object = nil, opts = {}, &block
+    def association_fields association, object, opts = {}, &block
       opts.merge! :html => {:class => "associated", :'data-association' => association.singularize}
       
       fields = @template.capture do
         custom_fields_for association.to_sym, object, opts do |fields|
-          <<-HTML
-          #{fields.hidden_field :_destroy}
-          #{yield fields}
-          <a class="remove" href="#">#{I18n.t "dry_forms.remove"}</a>
-          HTML
+          @template.concat fields.hidden_field :_destroy, :class => 'destroy'
+          yield fields
+          @template.concat %{<a class="remove" href="#">#{I18n.t "dry_forms.remove"}</a>}
         end
       end
     end

data/test/helper.rb

@@ -24,6 +24,7 @@ class ActionView::TestCase::TestController
     @url_for_options = options
     "/do"
   end
+
 end
 
 class ActionView::Base

data/test/support/models.rb

@@ -23,8 +23,6 @@ ActiveRecord::Schema.define :version => 1 do
 end
 
 
-
-
 class Post < ActiveRecord::Base
   belongs_to :author
   accepts_nested_attributes_for :author

data/test/test_dry_forms.rb

@@ -4,9 +4,9 @@ class FormHelperTest < ActionView::TestCase
   tests ActionView::Helpers::FormHelper
   
   def setup
-    @post    = Post.new    :title => "Hello World", :body => "Has to work"
-    @author  = Author.new  :name  => "Macario"
-    @comment = Comment.new :title => "Hello World", :body => "Looking good"
+    @post    = Post.create    :title => "Hello World", :body => "Has to work"
+    @author  = Author.create  :name  => "Macario"
+    @comment = Comment.create :title => "Hello World", :body => "Looking good"
   end
 
   context 'helper method rendering' do
@@ -87,7 +87,7 @@ class FormHelperTest < ActionView::TestCase
     
       js_fields = <<-HTML
       <fieldset class="associated" data-association="post">
-        <input id="author_posts_attributes_new_post__destroy" name="author[posts_attributes][new_post][_destroy]" type="hidden" />
+        <input class="destroy" id="author_posts_attributes_new_post__destroy" name="author[posts_attributes][new_post][_destroy]" type="hidden" />
         <input id="author_posts_attributes_new_post_title" name="author[posts_attributes][new_post][title]" size="30" type="text" />
         <a class="remove" href="#">translation missing: en, dry_forms, remove</a>
       </fieldset>
@@ -110,8 +110,9 @@ class FormHelperTest < ActionView::TestCase
       assert_dom_equal html, render(:inline => erb)
     end
 
-    should 'render field for associations' do
-      @author.posts << @post
+    should 'render field for existing associations' do
+      @author.posts.create! :title => "Hello World", :body => "Looking good"
+      @author.posts.create! :title => "Hello World 2", :body => "Looking good"
       
       erb = <<-ERB
         <% form_for :author, @author do |form| %>
@@ -124,7 +125,7 @@ class FormHelperTest < ActionView::TestCase
     
       js_fields = <<-HTML
       <fieldset class="associated" data-association="post">
-        <input id="author_posts_attributes_new_post__destroy" name="author[posts_attributes][new_post][_destroy]" type="hidden" />
+        <input class="destroy" id="author_posts_attributes_new_post__destroy" name="author[posts_attributes][new_post][_destroy]" type="hidden" />
         <input id="author_posts_attributes_new_post_title" name="author[posts_attributes][new_post][title]" size="30" type="text" />
         <a class="remove" href="#">translation missing: en, dry_forms, remove</a>
       </fieldset>
@@ -135,9 +136,16 @@ class FormHelperTest < ActionView::TestCase
           <h2>Posts</h2>
           <div id="posts">
             <fieldset class="associated" data-association="post">
-              <input name="author[posts_attributes][0][_destroy]" id="author_posts_attributes_0__destroy" type="hidden" />
-              <input name="author[posts_attributes][0][title]" size="30" id="author_posts_attributes_0_title" value="Hello World" type="text" />
+              <input class="destroy" name="author[posts_attributes][0][_destroy]" id="author_posts_attributes_0__destroy" type="hidden" />
+              <input name="author[posts_attributes][0][title]" size="30" id="author_posts_attributes_0_title" type="text" value="Hello World" />
               <a href="#" class="remove">translation missing: en, dry_forms, remove</a>
+              <input name="author[posts_attributes][0][id]" id="author_posts_attributes_0_id" type="hidden" value="5" />
+            </fieldset>
+            <fieldset class="associated" data-association="post">
+              <input class="destroy" name="author[posts_attributes][1][_destroy]" id="author_posts_attributes_1__destroy" type="hidden" />
+              <input name="author[posts_attributes][1][title]" size="30" id="author_posts_attributes_1_title" type="text" value="Hello World 2"  />
+              <a href="#" class="remove">translation missing: en, dry_forms, remove</a>
+              <input name="author[posts_attributes][1][id]" id="author_posts_attributes_1_id" type="hidden" value="6" />
             </fieldset>
             <script type="text/javascript">
             //<![CDATA[

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dry_forms
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Macario Ortega
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 -05:00
+date: 2010-08-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -48,11 +45,11 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- dry_forms.gemspec
+- generators/dry_forms_js/dry_forms_js_generator.rb
+- generators/dry_forms_js/templates/jquery.dry_forms.associations.js
 - lib/dry_forms.rb
 - lib/dry_forms/builder_additions.rb
 - lib/dry_forms/form_helper_additions.rb
-- pkg/dry_forms-0.0.1.gem
 - test/helper.rb
 - test/support/models.rb
 - test/test_dry_forms.rb
@@ -66,27 +63,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Form builder additions for drier and localized forms, and association fields adding and removing with jQuery sweetness

data/dry_forms.gemspec

@@ -1,59 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{dry_forms}
-  s.version = "0.0.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Macario Ortega"]
-  s.date = %q{2010-08-06}
-  s.description = %q{Form builder additions for drier and localized forms, and association fields adding and removing with jQuery sweetness inspired by Ryan Bates' Railcast #197}
-  s.email = %q{macarui@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "dry_forms.gemspec",
-     "lib/dry_forms.rb",
-     "lib/dry_forms/builder_additions.rb",
-     "lib/dry_forms/form_helper_additions.rb",
-     "pkg/dry_forms-0.0.1.gem",
-     "test/helper.rb",
-     "test/support/models.rb",
-     "test/test_dry_forms.rb"
-  ]
-  s.homepage = %q{http://github.com/maca/dry_forms}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Form builder additions for drier and localized forms, and association fields adding and removing with jQuery sweetness}
-  s.test_files = [
-    "test/helper.rb",
-     "test/support/models.rb",
-     "test/test_dry_forms.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-  end
-end
-