ShadowBelmolve-formtastic 0.1.6 → 0.2.1

data/lib/justin_french/formtastic.rb

@@ -1,6 +1,6 @@
-module JustinFrench
-  module Formtastic
-    class SemanticFormBuilder < ::Formtastic::SemanticFormBuilder
+module JustinFrench #:nodoc:
+  module Formtastic #:nodoc:
+    class SemanticFormBuilder < ::Formtastic::SemanticFormBuilder #:nodoc:
       def initialize(*args)
         ::ActiveSupport::Deprecation.warn("JustinFrench::Formtastic::SemanticFormBuilder is deprecated. User Formtastic::SemanticFormBuilder instead", caller)
         super

data/spec/formtastic_spec.rb

@@ -62,7 +62,7 @@ describe 'Formtastic' do
     @fred.stub!(:login).and_return('fred_smith')
     @fred.stub!(:id).and_return(37)
     @fred.stub!(:new_record?).and_return(false)
-    @fred.stub!(:errors).and_return(mock('errors', :on => nil))
+    @fred.stub!(:errors).and_return(mock('errors', :[] => nil))
 
     @bob = mock('user')
     @bob.stub!(:class).and_return(Author)
@@ -72,20 +72,20 @@ describe 'Formtastic' do
     @bob.stub!(:posts).and_return([])
     @bob.stub!(:post_ids).and_return([])
     @bob.stub!(:new_record?).and_return(false)
-    @bob.stub!(:errors).and_return(mock('errors', :on => nil))
+    @bob.stub!(:errors).and_return(mock('errors', :[] => nil))
 
     Author.stub!(:find).and_return([@fred, @bob])
     Author.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     Author.stub!(:human_name).and_return('Author')
     Author.stub!(:reflect_on_all_validations).and_return([])
-    Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :klass => Post, :macro => :has_many) if column_name == :posts }
+    Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Post, :macro => :has_many) if column_name == :posts }
 
     # Sometimes we need a mock @post object and some Authors for belongs_to
     @new_post = mock('post')
     @new_post.stub!(:class).and_return(Post)
     @new_post.stub!(:id).and_return(nil)
     @new_post.stub!(:new_record?).and_return(true)
-    @new_post.stub!(:errors).and_return(mock('errors', :on => nil))
+    @new_post.stub!(:errors).and_return(mock('errors', :[] => nil))
     @new_post.stub!(:author).and_return(nil)
 
     @freds_post = mock('post')
@@ -97,7 +97,7 @@ describe 'Formtastic' do
     @freds_post.stub!(:authors).and_return([@fred])
     @freds_post.stub!(:author_ids).and_return([@fred.id])
     @freds_post.stub!(:new_record?).and_return(false)
-    @freds_post.stub!(:errors).and_return(mock('errors', :on => nil))
+    @freds_post.stub!(:errors).and_return(mock('errors', :[] => nil))
     @fred.stub!(:posts).and_return([@freds_post])
     @fred.stub!(:post_ids).and_return([@freds_post.id])
 
@@ -106,10 +106,10 @@ describe 'Formtastic' do
     Post.stub!(:reflect_on_all_validations).and_return([])
     Post.stub!(:reflect_on_association).and_return do |column_name|
       case column_name
-      when :author
-        mock('reflection', :klass => Author, :macro => :belongs_to)
+      when :author, :author_status
+        mock('reflection', :options => {}, :klass => Author, :macro => :belongs_to)
       when :authors
-        mock('reflection', :klass => Author, :macro => :has_and_belongs_to_many)
+        mock('reflection', :options => {}, :klass => Author, :macro => :has_and_belongs_to_many)
       end
     end
     Post.stub!(:find).and_return([@freds_post])
@@ -234,6 +234,10 @@ describe 'Formtastic' do
         @new_post.stub!(:body)
         @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
       end
+      
+      after do
+        Formtastic::SemanticFormHelper.builder = Formtastic::SemanticFormBuilder
+      end
 
       it "can be overridden" do
 
@@ -286,6 +290,103 @@ describe 'Formtastic' do
       end
     end
 
+    describe '#label' do
+      it 'should humanize the given attribute' do
+        semantic_form_for(@new_post) do |builder|
+          builder.label(:login).should have_tag('label', :with => /Login/)
+        end
+      end
+
+      it 'should be printed as span' do
+        semantic_form_for(@new_post) do |builder|
+          builder.label(:login, nil, { :required => true, :as_span => true }).should have_tag('span.label abbr')
+        end
+      end
+
+      describe 'when required is given' do
+        it 'should append a required note' do
+          semantic_form_for(@new_post) do |builder|
+            builder.label(:login, nil, :required => true).should have_tag('label abbr')
+          end
+        end
+
+        it 'should allow require option to be given as second argument' do
+          semantic_form_for(@new_post) do |builder|
+            builder.label(:login, :required => true).should have_tag('label abbr')
+          end
+        end
+      end
+
+      describe 'when label is given' do
+        it 'should allow the text to be given as label option' do
+          semantic_form_for(@new_post) do |builder|
+            builder.label(:login, :required => true, :label => 'My label').should have_tag('label', :with => /My label/)
+          end
+        end
+
+        it 'should return nil if label is false' do
+          semantic_form_for(@new_post) do |builder|
+            builder.label(:login, :label => false).should be_blank
+          end
+        end
+      end
+    end
+
+    describe '#errors_on' do
+      before(:each) do
+        @title_errors = ['must not be blank', 'must be longer than 10 characters', 'must be awesome']
+        @errors = mock('errors')
+        @errors.stub!(:[]).with(:title).and_return(@title_errors)
+        @errors.stub!(:[]).with(:body).and_return(nil)
+        @new_post.stub!(:errors).and_return(@errors)
+      end
+
+      describe 'and the errors will be displayed as a sentence' do
+        it 'should render a paragraph with the errors joined into a sentence' do
+          Formtastic::SemanticFormBuilder.inline_errors = :sentence
+          semantic_form_for(@new_post) do |builder|
+            builder.errors_on(:title).should have_tag('p.inline-errors', @title_errors.to_sentence)
+          end
+        end
+      end
+
+      describe 'and the errors will be displayed as a list' do
+        it 'should render an unordered list with the class errors' do
+          Formtastic::SemanticFormBuilder.inline_errors = :list
+          semantic_form_for(@new_post) do |builder|
+            builder.errors_on(:title).should have_tag('ul.errors')
+          end
+        end
+
+        it 'should include a list element for each of the errors within the unordered list' do
+          Formtastic::SemanticFormBuilder.inline_errors = :list
+          semantic_form_for(@new_post) do |builder|
+            @title_errors.each do |error|
+              builder.errors_on(:title).should have_tag('ul.errors li', error)
+            end
+          end
+        end
+      end
+
+      describe 'but the errors will not be shown' do
+        it 'should return nil' do
+          Formtastic::SemanticFormBuilder.inline_errors = :none
+          semantic_form_for(@new_post) do |builder|
+            builder.errors_on(:title).should be_nil
+          end
+        end
+      end
+
+      describe 'and no error is found on the method' do
+        it 'should return nil' do
+          Formtastic::SemanticFormBuilder.inline_errors = :sentence
+          semantic_form_for(@new_post) do |builder|
+            builder.errors_on(:body).should be_nil
+          end
+        end
+      end
+    end
+
     describe '#input' do
 
       before do
@@ -472,13 +573,22 @@ describe 'Formtastic' do
 
           describe 'when not provided' do
 
-            it 'should default to a string for forms without objects' do
+            it 'should default to a string for forms without objects unless column is password' do
               semantic_form_for(:project, :url => 'http://test.host') do |builder|
                 concat(builder.input(:anything))
               end
               output_buffer.should have_tag('form li.string')
             end
 
+            it 'should default to password for forms without objects if column is password' do
+              semantic_form_for(:project, :url => 'http://test.host') do |builder|
+                concat(builder.input(:password))
+                concat(builder.input(:password_confirmation))
+                concat(builder.input(:confirm_password))
+              end
+              output_buffer.should have_tag('form li.password', :count => 3)
+            end
+
             it 'should default to a string for methods on objects that don\'t respond to "column_for_attribute"' do
               @new_post.stub!(:method_without_a_database_column)
               @new_post.stub!(:column_for_attribute).and_return(nil)
@@ -538,6 +648,10 @@ describe 'Formtastic' do
               default_input_type(:float).should == :numeric
               default_input_type(:decimal).should == :numeric
             end
+            
+            it 'should default to :country for :string columns named country' do
+              default_input_type(:string, :country).should == :country
+            end
 
             describe 'defaulting to file column' do
               Formtastic::SemanticFormBuilder.file_methods.each do |method|
@@ -561,7 +675,7 @@ describe 'Formtastic' do
           end
 
           it 'should call the corresponding input method' do
-            [:select, :time_zone, :radio, :date, :datetime, :time, :boolean].each do |input_style|
+            [:select, :time_zone, :radio, :date, :datetime, :time, :boolean, :check_boxes, :hidden].each do |input_style|
               @new_post.stub!(:generic_column_name)
               @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
               semantic_form_for(@new_post) do |builder|
@@ -583,9 +697,8 @@ describe 'Formtastic' do
         end
 
         describe ':label option' do
-
+          
           describe 'when provided' do
-
             it 'should be passed down to the label tag' do
               semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :label => "Kustom"))
@@ -593,35 +706,89 @@ describe 'Formtastic' do
               output_buffer.should have_tag("form li label", /Kustom/)
             end
 
+            it 'should not generate a label if false' do
+              semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :label => false))
+              end
+              output_buffer.should_not have_tag("form li label")
+            end
+
+            it 'should be dupped if frozen' do
+              semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :label => "Kustom".freeze))
+              end
+              output_buffer.should have_tag("form li label", /Kustom/)
+            end
           end
 
           describe 'when not provided' do
-            describe 'and object is not given' do
-              it 'should default the humanized method name, passing it down to the label tag' do
-                Formtastic::SemanticFormBuilder.label_str_method = :humanize
-
-                semantic_form_for(:project, :url => 'http://test.host') do |builder|
-                  concat(builder.input(:meta_description))
+            describe 'when localized label is NOT provided' do
+              describe 'and object is not given' do
+                it 'should default the humanized method name, passing it down to the label tag' do
+                  Formtastic::SemanticFormBuilder.label_str_method = :humanize
+              
+                  semantic_form_for(:project, :url => 'http://test.host') do |builder|
+                    concat(builder.input(:meta_description))
+                  end
+              
+                  output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
+                end
+              end
+              
+              describe 'and object is given' do
+                it 'should delegate the label logic to class human attribute name and pass it down to the label tag' do
+                  @new_post.stub!(:meta_description) # a two word method name
+                  @new_post.class.should_receive(:human_attribute_name).with('meta_description').and_return('meta_description'.humanize)
+              
+                  semantic_form_for(@new_post) do |builder|
+                    concat(builder.input(:meta_description))
+                  end
+              
+                  output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
                 end
-
-                output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
               end
             end
-
-            describe 'and object is given' do
-              it 'should delegate the label logic to class human attribute name and pass it down to the label tag' do
-                @new_post.stub!(:meta_description) # a two word method name
-                @new_post.class.should_receive(:human_attribute_name).with('meta_description').and_return('meta_description'.humanize)
-
+            
+            describe 'when localized label is provided' do
+              before do
+                @localized_label_text = 'Localized title'
+                @default_localized_label_text = 'Default localized title'
+                ::I18n.backend.store_translations :en,
+                  :formtastic => {
+                      :labels => {
+                        :title => @default_localized_label_text,
+                        :post => {
+                          :title => @localized_label_text
+                         }
+                       }
+                    }
+                ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
+              end
+
+              it 'should render a label with localized label (I18n)' do
                 semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:meta_description))
+                  concat(builder.input(:title, :label => true))
                 end
-
-                output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
+                output_buffer.should have_tag('form li label', @localized_label_text)
+              end
+
+              it 'should render a hint paragraph containing an optional localized label (I18n) if first is not set' do
+                ::I18n.backend.store_translations :en,
+                  :formtastic => {
+                      :labels => {
+                        :post => {
+                          :title => nil
+                         }
+                       }
+                    }
+                semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:title, :label => true))
+                end
+                output_buffer.should have_tag('form li label', @default_localized_label_text)
               end
             end
           end
-
+          
         end
 
         describe ':hint option' do
@@ -637,12 +804,104 @@ describe 'Formtastic' do
           end
 
           describe 'when not provided' do
-            it 'should not render a hint paragraph' do
-              hint_text = "this is the title of the post"
+            describe 'when localized hint (I18n) is provided' do
+              before do
+                @localized_hint_text = "This is the localized hint."
+                @default_localized_hint_text = "This is the default localized hint."
+                ::I18n.backend.store_translations :en,
+                  :formtastic => {
+                      :hints => {
+                        :title => @default_localized_hint_text,
+                        :post => {
+                          :title => @localized_hint_text
+                         }
+                       }
+                    }
+                ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
+              end
+              
+              describe 'when provided value (hint value) is set to TRUE' do
+                it 'should render a hint paragraph containing a localized hint (I18n)' do
+                  semantic_form_for(@new_post) do |builder|
+                    concat(builder.input(:title, :hint => true))
+                  end
+                  output_buffer.should have_tag('form li p.inline-hints', @localized_hint_text)
+                end
+                
+                it 'should render a hint paragraph containing an optional localized hint (I18n) if first is not set' do
+                  ::I18n.backend.store_translations :en,
+                  :formtastic => {
+                      :hints => {
+                        :post => {
+                          :title => nil
+                         }
+                       }
+                    }
+                  semantic_form_for(@new_post) do |builder|
+                    concat(builder.input(:title, :hint => true))
+                  end
+                  output_buffer.should have_tag('form li p.inline-hints', @default_localized_hint_text)
+                end
+              end
+              
+              describe 'when provided value (label value) is set to FALSE' do
+                it 'should not render a hint paragraph' do
+                  semantic_form_for(@new_post) do |builder|
+                    concat(builder.input(:title, :hint => false))
+                  end
+                  output_buffer.should_not have_tag('form li p.inline-hints', @localized_hint_text)
+                end
+              end
+            end
+            
+            describe 'when localized hint (I18n) is not provided' do
+              it 'should not render a hint paragraph' do
+                semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:title))
+                end
+                output_buffer.should_not have_tag('form li p.inline-hints')
+              end
+            end
+          end
+
+        end
+
+        describe ':wrapper_html option' do
+
+          describe 'when provided' do
+            it 'should be passed down to the li tag' do
+              semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :wrapper_html => {:id => :another_id}))
+              end
+              output_buffer.should have_tag("form li#another_id")
+            end
+
+            it 'should append given classes to li default classes' do
+              semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :wrapper_html => {:class => :another_class}, :required => true))
+              end
+              output_buffer.should have_tag("form li.string")
+              output_buffer.should have_tag("form li.required")
+              output_buffer.should have_tag("form li.another_class")
+            end
+
+            it 'should allow classes to be an array' do
+              semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :wrapper_html => {:class => [ :my_class, :another_class ]}))
+              end
+              output_buffer.should have_tag("form li.string")
+              output_buffer.should have_tag("form li.my_class")
+              output_buffer.should have_tag("form li.another_class")
+            end
+          end
+
+          describe 'when not provided' do
+            it 'should use default id and class' do
               semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title))
               end
-              output_buffer.should_not have_tag("form li p.inline-hints")
+              output_buffer.should have_tag("form li#post_title_input")
+              output_buffer.should have_tag("form li.string")
             end
           end
 
@@ -660,11 +919,10 @@ describe 'Formtastic' do
         end
 
         describe 'when there are errors on the object for this method' do
-
           before do
             @title_errors = ['must not be blank', 'must be longer than 10 characters', 'must be awesome']
             @errors = mock('errors')
-            @errors.stub!(:on).with('title').and_return(@title_errors)
+            @errors.stub!(:[]).with(:title).and_return(@title_errors)
             @new_post.stub!(:errors).and_return(@errors)
           end
 
@@ -682,65 +940,24 @@ describe 'Formtastic' do
             output_buffer.should_not have_tag('div.fieldWithErrors')
           end
 
-          describe 'and the errors will be displayed as a sentence' do
-
-            before do
-              Formtastic::SemanticFormBuilder.inline_errors = :sentence
-              semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:title))
-              end
-            end
-
-            it 'should render a paragraph with the errors joined into a sentence' do
-              output_buffer.should have_tag('form li.error p.inline-errors', @title_errors.to_sentence)
-            end
-
-          end
-
-          describe 'and the errors will be displayed as a list' do
-
-            before do
-              Formtastic::SemanticFormBuilder.inline_errors = :list
-              semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:title))
-              end
-            end
-
-            it 'should render an unordered list with the class errors' do
-              output_buffer.should have_tag('form li.error ul.errors')
-            end
-
-            it 'should include a list element for each of the errors within the unordered list' do
-              @title_errors.each do |error|
-                output_buffer.should have_tag('form li.error ul.errors li', error)
-              end
+          it 'should render a paragraph for the errors' do
+            Formtastic::SemanticFormBuilder.inline_errors = :sentence
+            semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:title))
             end
-
+            output_buffer.should have_tag('form li.error p.inline-errors')
           end
 
-          describe 'but the errors will not be shown' do
-
-            before do
-              Formtastic::SemanticFormBuilder.inline_errors = :none
-              semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:title))
-              end
-            end
-
-            it 'should not display an error sentence' do
-              output_buffer.should_not have_tag('form li.error p.inline-errors')
-            end
-
-            it 'should not display an error list' do
-              output_buffer.should_not have_tag('form li.error ul.errors')
+          it 'should not display an error list' do
+            Formtastic::SemanticFormBuilder.inline_errors = :list
+            semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:title))
             end
-
+            output_buffer.should have_tag('form li.error ul.errors')
           end
-
         end
 
         describe 'when there are no errors on the object for this method' do
-
           before do
             semantic_form_for(@new_post) do |builder|
               concat(builder.input(:title))
@@ -758,11 +975,9 @@ describe 'Formtastic' do
           it 'should not display an error list' do
             output_buffer.should_not have_tag('form li.error ul.errors')
           end
-
         end
 
         describe 'when no object is provided' do
-
           before do
             semantic_form_for(:project, :url => 'http://test.host') do |builder|
               concat(builder.input(:title))
@@ -780,7 +995,6 @@ describe 'Formtastic' do
           it 'should not display an error list' do
             output_buffer.should_not have_tag('form li.error ul.errors')
           end
-
         end
       end
 
@@ -821,31 +1035,33 @@ describe 'Formtastic' do
             output_buffer.should have_tag("form li input[@name=\"post[title]\"]")
           end
 
-          it 'should have a maxlength matching the column limit' do
-            @new_post.column_for_attribute(:title).limit.should == 50
-            output_buffer.should have_tag("form li input[@maxlength='50']")
-          end
+          unless type == :numeric
+            it 'should have a maxlength matching the column limit' do
+              @new_post.column_for_attribute(:title).limit.should == 50
+              output_buffer.should have_tag("form li input[@maxlength='50']")
+            end
 
-          it 'should use default_text_field_size for columns longer than default_text_field_size' do
-            default_size = Formtastic::SemanticFormBuilder.default_text_field_size
-            @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => type, :limit => default_size * 2))
+            it 'should use default_text_field_size for columns longer than default_text_field_size' do
+              default_size = Formtastic::SemanticFormBuilder.default_text_field_size
+              @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => type, :limit => default_size * 2))
 
-            semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:title, :as => type))
+              semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :as => type))
+              end
+
+              output_buffer.should have_tag("form li input[@size='#{default_size}']")
             end
 
-            output_buffer.should have_tag("form li input[@size='#{default_size}']")
-          end
+            it 'should use the column size for columns shorter than default_text_field_size' do
+              column_limit_shorted_than_default = 1
+              @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => type, :limit => column_limit_shorted_than_default))
 
-          it 'should use the column size for columns shorter than default_text_field_size' do
-            column_limit_shorted_than_default = 1
-            @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => type, :limit => column_limit_shorted_than_default))
+              semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :as => type))
+              end
 
-            semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:title, :as => type))
+              output_buffer.should have_tag("form li input[@size='#{column_limit_shorted_than_default}']")
             end
-
-            output_buffer.should have_tag("form li input[@size='#{column_limit_shorted_than_default}']")
           end
 
           it 'should use default_text_field_size for methods without database columns' do
@@ -866,6 +1082,13 @@ describe 'Formtastic' do
             output_buffer.should have_tag("form li input.myclass")
           end
 
+          it 'should consider input_html :id in labels' do
+            semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:title, :as => type, :input_html => { :id => 'myid' }))
+            end
+            output_buffer.should have_tag('form li label[@for="myid"]')
+          end
+
           it 'should generate input and labels even if no object is given' do
             semantic_form_for(:project, :url => 'http://test.host/') do |builder|
               concat(builder.input(:title, :as => type))
@@ -947,139 +1170,206 @@ describe 'Formtastic' do
 
           end
 
-          it 'should generate input and labels even if no object is given' do
-            semantic_form_for(:project, :url => 'http://test.host/') do |builder|
-              concat(builder.input(:title, :as => type))
+          describe 'when no object is given' do
+            before(:each) do
+              semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+                concat(builder.input(:title, :as => type))
+              end
             end
 
-            output_buffer.should have_tag('form li label')
-            output_buffer.should have_tag('form li label[@for="project_title"')
-            output_buffer.should have_tag('form li label', /Title/)
+            it 'should generate input' do
+              if template_method.to_s =~ /_field$/ # password_field
+                output_buffer.should have_tag("form li input")
+                output_buffer.should have_tag("form li input#project_title")
+                output_buffer.should have_tag("form li input[@type=\"#{input_type}\"]")
+                output_buffer.should have_tag("form li input[@name=\"project[title]\"]")
+              else
+                output_buffer.should have_tag("form li #{input_type}")
+                output_buffer.should have_tag("form li #{input_type}#project_title")
+                output_buffer.should have_tag("form li #{input_type}[@name=\"project[title]\"]")
+              end
+            end
 
-            if template_method.to_s =~ /_field$/ # password_field
-              output_buffer.should have_tag("form li input")
-              output_buffer.should have_tag("form li input#project_title")
-              output_buffer.should have_tag("form li input[@type=\"#{input_type}\"]")
-              output_buffer.should have_tag("form li input[@name=\"project[title]\"]")
-            else
-              output_buffer.should have_tag("form li #{input_type}")
-              output_buffer.should have_tag("form li #{input_type}#project_title")
-              output_buffer.should have_tag("form li #{input_type}[@name=\"project[title]\"]")
+            it 'should generate labels' do
+              output_buffer.should have_tag('form li label')
+              output_buffer.should have_tag('form li label[@for="project_title"')
+              output_buffer.should have_tag('form li label', /Title/)
             end
           end
 
         end
       end
 
+      describe ":as => :hidden" do
+        before do
+          @new_post.stub!(:hidden)
+          @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :string))
 
-      describe ':as => :radio' do
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:hidden, :as => :hidden))
+          end
+        end
 
-        before do
-          @new_post.stub!(:author).and_return(@bob)
-          @new_post.stub!(:author_id).and_return(@bob.id)
-          @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :integer, :limit => 255))
+        it "should have a hidden class on the wrapper" do
+          output_buffer.should have_tag('form li.hidden')
         end
 
-        describe 'for belongs_to association' do
-          before do
-            semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:author, :as => :radio, :value_as_class => true))
-            end
-          end
+        it 'should have a post_hidden_input id on the wrapper' do
+          output_buffer.should have_tag('form li#post_hidden_input')
+        end
 
-          it 'should have a radio class on the wrapper' do
-            output_buffer.should have_tag('form li.radio')
-          end
+        it 'should not generate a label for the input' do
+          output_buffer.should_not have_tag('form li label')
+        end
 
-          it 'should have a post_author_id_input id on the wrapper' do
-            output_buffer.should have_tag('form li#post_author_input')
-          end
+        it "should generate a input field" do
+          output_buffer.should have_tag("form li input#post_hidden")
+          output_buffer.should have_tag("form li input[@type=\"hidden\"]")
+          output_buffer.should have_tag("form li input[@name=\"post[hidden]\"]")
+        end
+      end
 
-          it 'should generate a fieldset and legend containing label text for the input' do
-            output_buffer.should have_tag('form li fieldset')
-            output_buffer.should have_tag('form li fieldset legend')
-            output_buffer.should have_tag('form li fieldset legend', /Author/)
-          end
+      describe ":as => :time_zone" do
+        before do
+          @new_post.stub!(:time_zone)
+          @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :string))
 
-          it 'should generate an ordered list with a list item for each choice' do
-            output_buffer.should have_tag('form li fieldset ol')
-            output_buffer.should have_tag('form li fieldset ol li', :count => Author.find(:all).size)
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:time_zone))
           end
+        end
 
-          it 'should have one option with a "selected" attribute' do
-            output_buffer.should have_tag('form li input[@checked]', :count => 1)
-          end
+        it "should have a time_zone class on the wrapper" do
+          output_buffer.should have_tag('form li.time_zone')
+        end
 
-          describe "each choice" do
+        it 'should have a post_title_input id on the wrapper' do
+          output_buffer.should have_tag('form li#post_time_zone_input')
+        end
 
-            it 'should contain a label for the radio input with a nested input and label text' do
-              Author.find(:all).each do |author|
-                output_buffer.should have_tag('form li fieldset ol li label')
-                output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
-                output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_id_#{author.id}']")
-                output_buffer.should have_tag("form li fieldset ol li label input")
-              end
-            end
+        it 'should generate a label for the input' do
+          output_buffer.should have_tag('form li label')
+          output_buffer.should have_tag('form li label[@for="post_time_zone"')
+          output_buffer.should have_tag('form li label', /Time zone/)
+        end
 
-            it 'should use values as li.class when value_as_class is true' do
-              Author.find(:all).each do |author|
-                output_buffer.should have_tag("form li fieldset ol li.#{author.id} label")
-              end
-            end
+        it "should generate a select" do
+          output_buffer.should have_tag("form li select")
+          output_buffer.should have_tag("form li select#post_time_zone")
+          output_buffer.should have_tag("form li select[@name=\"post[time_zone]\"]")
+        end
 
-            it "should have a radio input" do
-              Author.find(:all).each do |author|
-                output_buffer.should have_tag("form li fieldset ol li label input#post_author_id_#{author.id}")
-                output_buffer.should have_tag("form li fieldset ol li label input[@type='radio']")
-                output_buffer.should have_tag("form li fieldset ol li label input[@value='#{author.id}']")
-                output_buffer.should have_tag("form li fieldset ol li label input[@name='post[author_id]']")
-              end
+        it 'should use input_html to style inputs' do
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:time_zone, :input_html => { :class => 'myclass' }))
+          end
+          output_buffer.should have_tag("form li select.myclass")
+        end
+
+        describe 'when no object is given' do
+          before(:each) do
+            semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+              concat(builder.input(:time_zone, :as => :time_zone))
             end
+          end
 
-            it "should mark input as checked if it's the the existing choice" do
-              @new_post.author_id.should == @bob.id
-              @new_post.author.id.should == @bob.id
-              @new_post.author.should == @bob
+          it 'should generate labels' do
+            output_buffer.should have_tag('form li label')
+            output_buffer.should have_tag('form li label[@for="project_time_zone"')
+            output_buffer.should have_tag('form li label', /Time zone/)
+          end
 
+          it 'should generate select inputs' do
+            output_buffer.should have_tag("form li select")
+            output_buffer.should have_tag("form li select#project_time_zone")
+            output_buffer.should have_tag("form li select[@name=\"project[time_zone]\"]")
+          end
+        end
+      end
+      
+      describe ":as => :country" do
+        
+        before do
+          @new_post.stub!(:country)
+          @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :string))
+        end
+        
+        describe "when country_select is not available as a helper from a plugin" do
+          
+          it "should raise an error, sugesting the author installs a plugin" do
+            lambda { 
               semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:author, :as => :radio))
+                concat(builder.input(:country, :as => :country))
               end
-
-              output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
-            end
+            }.should raise_error  
           end
-
-          it 'should generate a fieldset, legend, labels and inputs even if no object is given' do
-            output_buffer.replace ''
-
-            semantic_form_for(:project, :url => 'http://test.host') do |builder|
-              concat(builder.input(:author_id, :as => :radio, :collection => Author.find(:all)))
+          
+        end
+        
+        describe "when country_select is available as a helper (from a plugin)" do
+          
+          before do
+            semantic_form_for(@new_post) do |builder|
+              builder.stub!(:country_select).and_return("<select><option>...</option></select>")
+              concat(builder.input(:country, :as => :country))
             end
+          end
+          
+          it "should have a time_zone class on the wrapper" do
+            output_buffer.should have_tag('form li.country')
+          end
 
-            output_buffer.should have_tag('form li fieldset legend', /Author/)
-            output_buffer.should have_tag('form li fieldset ol li', :count => Author.find(:all).size)
+          it 'should have a post_title_input id on the wrapper' do
+            output_buffer.should have_tag('form li#post_country_input')
+          end
 
-            Author.find(:all).each do |author|
-              output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
-              output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
+          it 'should generate a label for the input' do
+            output_buffer.should have_tag('form li label')
+            output_buffer.should have_tag('form li label[@for="post_country"')
+            output_buffer.should have_tag('form li label', /Country/)
+          end
 
-              output_buffer.should have_tag("form li fieldset ol li label input#project_author_id_#{author.id}")
-              output_buffer.should have_tag("form li fieldset ol li label input[@type='radio']")
-              output_buffer.should have_tag("form li fieldset ol li label input[@value='#{author.id}']")
-              output_buffer.should have_tag("form li fieldset ol li label input[@name='project[author_id]']")
+          it "should generate a select" do
+            output_buffer.should have_tag("form li select")
+          end
+          
+        end
+        
+        describe ":priority_countries option" do
+            
+          it "should be passed down to the country_select helper when provided" do
+            priority_countries = ["Foo", "Bah"]
+            semantic_form_for(@new_post) do |builder|
+              builder.stub!(:country_select).and_return("<select><option>...</option></select>")
+              builder.should_receive(:country_select).with(:country, priority_countries, {}, {}).and_return("<select><option>...</option></select>")
+              
+              concat(builder.input(:country, :as => :country, :priority_countries => priority_countries))
+            end
+          end
+            
+          it "should default to the @@priority_countries config when absent" do 
+            priority_countries = Formtastic::SemanticFormBuilder.priority_countries
+            priority_countries.should_not be_empty
+            priority_countries.should_not be_nil
+            
+            semantic_form_for(@new_post) do |builder|
+              builder.stub!(:country_select).and_return("<select><option>...</option></select>")
+              builder.should_receive(:country_select).with(:country, priority_countries, {}, {}).and_return("<select><option>...</option></select>")
+              
+              concat(builder.input(:country, :as => :country))
             end
           end
-
+          
         end
-
+        
       end
-
-      describe ':as => :check_boxes' do
+      
+      describe ':as => :radio' do
 
         before do
           @new_post.stub!(:author).and_return(@bob)
           @new_post.stub!(:author_id).and_return(@bob.id)
-          @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :integer, :limit => 255))
+          Post.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Author, :macro => :belongs_to) }
         end
 
         describe 'for belongs_to association' do
@@ -1093,7 +1383,7 @@ describe 'Formtastic' do
             output_buffer.should have_tag('form li.radio')
           end
 
-          it 'should have a post_author_id_input id on the wrapper' do
+          it 'should have a post_author_input id on the wrapper' do
             output_buffer.should have_tag('form li#post_author_input')
           end
 
@@ -1108,7 +1398,7 @@ describe 'Formtastic' do
             output_buffer.should have_tag('form li fieldset ol li', :count => Author.find(:all).size)
           end
 
-          it 'should have one option with a "selected" attribute' do
+          it 'should have one option with a "checked" attribute' do
             output_buffer.should have_tag('form li input[@checked]', :count => 1)
           end
 
@@ -1116,10 +1406,8 @@ describe 'Formtastic' do
 
             it 'should contain a label for the radio input with a nested input and label text' do
               Author.find(:all).each do |author|
-                output_buffer.should have_tag('form li fieldset ol li label')
                 output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
                 output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_id_#{author.id}']")
-                output_buffer.should have_tag("form li fieldset ol li label input")
               end
             end
 
@@ -1151,29 +1439,39 @@ describe 'Formtastic' do
             end
           end
 
-          it 'should generate a fieldset, legend, labels and inputs even if no object is given' do
-            output_buffer.replace ''
+          describe 'and no object is given' do
+            before(:each) do
+              output_buffer.replace ''
+              semantic_form_for(:project, :url => 'http://test.host') do |builder|
+                concat(builder.input(:author_id, :as => :radio, :collection => Author.find(:all)))
+              end
+            end
 
-            semantic_form_for(:project, :url => 'http://test.host') do |builder|
-              concat(builder.input(:author_id, :as => :radio, :collection => Author.find(:all)))
+            it 'should generate a fieldset with legend' do
+              output_buffer.should have_tag('form li fieldset legend', /Author/)
             end
 
-            output_buffer.should have_tag('form li fieldset legend', /Author/)
-            output_buffer.should have_tag('form li fieldset ol li', :count => Author.find(:all).size)
+            it 'shold generate an li tag for each item in the collection' do
+              output_buffer.should have_tag('form li fieldset ol li', :count => Author.find(:all).size)
+            end
 
-            Author.find(:all).each do |author|
-              output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
-              output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
+            it 'should generate labels for each item' do
+              Author.find(:all).each do |author|
+                output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
+                output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
+              end
+            end
 
-              output_buffer.should have_tag("form li fieldset ol li label input#project_author_id_#{author.id}")
-              output_buffer.should have_tag("form li fieldset ol li label input[@type='radio']")
-              output_buffer.should have_tag("form li fieldset ol li label input[@value='#{author.id}']")
-              output_buffer.should have_tag("form li fieldset ol li label input[@name='project[author_id]']")
+            it 'should generate inputs for each item' do
+              Author.find(:all).each do |author|
+                output_buffer.should have_tag("form li fieldset ol li label input#project_author_id_#{author.id}")
+                output_buffer.should have_tag("form li fieldset ol li label input[@type='radio']")
+                output_buffer.should have_tag("form li fieldset ol li label input[@value='#{author.id}']")
+                output_buffer.should have_tag("form li fieldset ol li label input[@name='project[author_id]']")
+              end
             end
           end
-
         end
-
       end
 
       describe ':as => :select' do
@@ -1217,9 +1515,13 @@ describe 'Formtastic' do
           it 'should create a select without size' do
             output_buffer.should_not have_tag('form li select[@size]')
           end
-
+          
+          it 'should have a blank option' do
+            output_buffer.should have_tag("form li select option[@value='']")
+          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
@@ -1228,6 +1530,18 @@ describe 'Formtastic' do
           it 'should have one option with a "selected" attribute' do
             output_buffer.should have_tag('form li select option[@selected]', :count => 1)
           end
+
+          it 'should not singularize the association name' do
+            @new_post.stub!(:author_status).and_return(@bob)
+            @new_post.stub!(:author_status_id).and_return(@bob.id)
+            @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :integer, :limit => 255))
+
+            semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:author_status, :as => :select))
+            end
+
+            output_buffer.should have_tag('form li select#post_author_status_id')
+          end
         end
 
         describe 'for a has_many association' do
@@ -1247,7 +1561,7 @@ describe 'Formtastic' do
 
           it 'should have a label inside the wrapper' do
             output_buffer.should have_tag('form li label')
-            output_buffer.should have_tag('form li label', /Posts/)
+            output_buffer.should have_tag('form li label', /Post/)
             output_buffer.should have_tag("form li label[@for='author_post_ids']")
           end
 
@@ -1266,6 +1580,10 @@ describe 'Formtastic' do
               output_buffer.should have_tag("form li select option[@value='#{post.id}']", /#{post.to_label}/)
             end
           end
+          
+          it 'should not have a blank option' do
+            output_buffer.should_not have_tag("form li select option[@value='']")
+          end
 
           it 'should have one option with a "selected" attribute' do
             output_buffer.should have_tag('form li select option[@selected]', :count => 1)
@@ -1289,7 +1607,7 @@ describe 'Formtastic' do
 
           it 'should have a label inside the wrapper' do
             output_buffer.should have_tag('form li label')
-            output_buffer.should have_tag('form li label', /Authors/)
+            output_buffer.should have_tag('form li label', /Author/)
             output_buffer.should have_tag("form li label[@for='post_author_ids']")
           end
 
@@ -1308,42 +1626,179 @@ describe 'Formtastic' do
               output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
             end
           end
+          
+          it 'should not have a blank option' do
+            output_buffer.should_not have_tag("form li select option[@value='']")
+          end
 
           it 'should have one option with a "selected" attribute' 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 => true, :prompt => "choose author"))
+              concat(builder.input(:author, :as => :select, :include_blank => false))
             end
           end
+          
+          it 'should not have a blank option' do
+            output_buffer.should_not have_tag("form li select option[@value='']", "")
+          end
+        end
 
-          it 'should have a blank select option' do
-            output_buffer.should have_tag("form li select option[@value='']", //)
+        describe 'when :prompt => "choose something" is 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, :prompt => "choose author"))
+            end
           end
 
           it 'should have a select with prompt' do
             output_buffer.should have_tag("form li select option[@value='']", /choose author/)
           end
+
+          it 'should not have a blank select option' do
+            output_buffer.should_not have_tag("form li select option[@value='']", "")
+          end
         end
 
-        it 'should generate label, select and options even if object is not given' do
-          semantic_form_for(:project, :url => 'http://test.host') do |builder|
-            concat(builder.input(:author, :as => :select, :collection => Author.find(:all)))
+        describe 'when no object is given' do
+          before(:each) do
+            semantic_form_for(:project, :url => 'http://test.host') do |builder|
+              concat(builder.input(:author, :as => :select, :collection => Author.find(:all)))
+            end
+          end
+
+          it 'should generate label' do
+            output_buffer.should have_tag('form li label', /Author/)
+            output_buffer.should have_tag("form li label[@for='project_author']")
+          end
+
+          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 + 1)
+          end
+
+          it 'should generate an option to each item' do
+            Author.find(:all).each do |author|
+              output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
+            end
+          end
+        end
+      end
+
+      describe ':as => :check_boxes' do
+
+        describe 'for a has_many association' do
+          before do
+            semantic_form_for(@fred) do |builder|
+              concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true))
+            end
+          end
+
+          it 'should have a check_boxes class on the wrapper' do
+            output_buffer.should have_tag('form li.check_boxes')
+          end
+
+          it 'should have a author_posts_input id on the wrapper' do
+            output_buffer.should have_tag('form li#author_posts_input')
+          end
+
+          it 'should generate a fieldset and legend containing label text for the input' do
+            output_buffer.should have_tag('form li fieldset')
+            output_buffer.should have_tag('form li fieldset legend')
+            output_buffer.should have_tag('form li fieldset legend', /Posts/)
+          end
+
+          it 'should generate an ordered list with a list item for each choice' do
+            output_buffer.should have_tag('form li fieldset ol')
+            output_buffer.should have_tag('form li fieldset ol li', :count => Post.find(:all).size)
+          end
+
+          it 'should have one option with a "checked" attribute' do
+            output_buffer.should have_tag('form li input[@checked]', :count => 1)
+          end
+
+          it 'should generate hidden inputs with default value blank' do
+            output_buffer.should have_tag("form li fieldset ol li label input[@type='hidden'][@value='']", :count => Post.find(:all).size)
+          end
+
+          describe "each choice" do
+
+            it 'should contain a label for the radio input with a nested input and label text' do
+              Post.find(:all).each do |post|
+                output_buffer.should have_tag('form li fieldset ol li label', /#{post.to_label}/)
+                output_buffer.should have_tag("form li fieldset ol li label[@for='author_post_ids_#{post.id}']")
+              end
+            end
+
+            it 'should use values as li.class when value_as_class is true' do
+              Post.find(:all).each do |post|
+                output_buffer.should have_tag("form li fieldset ol li.#{post.id} label")
+              end
+            end
+
+            it 'should have a checkbox input for each post' do
+              Post.find(:all).each do |post|
+                output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
+                output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => 2)
+              end
+            end
+
+            it "should mark input as checked if it's the the existing choice" do
+              Post.find(:all).include?(@fred.posts.first).should be_true
+              output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
+            end
           end
 
-          output_buffer.should have_tag('form li label', /Author/)
-          output_buffer.should have_tag("form li label[@for='project_author']")
+          describe 'and no object is given' do
+            before(:each) do
+              output_buffer.replace ''
+              semantic_form_for(:project, :url => 'http://test.host') do |builder|
+                concat(builder.input(:author_id, :as => :check_boxes, :collection => Author.find(:all)))
+              end
+            end
+
+            it 'should generate a fieldset with legend' do
+              output_buffer.should have_tag('form li fieldset legend', /Author/)
+            end
 
-          output_buffer.should have_tag('form li select#project_author')
-          output_buffer.should have_tag('form li select option', :count => Author.find(:all).size)
+            it 'shold generate an li tag for each item in the collection' do
+              output_buffer.should have_tag('form li fieldset ol li', :count => Author.find(:all).size)
+            end
+
+            it 'should generate labels for each item' do
+              Author.find(:all).each do |author|
+                output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
+                output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
+              end
+            end
 
-          Author.find(:all).each do |author|
-            output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
+            it 'should generate inputs for each item' do
+              Author.find(:all).each do |author|
+                output_buffer.should have_tag("form li fieldset ol li label input#project_author_id_#{author.id}")
+                output_buffer.should have_tag("form li fieldset ol li label input[@type='checkbox']")
+                output_buffer.should have_tag("form li fieldset ol li label input[@value='#{author.id}']")
+                output_buffer.should have_tag("form li fieldset ol li label input[@name='project[author_id][]']")
+              end
+            end
           end
         end
       end
@@ -1356,7 +1811,7 @@ describe 'Formtastic' do
           @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :integer, :limit => 255))
         end
 
-        { :select => :option, :radio => :input }.each do |type, countable|
+        { :select => :option, :radio => :input, :check_boxes => :'input[@type="checkbox"]' }.each do |type, countable|
 
           describe ":as => #{type.inspect}" do
             describe 'when the :collection option is not provided' do
@@ -1397,7 +1852,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
@@ -1411,9 +1866,9 @@ describe 'Formtastic' do
                     concat(builder.input(:category_name, :as => type, :collection => @categories))
                   end
 
-                  @categories.each do |item|
-                    output_buffer.should have_tag("form li.#{type}", /#{item}/)
-                    output_buffer.should have_tag("form li.#{type} #{countable}[@value=#{item}]")
+                  @categories.each do |value|
+                    output_buffer.should have_tag("form li.#{type}", /#{value}/)
+                    output_buffer.should have_tag("form li.#{type} #{countable}[@value='#{value}']")
                   end
                 end
 
@@ -1446,7 +1901,7 @@ describe 'Formtastic' do
 
                   @categories.each do |label, value|
                     output_buffer.should have_tag("form li.#{type}", /#{label}/)
-                    output_buffer.should have_tag("form li.#{type} #{countable}[@value=#{value}]")
+                    output_buffer.should have_tag("form li.#{type} #{countable}[@value='#{value}']")
                   end
                 end
               end
@@ -1459,12 +1914,13 @@ describe 'Formtastic' do
 
                 it "should use the first value as the label text and the last value as the value attribute for #{countable}" do
                   semantic_form_for(@new_post) do |builder|
-                    concat(builder.input(:category_name, :as => :radio, :collection => @categories))
+                    concat(builder.input(:category_name, :as => type, :collection => @categories))
                   end
 
-                  @categories.each do |label, value|
-                    output_buffer.should have_tag('form li fieldset ol li label', /#{label}/i)
-                    output_buffer.should have_tag('form li fieldset ol li label input[@value='+value+']')
+                  @categories.each do |text, value|
+                    label = type == :select ? :option : :label
+                    output_buffer.should have_tag("form li.#{type} #{label}", /#{text}/i)
+                    output_buffer.should have_tag("form li.#{type} #{countable}[@value='#{value.to_s}']")
                   end
                 end
               end
@@ -1477,12 +1933,13 @@ describe 'Formtastic' do
 
                 it "should use the symbol as the label text and value for each #{countable}" do
                   semantic_form_for(@new_post) do |builder|
-                    concat(builder.input(:category_name, :as => :radio, :collection => @categories))
+                    concat(builder.input(:category_name, :as => type, :collection => @categories))
                   end
 
                   @categories.each do |value|
-                    output_buffer.should have_tag('form li fieldset ol li label', /#{value}/i)
-                    output_buffer.should have_tag('form li fieldset ol li label input[@value='+value.to_s+']')
+                    label = type == :select ? :option : :label
+                    output_buffer.should have_tag("form li.#{type} #{label}", /#{value}/i)
+                    output_buffer.should have_tag("form li.#{type} #{countable}[@value='#{value.to_s}']")
                   end
                 end
               end
@@ -1539,8 +1996,15 @@ describe 'Formtastic' do
               end
 
             end
+          end
+        end
+
+        describe 'for boolean attributes' do
+
+          { :select => :option, :radio => :input }.each do |type, countable|
+            checked_or_selected = { :select => :selected, :radio => :checked }[type]
 
-            describe 'when attribute is a boolean' do
+            describe ":as => #{type.inspect}" do
 
               before do
                 @new_post.stub!(:allow_comments)
@@ -1564,7 +2028,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
@@ -1588,8 +2052,6 @@ describe 'Formtastic' do
                 end
               end
 
-              checked_or_selected = { :select => :selected, :radio => :checked }[type]
-
               describe 'when the value is nil' do
                 before do
                   @new_post.stub!(:allow_comments).and_return(nil)
@@ -1656,6 +2118,7 @@ describe 'Formtastic' do
                 end
               end
             end
+
           end
         end
       end
@@ -1758,24 +2221,21 @@ describe 'Formtastic' do
         end
 
         describe 'when :discard_input => true is set' do
-
           it 'should use default hidden value equals to 1 when attribute returns nil' do
-                      pending
             semantic_form_for(@new_post) do |builder|
               concat(builder.input(:publish_at, :as => :datetime, :discard_day => true))
             end
 
-            output_buffer.should have_tag("form li fieldset ol input[@type='hidden'][@value='1']")
+            output_buffer.should have_tag("form li input[@type='hidden'][@value='1']")
           end
 
           it 'should use default attribute value when it is not nil' do
-            pending
             @new_post.stub!(:publish_at).and_return(Date.new(2007,12,27))
             semantic_form_for(@new_post) do |builder|
               concat(builder.input(:publish_at, :as => :datetime, :discard_day => true))
             end
 
-            output_buffer.should have_tag("form li fieldset ol input[@type='hidden'][@value='27']")
+            output_buffer.should have_tag("form li input[@type='hidden'][@value='27']")
           end
         end
 
@@ -1848,16 +2308,25 @@ describe 'Formtastic' do
           end
         end
 
-        it 'should have fieldset, legend, label and selects even if object is not given' do
-          output_buffer.replace ''
+        describe 'when no object is given' do
+          before(:each) do
+            output_buffer.replace ''
+            semantic_form_for(:project, :url => 'http://test.host') do |@builder|
+              concat(@builder.input(:publish_at, :as => :datetime))
+            end
+          end
 
-          semantic_form_for(:project, :url => 'http://test.host') do |@builder|
-            concat(@builder.input(:publish_at, :as => :datetime))
+          it 'should have fieldset with legend' do
+            output_buffer.should have_tag('form li.datetime fieldset legend', /Publish at/)
           end
 
-          output_buffer.should have_tag('form li.datetime fieldset legend', /Publish at/)
-          output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => 5)
-          output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5)
+          it 'should have labels for each input' do
+            output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => 5)
+          end
+
+          it 'should have selects for each inputs' do
+            output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5)
+          end
         end
       end
 
@@ -1885,19 +2354,18 @@ describe 'Formtastic' do
 
         it 'should have an ordered list of two items inside the fieldset' do
           output_buffer.should have_tag('form li.time fieldset ol')
-#          output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
+          output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
         end
 
         it 'should have five labels for hour and minute' do
-          pending
           output_buffer.should have_tag('form li.time fieldset ol li label', :count => 2)
           output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
           output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
         end
 
-        it 'should have five selects for hour and minute' do
-          pending
-          output_buffer.should have_tag('form li.time fieldset ol li select', :count => 2)
+        it 'should have two selects for hour and minute' do
+          #output_buffer.should have_tag('form li.time fieldset ol li select', :count => 2)
+          output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
         end
       end
 
@@ -1976,7 +2444,6 @@ describe 'Formtastic' do
       end
     end
 
-
     describe '#inputs' do
 
       describe 'with a block' do
@@ -2130,8 +2597,8 @@ describe 'Formtastic' do
       describe 'without a block' do
 
         before do
-          Post.stub!(:reflections).and_return({:author   => mock('reflection', :macro => :belongs_to),
-                                               :comments => mock('reflection', :macro => :has_many) })
+          Post.stub!(:reflections).and_return({:author   => mock('reflection', :options => {}, :macro => :belongs_to),
+                                               :comments => mock('reflection', :options => {}, :macro => :has_many) })
           Post.stub!(:content_columns).and_return([mock('column', :name => 'title'), mock('column', :name => 'body'), mock('column', :name => 'created_at')])
           Author.stub!(:find).and_return([@fred, @bob])
 
@@ -2436,7 +2903,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
@@ -2549,7 +3050,7 @@ describe 'Formtastic' do
           end
         end
 
-        output_buffer.should eql("<form action=\"/posts\" class=\"formtastic post\" id=\"new_post\" method=\"post\"><input id=\"post_links__delete\" name=\"post[links][_delete]\" type=\"hidden\" /><a href=\"#\" onclick=\"$(this).parents('.nil_class').hide(); $(this).prev(':input').val('1');; return false;\">Remove</a></form>")
+        output_buffer.should eql("<form action=\"/posts\" class=\"formtastic post\" id=\"new_post\" method=\"post\"><input id=\"post_links__delete\" name=\"post[links][_delete]\" type=\"hidden\" /><a href=\"#\" onclick=\";$(this).parents('.nil_class').hide(); $(this).prev(':input').val('1');; return false;\">Remove</a></form>")
       end
 
       it "should have a show method" do