justinfrench-formtastic 0.1.9 → 0.2.0

data/lib/formtastic.rb

@@ -241,7 +241,7 @@ module Formtastic #:nodoc:
         if @object && args.empty?
           args  = @object.class.reflections.map { |n,_| n if _.macro == :belongs_to }
           args += @object.class.content_columns.map(&:name)
-          args -= %w[created_at updated_at created_on updated_on]
+          args -= %w[created_at updated_at created_on updated_on lock_version]
           args.compact!
         end
         contents = args.map { |method| input(method.to_sym) }
@@ -279,8 +279,14 @@ module Formtastic #:nodoc:
     #
     #  <%= form.commit_button "Go" %> => <input name="commit" type="submit" value="Go" />
     #
-    def commit_button(value=nil, options={})
-      value     ||= save_or_create_button_text
+    # And you can pass html atributes down to the input, with or without the button text:
+    #
+    #  <%= form.commit_button "Go" %> => <input name="commit" type="submit" value="Go" />
+    #  <%= form.commit_button :class => "pretty" %> => <input name="commit" type="submit" value="Save Post" class="pretty" />
+    
+    def commit_button(*args)
+      value = args.first.is_a?(String) ? args.shift : save_or_create_button_text
+      options = args.shift || {}
       button_html = options.delete(:button_html) || {}
       template.content_tag(:li, self.submit(value, button_html), :class => "commit")
     end
@@ -476,6 +482,7 @@ module Formtastic #:nodoc:
     #
     #   <label for="book_author_id">Author</label>
     #   <select id="book_author_id" name="book[author_id]">
+    #     <option value=""></option>
     #     <option value="1">Justin French</option>
     #     <option value="2">Jane Doe</option>
     #   </select>
@@ -486,6 +493,7 @@ module Formtastic #:nodoc:
     #
     #   <label for="book_chapter_ids">Chapters</label>
     #   <select id="book_chapter_ids" name="book[chapter_ids]">
+    #     <option value=""></option>
     #     <option value="1">Chapter 1</option>
     #     <option value="2">Chapter 2</option>
     #   </select>
@@ -496,6 +504,7 @@ module Formtastic #:nodoc:
     #
     #   <label for="book_author_ids">Authors</label>
     #   <select id="book_author_ids" name="book[author_ids]">
+    #     <option value=""></option>
     #     <option value="1">Justin French</option>
     #     <option value="2">Jane Doe</option>
     #   </select>
@@ -543,9 +552,12 @@ module Formtastic #:nodoc:
     #
     #   f.input :authors, :input_html => {:size => 20, :multiple => true}
     #
+    # By default, all select inputs will have a blank option at the top of the list. You can add
+    # a prompt with the :prompt option, or disable the blank option with :include_blank => false.
     def select_input(method, options)
       collection = find_collection_for_column(method, options)
       html_options = options.delete(:input_html) || {}
+      options[:include_blank] ||= true
 
       reflection = find_reflection(method)
       if reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
@@ -959,6 +971,8 @@ module Formtastic #:nodoc:
     # method. This methods is currently used by radio and datetime inputs.
     #
     def field_set_and_list_wrapping_for_method(method, options, contents)
+      contents = contents.join if contents.respond_to?(:join)
+
       template.content_tag(:fieldset,
         %{<legend>#{self.label(method, options.slice(:label, :required).merge!(:as_span => true))}</legend>} +
         template.content_tag(:ol, contents)

data/spec/formtastic_spec.rb

@@ -1395,7 +1395,7 @@ describe 'Formtastic' do
           end
 
           it 'should have a select option for each Author' do
-            output_buffer.should have_tag('form li select option', :count => Author.find(:all).size)
+            output_buffer.should have_tag('form li select option', :count => Author.find(:all).size + 1)
             Author.find(:all).each do |author|
               output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
             end
@@ -1437,7 +1437,7 @@ describe 'Formtastic' do
           end
 
           it 'should have a select option for each Post' do
-            output_buffer.should have_tag('form li select option', :count => Post.find(:all).size)
+            output_buffer.should have_tag('form li select option', :count => Post.find(:all).size + 1)
             Post.find(:all).each do |post|
               output_buffer.should have_tag("form li select option[@value='#{post.id}']", /#{post.to_label}/)
             end
@@ -1479,7 +1479,7 @@ describe 'Formtastic' do
           end
 
           it 'should have a select option for each Author' do
-            output_buffer.should have_tag('form li select option', :count => Author.find(:all).size)
+            output_buffer.should have_tag('form li select option', :count => Author.find(:all).size + 1)
             Author.find(:all).each do |author|
               output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
             end
@@ -1489,8 +1489,34 @@ describe 'Formtastic' do
             output_buffer.should have_tag('form li select option[@selected]', :count => 1)
           end
         end
-
-        describe 'when :include_blank => true, :prompt => "choose something" is set' do
+        
+        describe 'when :include_blank is not set' do
+          before do
+            @new_post.stub!(:author_id).and_return(nil)
+            semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:author, :as => :select))
+            end
+          end
+          
+          it 'should have a blank option by default' do
+            output_buffer.should have_tag("form li select option[@value='']", //)
+          end
+        end
+        
+        describe 'when :include_blank is set to false' do
+          before do
+            @new_post.stub!(:author_id).and_return(nil)
+            semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:author, :as => :select, :include_blank => false))
+            end
+          end
+          
+          it 'should not have a blank option' do
+            output_buffer.should have_tag("form li select option[@value='']", //)
+          end
+        end
+        
+        describe 'when :include_blank => true and :prompt => "choose something" is set' do
           before do
             @new_post.stub!(:author_id).and_return(nil)
             semantic_form_for(@new_post) do |builder|
@@ -1521,7 +1547,7 @@ describe 'Formtastic' do
 
           it 'should generate select inputs' do
             output_buffer.should have_tag('form li select#project_author')
-            output_buffer.should have_tag('form li select option', :count => Author.find(:all).size)
+            output_buffer.should have_tag('form li select option', :count => Author.find(:all).size + 1)
           end
 
           it 'should generate an option to each item' do
@@ -1680,7 +1706,7 @@ describe 'Formtastic' do
                 semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:author, :as => type, :collection => @authors))
                 end
-                output_buffer.should have_tag("form li.#{type} #{countable}", :count => @authors.size)
+                output_buffer.should have_tag("form li.#{type} #{countable}", :count => @authors.size + (type == :select ? 1 : 0))
               end
 
               describe 'and the :collection is an array of strings' do
@@ -1856,7 +1882,7 @@ describe 'Formtastic' do
               end
 
               it "should generate two #{countable}" do
-                output_buffer.should have_tag("form li.#{type} #{countable}", :count => 2)
+                output_buffer.should have_tag("form li.#{type} #{countable}", :count => (type == :select ? 3 : 2))
                 output_buffer.should have_tag(%{form li.#{type} #{countable}[@value="true"]})
                 output_buffer.should have_tag(%{form li.#{type} #{countable}[@value="false"]})
               end
@@ -2731,7 +2757,41 @@ describe 'Formtastic' do
           output_buffer.should have_tag('li.commit input#my_id')
           output_buffer.should have_tag('li.commit input.my_class')
         end
+        
+      end
 
+      describe 'when the first option is a string and the second is a hash' do
+        
+        before do
+          @new_post.stub!(:new_record?).and_return(false)
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.commit_button("a string", :button_html => { :class => "pretty"}))
+          end
+        end
+        
+        it "should render the string as the value of the button" do
+          output_buffer.should have_tag('li input[@value="a string"]')
+        end
+        
+        it "should deal with the options hash" do
+          output_buffer.should have_tag('li input.pretty')
+        end
+        
+      end
+
+      describe 'when the first option is a hash' do
+        
+        before do
+          @new_post.stub!(:new_record?).and_return(false)
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.commit_button(:button_html => { :class => "pretty"}))
+          end
+        end
+        
+        it "should deal with the options hash" do
+          output_buffer.should have_tag('li input.pretty')
+        end
+        
       end
 
       describe 'when used on an existing record' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: justinfrench-formtastic
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors: 
 - Justin French
@@ -9,7 +9,7 @@ autorequire: formtastic
 bindir: bin
 cert_chain: []
 
-date: 2009-05-21 00:00:00 -07:00
+date: 2009-05-30 00:00:00 -07:00
 default_executable: 
 dependencies: []