formtastic 0.9.7 → 0.9.8

data/lib/formtastic/layout_helper.rb

@@ -0,0 +1,10 @@
+module Formtastic
+  module LayoutHelper
+    
+    def formtastic_stylesheet_link_tag
+      stylesheet_link_tag("formtastic") + 
+      stylesheet_link_tag("formtastic_changes")
+    end
+  
+  end
+end

data/rails/init.rb

@@ -1,3 +1,5 @@
 # coding: utf-8
 require File.join(File.dirname(__FILE__), *%w[.. lib formtastic])
+require File.join(File.dirname(__FILE__), *%w[.. lib formtastic layout_helper])
 ActionView::Base.send :include, Formtastic::SemanticFormHelper
+ActionView::Base.send :include, Formtastic::LayoutHelper

data/spec/commit_button_spec.rb

@@ -121,9 +121,6 @@ describe 'SemanticFormBuilder#commit_button' do
   end
 
   describe 'label' do
-    before do
-      ::Post.stub!(:human_name).and_return('Post')
-    end
 
     # No object
     describe 'when used without object' do
@@ -240,6 +237,10 @@ describe 'SemanticFormBuilder#commit_button' do
                 }
             ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
           end
+          
+          after do
+            ::I18n.backend.store_translations :en, :formtastic => nil
+          end
 
           it 'should render an input with localized label (I18n)' do
             semantic_form_for(@new_post) do |builder|
@@ -261,6 +262,8 @@ describe 'SemanticFormBuilder#commit_button' do
               concat(builder.commit_button)
             end
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create"][@class~="create"]})
+            ::I18n.backend.store_translations :en, :formtastic => nil
+            
           end
 
         end
@@ -334,11 +337,30 @@ describe 'SemanticFormBuilder#commit_button' do
               concat(builder.commit_button)
             end
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save"][@class~="update"]})
+            ::I18n.backend.store_translations :en, :formtastic => {}
           end
 
         end
       end
     end
   end
-
+  
+  describe 'when the model is two words' do
+    before do
+      output_buffer = ''
+      class ::UserPost; def id; end; def self.human_name; "Userpost"; end; end # Rails does crappy human_name
+      @new_user_post = ::UserPost.new
+      
+      @new_user_post.stub!(:new_record?).and_return(true)
+      semantic_form_for(@new_user_post, :url => '') do |builder|
+        concat(builder.commit_button())
+      end
+    end
+    
+    it "should render the string as the value of the button" do
+      output_buffer.should have_tag('li input[@value="Create User post"]')
+    end
+    
+  end
+    
 end

data/spec/custom_macros.rb

@@ -224,107 +224,6 @@ module CustomMacros
       end
     end
 
-    def it_should_select_existing_datetime_else_current(*datetime_parts)
-      describe "default value" do
-        before do
-          @new_post.should_receive(:publish_at=).any_number_of_times
-        end
-
-        describe "when attribute value is present" do
-          before do
-            @output_buffer = ''
-            publish_at_value = 1.year.ago + 2.month + 3.day + 4.hours + 5.minutes # No comment =)
-            @new_post.stub!(:publish_at).and_return(publish_at_value)
-
-            semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:publish_at, :as => :datetime))
-            end
-          end
-
-          it "should select the present value by default" do
-            # puts output_buffer
-            output_buffer.should have_tag("form li select#post_publish_at_1i option[@selected='selected'][@value='#{@new_post.publish_at.year}']") if datetime_parts.include?(:year)
-            output_buffer.should have_tag("form li select#post_publish_at_2i option[@selected='selected'][@value='#{@new_post.publish_at.month}']") if datetime_parts.include?(:month)
-            output_buffer.should have_tag("form li select#post_publish_at_3i option[@selected='selected'][@value='#{@new_post.publish_at.day}']") if datetime_parts.include?(:day)
-            output_buffer.should have_tag("form li select#post_publish_at_4i option[@selected='selected'][@value='#{@new_post.publish_at.strftime("%H")}']") if datetime_parts.include?(:hour)
-            output_buffer.should have_tag("form li select#post_publish_at_5i option[@selected='selected'][@value='#{@new_post.publish_at.strftime("%M")}']") if datetime_parts.include?(:minute)
-            #output_buffer.should have_tag("form li select#post_publish_at_6i option[@selected='selected'][@value='#{@new_post.publish_at.sec}']") if datetime_parts.include?(:second)
-          end
-        end
-
-        describe "when no attribute value is present" do
-          before do
-            @output_buffer = ''
-            @new_post.stub!(:publish_at).and_return(nil)
-            @current_time = ::Time.now
-
-            semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:publish_at, :as => :datetime))
-            end
-          end
-
-          it "should select the current day/time by default" do
-            # puts output_buffer
-            output_buffer.should have_tag("form li select#post_publish_at_1i option[@selected='selected'][@value='#{@current_time.year}']") if datetime_parts.include?(:year)
-            output_buffer.should have_tag("form li select#post_publish_at_2i option[@selected='selected'][@value='#{@current_time.month}']") if datetime_parts.include?(:month)
-            output_buffer.should have_tag("form li select#post_publish_at_3i option[@selected='selected'][@value='#{@current_time.day}']") if datetime_parts.include?(:day)
-            output_buffer.should have_tag("form li select#post_publish_at_4i option[@selected='selected'][@value='#{@current_time.strftime("%H")}']") if datetime_parts.include?(:hour)
-            output_buffer.should have_tag("form li select#post_publish_at_5i option[@selected='selected'][@value='#{@current_time.strftime("%M")}']") if datetime_parts.include?(:minute)
-            #output_buffer.should have_tag("form li select#post_publish_at_6i option[@selected='selected'][@value='#{@custom_default_time.sec}']") if datetime_parts.include?(:second)
-          end
-
-          # TODO: Scenario when current time is not a possible choice (because of specified date/time ranges)?
-        end
-      end
-    end
-
-    def it_should_select_explicit_default_value_if_set(*datetime_parts)
-      describe 'when :selected is set' do
-        before do
-          @output_buffer = ''
-        end
-
-        # Note: Not possible to override default selected value for time_zone input
-        # without overriding Rails core helper. This Rails helper works "a bit different". =/
-        #
-        describe "no selected items" do
-          before do
-            @default_time = 2.days.ago
-            @new_post.stub!(:publish_at).and_return(@default_time)
-
-            semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:publish_at, :as => :time_zone, :selected => nil))
-            end
-          end
-
-          it 'should not have any selected item(s)' do
-            output_buffer.should_not have_tag("form li select#post_publish_at_1i option[@selected='selected']")
-          end
-        end
-
-        describe "single selected item" do
-          before do
-            @custom_default_time = 5.days.ago
-            @new_post.stub!(:publish_at).and_return(2.days.ago)
-
-            semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:publish_at, :as => :datetime, :selected => @custom_default_time))
-            end
-          end
-
-          it "should select the specified value" do
-            output_buffer.should have_tag("form li select#post_publish_at_1i option[@selected='selected'][@value='#{@custom_default_time.year}']") if datetime_parts.include?(:year)
-            output_buffer.should have_tag("form li select#post_publish_at_2i option[@selected='selected'][@value='#{@custom_default_time.month}']") if datetime_parts.include?(:month)
-            output_buffer.should have_tag("form li select#post_publish_at_3i option[@selected='selected'][@value='#{@custom_default_time.day}']") if datetime_parts.include?(:day)
-            output_buffer.should have_tag("form li select#post_publish_at_4i option[@selected='selected'][@value='#{@custom_default_time.strftime("%H")}']") if datetime_parts.include?(:hour)
-            output_buffer.should have_tag("form li select#post_publish_at_5i option[@selected='selected'][@value='#{@custom_default_time.strftime("%M")}']") if datetime_parts.include?(:minute)
-            #output_buffer.should have_tag("form li select#post_publish_at_6i option[@selected='selected'][@value='#{@custom_default_time.sec}']") if datetime_parts.include?(:second)
-          end
-        end
-
-      end
-    end
-
     def it_should_use_the_collection_when_provided(as, countable)
       describe 'when the :collection option is provided' do
 

data/spec/form_helper_spec.rb

@@ -40,6 +40,12 @@ describe 'SemanticFormHelper' do
       output_buffer.should have_tag("form.post")
     end
 
+    it 'adds a namespaced class to the generated form' do
+      semantic_form_for(::Namespaced::Post.new, :url => '/hello') do |builder|
+      end
+      output_buffer.should have_tag("form.namespaced_post")
+    end
+
     describe 'allows :html options' do
       before(:each) do
         semantic_form_for(:post, ::Post.new, :url => '/hello', :html => { :id => "something-special", :class => "something-extra", :multipart => true }) do |builder|

data/spec/input_spec.rb

@@ -399,6 +399,26 @@ describe 'SemanticFormBuilder#input' do
       end
 
       describe 'when not provided' do
+        describe 'when localized label is provided' do 
+          describe 'and object is given' do 
+            describe 'and label_str_method not default' do
+              it 'should render a label with localized label (I18n)' do
+                with_config :label_str_method, :capitalize do
+                  @localized_label_text = 'Localized title'
+                  @new_post.stub!(:meta_description)
+                  @new_post.class.should_receive(:human_attribute_name).with('meta_description').and_return(@localized_label_text)
+                
+                  semantic_form_for(@new_post) do |builder|
+                    concat(builder.input(:meta_description))
+                  end
+                
+                  output_buffer.should have_tag('form li label', @localized_label_text)
+                end
+              end
+            end
+          end
+        end
+        
         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
@@ -424,6 +444,20 @@ describe 'SemanticFormBuilder#input' do
               output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
             end
           end
+          
+          describe 'and object is given with label_str_method set to :capitalize' do
+            it 'should capitalize method name, passing it down to the label tag' do
+              with_config :label_str_method, :capitalize do
+                @new_post.stub!(:meta_description)
+            
+                semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:meta_description))
+                end
+            
+                output_buffer.should have_tag("form li label", /#{'meta_description'.capitalize}/)
+              end
+            end
+          end
         end
         
         describe 'when localized label is provided' do

data/spec/inputs/boolean_input_spec.rb

@@ -65,8 +65,10 @@ describe 'boolean input' do
       before do
         @new_post.stub!(:allow_comments).and_return(true)
 
-        semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:allow_comments, :as => :boolean, :selected => false))
+        with_deprecation_silenced do
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:allow_comments, :as => :boolean, :selected => false))
+          end
         end
       end
 
@@ -78,9 +80,11 @@ describe 'boolean input' do
     describe "selected" do
       before do
         @new_post.stub!(:allow_comments).and_return(false)
-
-        semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:allow_comments, :as => :boolean, :selected => true))
+        
+        with_deprecation_silenced do
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:allow_comments, :as => :boolean, :selected => true))
+          end
         end
       end
 

data/spec/inputs/check_boxes_input_spec.rb

@@ -22,10 +22,15 @@ describe 'check_boxes input' do
     it_should_call_find_on_association_class_when_no_collection_is_provided(:check_boxes)
     it_should_use_the_collection_when_provided(:check_boxes, 'input[@type="checkbox"]')
     
-    it 'should generate a legend - classified as a label - containing label text for the input' do
-      output_buffer.should have_tag('form li fieldset legend.label')
-      output_buffer.should have_tag('form li fieldset legend.label', /Posts/)
+    it 'should generate a legend containing a label with text for the input' do
+      output_buffer.should have_tag('form li fieldset legend.label label')
+      output_buffer.should have_tag('form li fieldset legend.label label', /Posts/)
     end
+    
+    it 'should not link the label within the legend to any input' do
+      output_buffer.should_not have_tag('form li fieldset legend label[@for^="author_post_ids_"]')
+    end
+    
 
     it 'should generate an ordered list with a list item for each choice' do
       output_buffer.should have_tag('form li fieldset ol')
@@ -110,8 +115,10 @@ describe 'check_boxes input' do
         before do
           @new_post.stub!(:author_ids).and_return(nil)
 
-          semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:authors, :as => :check_boxes, :selected => nil))
+          with_deprecation_silenced do
+            semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:authors, :as => :check_boxes, :selected => nil))
+            end
           end
         end
 
@@ -124,8 +131,10 @@ describe 'check_boxes input' do
         before do
           @new_post.stub!(:author_ids).and_return(nil)
 
-          semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:authors, :as => :check_boxes, :selected => @fred.id))
+          with_deprecation_silenced do
+            semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:authors, :as => :check_boxes, :selected => @fred.id))
+            end
           end
         end
 
@@ -139,9 +148,11 @@ describe 'check_boxes input' do
       describe "multiple selected items" do
         before do
           @new_post.stub!(:author_ids).and_return(nil)
-
-          semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:authors, :as => :check_boxes, :selected => [@bob.id, @fred.id]))
+          
+          with_deprecation_silenced do
+            semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:authors, :as => :check_boxes, :selected => [@bob.id, @fred.id]))
+            end
           end
         end
 
@@ -155,8 +166,20 @@ describe 'check_boxes input' do
       end
 
     end
+    
+    it 'should warn about :selected deprecation' do
+      with_deprecation_silenced do
+        ::ActiveSupport::Deprecation.should_receive(:warn).any_number_of_times
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:authors, :as => :check_boxes, :selected => @bob.id))
+        end
+      end
+    end
+    
 
   end
+  
+  
 
 end
 

data/spec/inputs/date_input_spec.rb

@@ -8,38 +8,150 @@ describe 'date input' do
   before do
     @output_buffer = ''
     mock_everything
+  end
+  
+  describe "general" do
     
-    semantic_form_for(@new_post) do |builder|
-      concat(builder.input(:publish_at, :as => :date))
+    before do
+      output_buffer.replace ''
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:publish_at, :as => :date))
+      end
     end
-  end
 
-  it_should_have_input_wrapper_with_class("date")
-  it_should_have_input_wrapper_with_id("post_publish_at_input")
-  it_should_have_a_nested_fieldset
-  it_should_apply_error_logic_for_input_type(:date)
-  
-  it 'should have a legend - classified as a label - containing the label text inside the fieldset' do
-    output_buffer.should have_tag('form li.date fieldset legend.label', /Publish at/)
+    it_should_have_input_wrapper_with_class("date")
+    it_should_have_input_wrapper_with_id("post_publish_at_input")
+    it_should_have_a_nested_fieldset
+    it_should_apply_error_logic_for_input_type(:date)
+    
+    it 'should have a legend and label with the label text inside the fieldset' do
+      output_buffer.should have_tag('form li.date fieldset legend.label label', /Publish at/)
+    end
+    
+    it 'should associate the legend label with the first select' do
+      output_buffer.should have_tag('form li.date fieldset legend.label')
+      output_buffer.should have_tag('form li.date fieldset legend.label label')
+      output_buffer.should have_tag('form li.date fieldset legend.label label[@for]')
+      output_buffer.should have_tag('form li.date fieldset legend.label label[@for="post_publish_at_1i"]')
+    end
+    
+    it 'should have an ordered list of three items inside the fieldset' do
+      output_buffer.should have_tag('form li.date fieldset ol')
+      output_buffer.should have_tag('form li.date fieldset ol li', :count => 3)
+    end
+    
+    it 'should have three labels for year, month and day' do
+      output_buffer.should have_tag('form li.date fieldset ol li label', :count => 3)
+      output_buffer.should have_tag('form li.date fieldset ol li label', /year/i)
+      output_buffer.should have_tag('form li.date fieldset ol li label', /month/i)
+      output_buffer.should have_tag('form li.date fieldset ol li label', /day/i)
+    end
+    
+    it 'should have three selects for year, month and day' do
+      output_buffer.should have_tag('form li.date fieldset ol li select', :count => 3)
+    end
   end
-
-  it 'should have an ordered list of three items inside the fieldset' do
-    output_buffer.should have_tag('form li.date fieldset ol')
-    output_buffer.should have_tag('form li.date fieldset ol li', :count => 3)
+    
+  describe ':selected option' do
+    
+    describe "when the object has a value" do
+      it "should select the object value (ignoring :selected)" do
+        output_buffer.replace ''
+        @new_post.stub!(:created_at => Time.mktime(2012))
+        with_deprecation_silenced do
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:created_at, :as => :date, :selected => Time.mktime(1999)))
+          end
+        end
+        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
+        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='2012'][@selected]", :count => 1)
+      end
+    end
+    
+    describe 'when the object has no value' do
+      it "should select the :selected if provided as a Date" do
+        output_buffer.replace ''
+        @new_post.stub!(:created_at => nil)
+        with_deprecation_silenced do
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:created_at, :as => :date, :selected => Date.new(1999)))
+          end
+        end
+        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
+        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
+      end
+      
+      it "should select the :selected if provided as a Time" do
+        output_buffer.replace ''
+        @new_post.stub!(:created_at => nil)
+        with_deprecation_silenced do
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:created_at, :as => :date, :selected => Time.mktime(1999)))
+          end
+        end
+        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
+        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
+      end
+      
+      it "should not select an option if the :selected is provided as nil" do
+        output_buffer.replace ''
+        @new_post.stub!(:created_at => nil)
+        with_deprecation_silenced do
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:created_at, :as => :date, :selected => nil))
+          end
+        end
+        output_buffer.should_not have_tag("form li ol li select#post_created_at_1i option[@selected]")
+      end
+      
+      it "should select Time.now if a :selected is not provided" do
+        output_buffer.replace ''
+        @new_post.stub!(:created_at => nil)
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:created_at, :as => :date))
+        end
+        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
+        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='#{Time.now.year}'][@selected]", :count => 1)
+        
+      end
+    end
+    
   end
 
-  it 'should have three labels for year, month and day' do
-    output_buffer.should have_tag('form li.date fieldset ol li label', :count => 3)
-    output_buffer.should have_tag('form li.date fieldset ol li label', /year/i)
-    output_buffer.should have_tag('form li.date fieldset ol li label', /month/i)
-    output_buffer.should have_tag('form li.date fieldset ol li label', /day/i)
-  end
+  describe ':labels option' do
+    fields = [:year, :month, :day]
+    fields.each do |field|
+      it "should replace the #{field} label with the specified text if :labels[:#{field}] is set" do
+        output_buffer.replace ''
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:created_at, :as => :date, :labels => { field => "another #{field} label" }))
+        end
+        output_buffer.should have_tag('form li.date fieldset ol li label', :count => fields.length)
+        fields.each do |f|
+          output_buffer.should have_tag('form li.date fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
+        end
+      end
 
-  it 'should have three selects for year, month and day' do
-    output_buffer.should have_tag('form li.date fieldset ol li select', :count => 3)
+      it "should not display the label for the #{field} field when :labels[:#{field}] is blank" do
+        output_buffer.replace ''
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:created_at, :as => :date, :labels => { field => "" }))
+        end
+        output_buffer.should have_tag('form li.date fieldset ol li label', :count => fields.length-1)
+        fields.each do |f|
+          output_buffer.should have_tag('form li.date fieldset ol li label', /#{f}/i) unless field == f
+        end
+      end
+    end
   end
 
-  it_should_select_existing_datetime_else_current(:year, :month, :day)
-  it_should_select_explicit_default_value_if_set(:year, :month, :day)
-
+  it 'should warn about :selected deprecation' do
+    with_deprecation_silenced do
+      ::ActiveSupport::Deprecation.should_receive(:warn).any_number_of_times
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:created_at, :as => :date, :selected => Date.new(1999)))
+      end
+    end
+  end
+  
 end