dry_forms 0.2.1 → 0.2.2

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "macarui@gmail.com"
     gem.homepage = "http://github.com/maca/dry_forms"
     gem.authors = ["Macario Ortega"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    gem.add_development_dependency "shoulda", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/dry_forms/builder_additions.rb

@@ -22,14 +22,15 @@ module DryForms
           @object.errors[attribute]
         end
         
-        DryForms.field_markup label, field, [*errors].compact, html_opts
+        ActiveSupport::SafeBuffer.new DryForms.field_markup(label, field, [*errors].compact, html_opts)
       end
     end
 
     def fields_for_association association, *args, &block
       options     = args.extract_options!
       association = association.to_s
-      objects     =  args.first ? [*args.first] : @object.send(association)
+      objects     = args.first ? [*args.first] : @object.send(association)
+      html        = options.delete(:html)
 
       unless @object.respond_to? "#{association.pluralize}_attributes="
         raise NotImplementedError, "Please call `accepts_nested_attributes_for :#{association.pluralize}` in your `#{@object.class}` Model"
@@ -39,44 +40,42 @@ module DryForms
 
       association_class = @object.class.reflect_on_association(association.to_sym).klass
       singular_name     = association.singularize
-      fields            = objects.map{ |obj| association_fields(association, obj, &block) }.join
+      fields            = objects.map{ |obj| association_fields(association, obj, :html => html, &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
+      js_fields         = association_fields association, new_object, :child_index => "new_#{singular_name}", :html => html, &block
 
-      @template.concat <<-HTML
+      association_fields = <<-HTML
       <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 'add', :model => association_class.human_name}</a>
       </div>
       HTML
+
+      @template.concat ActiveSupport::SafeBuffer.new association_fields
     end
     
     def custom_fields_for *args, &block
       opts      = args.extract_options!
       html_opts = opts.delete(:html) || {}
       fields    = @template.capture{fields_for *(args << opts), &block}
-      @template.concat DryForms.fields_for_markup(fields, html_opts) unless fields.empty?
+      @template.concat ActiveSupport::SafeBuffer.new DryForms.fields_for_markup(fields, html_opts) unless fields.empty?
     end
 
     private
     def association_fields association, object, opts = {}, &block
-      opts.merge! :html => {:class => "associated", :'data-association' => association.singularize}
+      html = opts.delete(:html) || {}
+      opts.merge! :html => html.merge(:class => "associated", :'data-association' => association.singularize)
       
-      fields = @template.capture do
+      association_fields = @template.capture do
         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 "remove"}</a>}
+          @template.concat ActiveSupport::SafeBuffer.new %{<a class="remove" href="#">#{I18n.t "remove"}</a>}
         end
       end
-    end
 
-    # def submit *args
-    #   options         = args.extract_options!
-    #   options[:class] = "submit #{ options[:class] }".strip
-    #   value           = args.first || I18n.t(@object.new_record? ? 'create' : 'save', :scope => 'helpers.submit')
-    #   super value, options
-    # end
+      ActiveSupport::SafeBuffer.new %{#{association_fields}}
+    end
   end
-end
+end

data/test/helper.rb

@@ -3,12 +3,10 @@ require 'test/unit'
 require 'shoulda'
 
 require 'active_support'
-require 'action_pack'
 require 'active_record'
 require 'action_controller'
 require 'action_view'
 require 'action_view/test_case'
-require 'action_controller/test_process'
 
 $LOAD_PATH.unshift "#{File.dirname __FILE__}/../lib"
 $LOAD_PATH.unshift File.dirname(__FILE__)
@@ -16,18 +14,16 @@ $LOAD_PATH.unshift File.dirname(__FILE__)
 require 'dry_forms'
 require 'support/models'
 
-ActionController::Base.view_paths << FIXTURES = "#{ File.dirname __FILE__ }/fixtures'"
-
-class ActionView::TestCase::TestController
-  attr_reader :url_for_options
-  def url_for(options)
-    @url_for_options = options
-    "/do"
-  end
-
-end
-
 class ActionView::Base
   def protect_against_forgery?; end
 end
 
+require 'ostruct'
+
+module ActionController::UrlFor
+  def _routes
+    helpers = OpenStruct.new
+    helpers.url_helpers = Module.new
+    helpers
+  end
+end

data/test/support/models.rb

@@ -22,7 +22,6 @@ ActiveRecord::Schema.define :version => 1 do
   end
 end
 
-
 class Post < ActiveRecord::Base
   belongs_to :author
   accepts_nested_attributes_for :author
@@ -37,4 +36,4 @@ class Author < ActiveRecord::Base
   has_many :posts
   has_many :comments
   accepts_nested_attributes_for :posts
-end
+end

data/test/test_dry_forms.rb

@@ -12,7 +12,7 @@ class FormHelperTest < ActionView::TestCase
   context 'helper method rendering' do
     should 'render check_box with custom markup and display human_attribute_name' do
       erb = <<-ERB
-        <% custom_form_for :post, @post do |f| %>
+        <% custom_form_for :post, @post, :url => '/do' do |f| %>
           <%= f.custom_text_field :title, :class => 'title' %>
         <% end %>
       ERB
@@ -31,7 +31,7 @@ class FormHelperTest < ActionView::TestCase
     
     should 'render check_box with custom markup and display human_attribute_name and html attributes' do
       erb = <<-ERB
-        <% custom_form_for :post, @post do |f| %>
+        <% custom_form_for :post, @post, :url => '/do' do |f| %>
           <%= f.custom_text_field :title, :class => 'title', :html => {:id => 'id', :class => 'class'} %>
         <% end %>
       ERB
@@ -55,7 +55,7 @@ class FormHelperTest < ActionView::TestCase
         assert_equal false, @post.valid?
         
         erb = <<-ERB
-          <% custom_form_for :post, @post do |f| %>
+          <% custom_form_for :post, @post, :url => '/do' do |f| %>
             <%= f.custom_text_field :title, :class => 'title' %>
           <% end %>
         ERB
@@ -82,7 +82,7 @@ class FormHelperTest < ActionView::TestCase
     
     should 'render js fields' do
       erb = <<-ERB
-        <% form_for :author, @author do |form| %>
+        <% form_for :author, @author, :url => '/do' do |form| %>
           <h2>Posts</h2>
           <% form.fields_for_association :posts do |post| %>
             <%= post.text_field :title %>
@@ -91,7 +91,7 @@ class FormHelperTest < ActionView::TestCase
       ERB
     
       js_fields = <<-HTML
-      <fieldset class="associated" data-association="post">
+      <fieldset data-association="post" class="associated">
         <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>
@@ -120,7 +120,7 @@ class FormHelperTest < ActionView::TestCase
       @author.posts.create! :title => "Hello World 2", :body => "Looking good"
       
       erb = <<-ERB
-        <% form_for :author, @author do |form| %>
+        <% form_for :author, @author, :url => '/do' do |form| %>
           <h2>Posts</h2>
           <% form.fields_for_association :posts do |post| %>
             <%= post.text_field :title %>
@@ -129,7 +129,7 @@ class FormHelperTest < ActionView::TestCase
       ERB
     
       js_fields = <<-HTML
-      <fieldset class="associated" data-association="post">
+      <fieldset data-association="post" class="associated">
         <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>
@@ -165,12 +165,55 @@ class FormHelperTest < ActionView::TestCase
       assert_dom_equal html, render(:inline => erb)
     end
     
+    should 'render field for existing associations allowing custom html' do
+      @author.posts.create! :title => "Hello World", :body => "Looking good"
+      
+      erb = <<-ERB
+        <% form_for :author, @author, :url => '/do' do |form| %>
+          <h2>Posts</h2>
+          <% form.fields_for_association :posts, :html => {'data-custom' => 'data'} do |post| %>
+            <%= post.text_field :title %>
+          <% end %>
+        <% end %>
+      ERB
+    
+      js_fields = <<-HTML
+      <fieldset data-association="post" class="associated" data-custom="data">
+        <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" data-custom="data">
+              <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 '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| %>
+        <% form_for :author, @author, :url => '/do' do |form| %>
           <h2>Posts</h2>
           <% form.fields_for_association :posts, @author.posts[0..0] do |post| %>
             <%= post.text_field :title %>
@@ -179,7 +222,7 @@ class FormHelperTest < ActionView::TestCase
       ERB
 
       js_fields = <<-HTML
-      <fieldset class="associated" data-association="post">
+      <fieldset data-association="post" class="associated">
         <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>
@@ -211,7 +254,7 @@ class FormHelperTest < ActionView::TestCase
 
     should 'raise error if model does not accepts nested attributes for association' do
       assert_raises(NotImplementedError) do 
-        form_for :comment, @comment do |form|
+        form_for :comment, @comment, :url => '/do' do |form|
           form.fields_for_association(:author) {}
         end
       end
@@ -219,7 +262,7 @@ class FormHelperTest < ActionView::TestCase
   
     should 'raise error if model does not accepts nested attributes for pluralized association' do
       assert_raises(NotImplementedError) do 
-        form_for :post, @post do |form|
+        form_for :post, @post, :url => '/do' do |form|
           form.fields_for_association(:author) {}
         end
       end
@@ -227,7 +270,7 @@ class FormHelperTest < ActionView::TestCase
   
     should 'raise argument error if no block is passed' do
       assert_raises(ArgumentError) do 
-        form_for :author, @author do |form|
+        form_for :author, @author, :url => '/do' do |form|
           form.fields_for_association(:posts)
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dry_forms
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Macario Ortega
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-11 00:00:00 -05:00
+date: 2010-10-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -91,6 +91,6 @@ signing_key:
 specification_version: 3
 summary: Form builder additions for drier and localized forms, and association fields adding and removing with jQuery sweetness
 test_files: 
-- test/support/models.rb
-- test/helper.rb
 - test/test_dry_forms.rb
+- test/helper.rb
+- test/support/models.rb