dry_forms 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/dry_forms/builder_additions.rb

@@ -15,12 +15,21 @@ module DryForms
         label  = label attribute, label_text
         field  = send name, attribute, *(args << opts)
         
-        DryForms.field_markup label, field, @object && @object.errors[attribute], html_opts
+        errors =      
+        if @object and name == 'file_field' # Not specked, for paperclip
+          %w(file_name content_type file_size).map { |f| @object.errors["#{attribute}_#{f}".to_sym] }.unshift @object.errors[attribute]
+        elsif @object
+          @object.errors[attribute]
+        end
+        
+        DryForms.field_markup label, field, [*errors].compact, html_opts
       end
     end
 
-    def fields_for_association association, options = {}, &block
+    def fields_for_association association, *args, &block
+      options     = args.extract_options!
       association = association.to_s
+      objects     =  args.first ? [*args.first] : @object.send(association)
 
       unless @object.respond_to? "#{association.pluralize}_attributes="
         raise NotImplementedError, "Please call `accepts_nested_attributes_for :#{association.pluralize}` in your `#{@object.class}` Model"
@@ -30,7 +39,7 @@ module DryForms
 
       association_class = @object.class.reflect_on_association(association.to_sym).klass
       singular_name     = association.singularize
-      fields            = @object.send(association).map{ |obj| association_fields(association, obj, &block) }.join
+      fields            = objects.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
 
@@ -38,7 +47,7 @@ module DryForms
       <div id="#{association}">
         #{fields}
         #{@template.javascript_tag "var fields_for_#{singular_name} = '#{js_fields.strip.gsub /\n\s+|\n/, ''}';"}
-        <a href="#" class="add_fields" data-association="#{singular_name}">#{I18n.t 'dry_forms.add', :model => association_class.human_name}</a>
+        <a href="#" class="add_fields" data-association="#{singular_name}">#{I18n.t 'add', :model => association_class.human_name}</a>
       </div>
       HTML
     end
@@ -58,7 +67,7 @@ module DryForms
         custom_fields_for association.to_sym, object, opts do |fields|
           @template.concat fields.hidden_field :_destroy, :class => 'destroy'
           yield fields
-          @template.concat %{<a class="remove" href="#">#{I18n.t "dry_forms.remove"}</a>}
+          @template.concat %{<a class="remove" href="#">#{I18n.t "remove"}</a>}
         end
       end
     end

data/test/test_dry_forms.rb

@@ -75,6 +75,11 @@ class FormHelperTest < ActionView::TestCase
   end
   
   context 'field for associations' do
+    setup do
+      @author.posts = []
+      Post.destroy_all
+    end
+    
     should 'render js fields' do
       erb = <<-ERB
         <% form_for :author, @author do |form| %>
@@ -89,7 +94,7 @@ class FormHelperTest < ActionView::TestCase
       <fieldset class="associated" data-association="post">
         <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>
+        <a class="remove" href="#">translation missing: en, remove</a>
       </fieldset>
       HTML
     
@@ -102,7 +107,7 @@ class FormHelperTest < ActionView::TestCase
             var fields_for_post = '#{js_fields.gsub(/\n\s+/, '').strip}';
 //]]>
             </script>
-            <a href="#" class="add_fields" data-association="post">translation missing: en, dry_forms, add</a>
+            <a href="#" class="add_fields" data-association="post">translation missing: en, add</a>
           </div>
         </form>
       HTML
@@ -127,7 +132,7 @@ class FormHelperTest < ActionView::TestCase
       <fieldset class="associated" data-association="post">
         <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>
+        <a class="remove" href="#">translation missing: en, remove</a>
       </fieldset>
       HTML
     
@@ -138,27 +143,71 @@ class FormHelperTest < ActionView::TestCase
             <fieldset class="associated" data-association="post">
               <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" />
+              <a href="#" class="remove">translation missing: en, remove</a>
+              <input name="author[posts_attributes][0][id]" id="author_posts_attributes_0_id" type="hidden" value="#{ @author.posts.first.id }" />
             </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" />
+              <a href="#" class="remove">translation missing: en, remove</a>
+              <input name="author[posts_attributes][1][id]" id="author_posts_attributes_1_id" type="hidden" value="#{ @author.posts.last.id }" />
             </fieldset>
             <script type="text/javascript">
             //<![CDATA[
             var fields_for_post = '#{js_fields.gsub(/\n\s+/, '').strip}';
 //]]>
             </script>
-            <a href="#" class="add_fields" data-association="post">translation missing: en, dry_forms, add</a>
+            <a href="#" class="add_fields" data-association="post">translation missing: en, add</a>
           </div>
         </form>
       HTML
     
       assert_dom_equal html, render(:inline => erb)
     end
+    
+    should 'render field for existing associations passing objects' 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| %>
+          <h2>Posts</h2>
+          <% form.fields_for_association :posts, @author.posts[0..0] do |post| %>
+            <%= post.text_field :title %>
+          <% end %>
+        <% end %>
+      ERB
+
+      js_fields = <<-HTML
+      <fieldset class="associated" data-association="post">
+        <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, remove</a>
+      </fieldset>
+      HTML
+
+      html = <<-HTML
+        <form method="post" action="/do">
+          <h2>Posts</h2>
+          <div id="posts">
+            <fieldset class="associated" data-association="post">
+              <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, remove</a>
+              <input name="author[posts_attributes][0][id]" id="author_posts_attributes_0_id" type="hidden" value="#{ @author.posts.first.id }" />
+            </fieldset>
+            <script type="text/javascript">
+            //<![CDATA[
+            var fields_for_post = '#{js_fields.gsub(/\n\s+/, '').strip}';
+//]]>
+            </script>
+            <a href="#" class="add_fields" data-association="post">translation missing: en, add</a>
+          </div>
+        </form>
+      HTML
+
+      assert_dom_equal html, render(:inline => erb)
+    end
 
     should 'raise error if model does not accepts nested attributes for association' do
       assert_raises(NotImplementedError) do 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Macario Ortega
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 -05:00
+date: 2010-09-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency