formtastic 2.2.1 → 2.3.0.rc

data/lib/formtastic/inputs/boolean_input.rb

@@ -50,7 +50,10 @@ module Formtastic
           label_html_options
         )
       end
-
+      
+      # TODO: why are we merging `input_html_options` and then making some of the irrelevant ones `nil`?
+      # Seems like we should be selectively including from input_html_options (a whitelist) instead of 
+      # excluding (blacklist).
       def label_html_options
         prev = super
         prev[:class] = prev[:class] - ['label']
@@ -59,6 +62,7 @@ module Formtastic
           prev.merge(
             :id   => nil,
             :name => nil,
+            :tabindex => nil,
             :for  => input_html_options[:id]
           )
         )
@@ -97,11 +101,7 @@ module Formtastic
       end
 
       def checked?
-        if defined? ActionView::Helpers::InstanceTag
-          object && ActionView::Helpers::InstanceTag.check_box_checked?(object.send(method), checked_value)
-        else
-          object && boolean_checked?(object.send(method), checked_value) 
-        end
+        object && boolean_checked?(object.send(method), checked_value) 
       end
       
       private 

data/lib/formtastic/inputs/check_boxes_input.rb

@@ -44,6 +44,7 @@ module Formtastic
     #   <%= f.input :categories, :as => :check_boxes, :collection => [["Ruby", "ruby"], ["Rails", "rails"]] %>
     #   <%= f.input :categories, :as => :check_boxes, :collection => [["Ruby", "1"], ["Rails", "2"]] %>
     #   <%= f.input :categories, :as => :check_boxes, :collection => [["Ruby", 1], ["Rails", 2]] %>
+    #   <%= f.input :categories, :as => :check_boxes, :collection => [["Ruby", 1, {'data-attr' => 'attr-value'}]] %>
     #   <%= f.input :categories, :as => :check_boxes, :collection => 1..5 %>
     #
     # @example `:hidden_fields` can be used to skip Rails' rendering of a hidden field before every checkbox
@@ -127,7 +128,7 @@ module Formtastic
         value = choice_value(choice)
         builder.check_box(
           association_primary_key || method,
-          input_html_options.merge(:id => choice_input_dom_id(choice), :name => input_name, :disabled => disabled?(value), :required => false),
+          extra_html_options(choice).merge(:id => choice_input_dom_id(choice), :name => input_name, :disabled => disabled?(value), :required => false),
           value,
           unchecked_value
         )
@@ -139,10 +140,14 @@ module Formtastic
           input_name,
           value,
           checked?(value),
-          input_html_options.merge(:id => choice_input_dom_id(choice), :disabled => disabled?(value), :required => false)
+          extra_html_options(choice).merge(:id => choice_input_dom_id(choice), :disabled => disabled?(value), :required => false)
         )
       end
 
+      def extra_html_options(choice)
+        input_html_options.merge(custom_choice_html_options(choice))
+      end
+
       def checked?(value)
         selected_values.include?(value)
       end

data/lib/formtastic/inputs/datetime_picker_input.rb

@@ -89,12 +89,12 @@ module Formtastic
       def value
         return options[:input_html][:value] if options[:input_html] && options[:input_html].key?(:value)
         val = object.send(method)
-        return val.strftime("%Y-%m-%d %H:%M") if val.is_a?(Time)
-        return "#{val.year}-#{val.month}-#{val.day} 00:00" if val.is_a?(Date)
+        return val.strftime("%Y-%m-%dT%H:%M:%S") if val.is_a?(Time)
+        return "#{val.year}-#{val.month}-#{val.day}T00:00:00" if val.is_a?(Date)
         return val if val.nil?
         val.to_s
       end
       
     end
   end
-end
+end

data/lib/formtastic/inputs/select_input.rb

@@ -198,8 +198,10 @@ module Formtastic
       def extra_input_html_options
         {
           :multiple => multiple?,
-          :name => multiple? ? input_html_options_name_multiple : input_html_options_name
+          :name => (multiple? && Rails::VERSION::MAJOR >= 3) ? input_html_options_name_multiple : input_html_options_name
         }
+        
+        
       end
       
       def input_html_options_name
@@ -232,4 +234,4 @@ module Formtastic
 
     end
   end
-end
+end

data/lib/formtastic/util.rb

@@ -20,6 +20,10 @@ module Formtastic
         text
       end
     end
+    
+    def rails3?
+      ::Rails::VERSION::MAJOR == 3
+    end
 
   end
 end

data/lib/formtastic/version.rb

@@ -1,3 +1,3 @@
 module Formtastic
-  VERSION = "2.2.1"
+  VERSION = "2.3.0.rc"
 end

data/lib/generators/templates/formtastic.rb

@@ -67,10 +67,10 @@
 # Formtastic::Helpers::FormHelper.builder = MyCustomBuilder
 
 # You can opt-in to Formtastic's use of the HTML5 `required` attribute on `<input>`, `<select>` 
-# and `<textarea>` tags by setting this to false (defaults to true).
-# Formtastic::FormBuilder.use_required_attribute = true
+# and `<textarea>` tags by setting this to true (defaults to false).
+# Formtastic::FormBuilder.use_required_attribute = false
 
 # You can opt-in to new HTML5 browser validations (for things like email and url inputs) by setting
-# this to false. Doing so will add a `novalidate` attribute to the `<form>` tag.
+# this to true. Doing so will add a `novalidate` attribute to the `<form>` tag.
 # See http://diveintohtml5.org/forms.html#validation for more info.
 # Formtastic::FormBuilder.perform_browser_validations = true

data/sample/basic_inputs.html

@@ -215,7 +215,7 @@
           <button id="gem_submit" type="reset">Reset</button>
         </li>
         <li class="action link_action">
-          <a href="#">Cancel</button>
+          <a href="#">Cancel</a>
         </li>
       </ol>
     </fieldset>

data/spec/builder/semantic_fields_for_spec.rb

@@ -122,7 +122,6 @@ describe 'Formtastic::FormBuilder#fields_for' do
       @fred.posts.size.should == 1
       @fred.posts.first.stub!(:persisted?).and_return(true)
       @fred.stub!(:posts_attributes=)
-
       concat(semantic_form_for(@fred) do |builder|
         concat(builder.semantic_fields_for(:posts) do |nested_builder|
           concat(nested_builder.input(:id, :as => :hidden))

data/spec/helpers/action_helper_spec.rb

@@ -281,7 +281,7 @@ describe 'Formtastic::FormBuilder#action' do
         end
   
         action = mock('action', :to_html => 'some HTML')
-        Formtastic::Actions::ButtonAction.should_not_receive(:new).and_return(action)
+        Formtastic::Actions::ButtonAction.should_not_receive(:new)
         ::ButtonAction.should_receive(:new).and_return(action)
   
         concat(semantic_form_for(@new_post) do |builder|

data/spec/helpers/form_helper_spec.rb

@@ -62,6 +62,13 @@ describe 'FormHelper' do
       end)
       output_buffer.should have_tag("form.xyz")
     end
+    
+    it 'omits the leading spaces from the classes in the generated form when the default class is nil' do
+      Formtastic::Helpers::FormHelper.default_form_class = nil
+      concat(semantic_form_for(::Post.new, :as => :post, :url => '/hello') do |builder|
+      end)
+      output_buffer.should have_tag("form[class='post']")
+    end
 
     it 'adds class matching the object name to the generated form when a symbol is provided' do
       concat(semantic_form_for(@new_post, :url => '/hello') do |builder|
@@ -135,6 +142,29 @@ describe 'FormHelper' do
       end
     end
 
+    describe ActionView::Base.field_error_proc do
+      it 'is set to no-op wrapper by default' do
+        semantic_form_for(@new_post, :url => '/hello') do |builder|
+          ::ActionView::Base.field_error_proc.call("html", nil).should == "html"
+        end
+      end
+
+      it 'is set to the configured custom field_error_proc' do
+        field_error_proc = mock()
+        Formtastic::Helpers::FormHelper.field_error_proc = field_error_proc
+        semantic_form_for(@new_post, :url => '/hello') do |builder|
+          ::ActionView::Base.field_error_proc.should == field_error_proc
+        end
+      end
+      
+      it 'is restored to its original value after the form is rendered' do
+        lambda do 
+          Formtastic::Helpers::FormHelper.field_error_proc = proc {""}
+          semantic_form_for(@new_post, :url => '/hello') { |builder| }
+        end.should_not change(::ActionView::Base, :field_error_proc)
+      end
+    end 
+    
     describe "with :builder option" do
       it "yields an instance of the given builder" do
         class MyAwesomeCustomBuilder < Formtastic::FormBuilder

data/spec/helpers/input_helper_spec.rb

@@ -907,7 +907,7 @@ describe 'Formtastic::FormBuilder#input' do
         end
 
         input = mock('input', :to_html => 'some HTML')
-        Formtastic::Inputs::StringInput.should_not_receive(:new).and_return(input)
+        Formtastic::Inputs::StringInput.should_not_receive(:new)
         ::StringInput.should_receive(:new).and_return(input)
 
         concat(semantic_form_for(@new_post) do |builder|

data/spec/helpers/inputs_helper_spec.rb

@@ -57,6 +57,7 @@ describe 'Formtastic::FormBuilder#inputs' do
   
       before do
         @new_post.stub!(:respond_to?).and_return(true, true)
+        @new_post.stub!(:respond_to?).with(:empty?).and_return(false)
         @new_post.stub!(:author).and_return(@bob)
       end
   
@@ -270,7 +271,8 @@ describe 'Formtastic::FormBuilder#inputs' do
             concat(inputs)
           end)
         end
-  
+        
+        # TODO: looks like the block isn't being called for the last assertion here
         it 'should render a fieldset with a legend inside the form' do
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text_using_name}$/)
@@ -296,21 +298,18 @@ describe 'Formtastic::FormBuilder#inputs' do
                 }
             }
           concat(semantic_form_for(@new_post) do |builder|
-            inputs = builder.inputs :advanced_options do
-            end
-            concat(inputs)
-            inputs =builder.inputs :name => :advanced_options_using_name do
-            end
-            concat(inputs)
-            inputs = builder.inputs :title => :advanced_options_using_title do
-            end
-            concat(inputs)
-            inputs = builder.inputs :nested_forms_title, :for => :authors do |nf|
-            end
-            concat(inputs)
+            concat(builder.inputs(:advanced_options) do
+            end)
+            concat(builder.inputs(:name => :advanced_options_using_name) do
+            end)
+            concat(builder.inputs(:title => :advanced_options_using_title) do
+            end)
+            concat(builder.inputs(:nested_forms_title, :for => :authors) do |nf|
+            end)
           end)
         end
-  
+        
+        # TODO: looks like the block isn't being called for the last assertion here
         it 'should render a fieldset with a localized legend inside the form' do
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text_using_name}$/)
@@ -344,7 +343,6 @@ describe 'Formtastic::FormBuilder#inputs' do
     before do
       ::Post.stub!(:reflections).and_return({:author => mock('reflection', :options => {}, :macro => :belongs_to),
                                            :comments => mock('reflection', :options => {}, :macro => :has_many) })
-      ::Author.stub!(:find).and_return([@fred, @bob])
   
       @new_post.stub!(:title)
       @new_post.stub!(:body)

data/spec/inputs/boolean_input_spec.rb

@@ -150,6 +150,13 @@ describe 'boolean input' do
     output_buffer.should have_tag('form li label input[@type="checkbox"]')
     output_buffer.should have_tag('form li label input[@name="project[allow_comments]"]')
   end
+  
+  it 'should not pass input_html options down to the label html' do
+    concat(semantic_form_for(@new_post) do |builder|
+      builder.input(:title, :as => :boolean, :input_html => { :tabindex => 2 })
+    end)
+    output_buffer.should_not have_tag('label[tabindex]')
+  end
 
   context "when required" do
     

data/spec/inputs/check_boxes_input_spec.rb

@@ -441,7 +441,37 @@ describe 'check_boxes input' do
 
     it "should not check any items" do
       output_buffer.should have_tag('form li input[@checked]', :count => 0)
-    end    
+    end
+
+    describe "and the attribute has values" do
+      before do
+        @fred.stub(:posts) { [1] }
+
+        concat(semantic_form_for(@fred) do |builder|
+          concat(builder.input(:posts, :as => :check_boxes, :collection => @_collection))
+        end)
+      end
+
+      it "should check the appropriate items" do
+        output_buffer.should have_tag("form li input[@value='1'][@checked]")
+      end
+    end
+
+    describe "and the collection includes html options" do
+      before do
+        @_collection = [["First", 1, {'data-test' => 'test-data'}], ["Second", 2, {'data-test2' => 'test-data2'}]]
+
+        concat(semantic_form_for(@fred) do |builder|
+          concat(builder.input(:posts, :as => :check_boxes, :collection => @_collection))
+        end)
+      end
+
+      it "should have injected the html attributes" do
+        @_collection.each do |v|
+          output_buffer.should have_tag("form li input[@value='#{v[1]}'][@#{v[2].keys[0]}='#{v[2].values[0]}']")
+        end
+      end
+    end
   end
   
 end

data/spec/inputs/date_select_input_spec.rb

@@ -147,6 +147,14 @@ describe 'date select input' do
       end
       
     end
+
+    it "should not display labels for any fields when :labels is falsy" do
+      output_buffer.replace ''
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:created_at, :as => :date_select, :labels => false))
+      end)
+      output_buffer.should have_tag('form li.date_select fieldset ol li label', :count => 0)
+    end
   end
   
   describe "when required" do

data/spec/inputs/datetime_picker_input_spec.rb

@@ -145,10 +145,10 @@ describe 'datetime_picker input' do
       it "can be set from :input_html options" do
         concat(
           semantic_form_for(@new_post) do |f|
-            concat(f.input(:publish_at, :as => :datetime_picker, :input_html => { :value => "1111-11-11 23:00" }))
+            concat(f.input(:publish_at, :as => :datetime_picker, :input_html => { :value => "1111-11-11T23:00:00" }))
           end
         )
-        output_buffer.should have_tag "input[value='1111-11-11 23:00']"
+        output_buffer.should have_tag "input[value='1111-11-11T23:00:00']"
       end
       
     end
@@ -160,22 +160,22 @@ describe 'datetime_picker input' do
         @new_post.stub!(:publish_at).and_return(@date)
       end
       
-      it "renders the date as YYYY-MM-DD 00:00" do
+      it "renders the date as YYYY-MM-DDT00:00:00" do
         concat(
           semantic_form_for(@new_post) do |f|
             concat(f.input(:publish_at, :as => :datetime_picker ))
           end
         )
-        output_buffer.should have_tag "input[value='#{@date.to_s} 00:00']"
+        output_buffer.should have_tag "input[value='2000-11-11T00:00:00']"
       end
 
       it "can be set from :input_html options" do
         concat(
           semantic_form_for(@new_post) do |f|
-            concat(f.input(:publish_at, :as => :datetime_picker, :input_html => { :value => "1111-11-11 00:00" }))
+            concat(f.input(:publish_at, :as => :datetime_picker, :input_html => { :value => "1111-11-11T00:00:00" }))
           end
         )
-        output_buffer.should have_tag "input[value='1111-11-11 00:00']"
+        output_buffer.should have_tag "input[value='1111-11-11T00:00:00']"
       end
       
     end
@@ -193,16 +193,16 @@ describe 'datetime_picker input' do
             concat(f.input(:publish_at, :as => :datetime_picker ))
           end
         )
-        output_buffer.should have_tag "input[value='2000-11-11 11:11']"
+        output_buffer.should have_tag "input[value='2000-11-11T11:11:11']"
       end
     
       it "can be set from :input_html options" do
         concat(
           semantic_form_for(@new_post) do |f|
-            concat(f.input(:publish_at, :as => :datetime_picker, :input_html => { :value => "1111-11-11 11:11" }))
+            concat(f.input(:publish_at, :as => :datetime_picker, :input_html => { :value => "1111-11-11T11:11:11" }))
           end
         )
-        output_buffer.should have_tag "input[value='1111-11-11 11:11']"
+        output_buffer.should have_tag "input[value='1111-11-11T11:11:11']"
       end
       
     end
@@ -225,10 +225,10 @@ describe 'datetime_picker input' do
       it "can be set from :input_html options" do
         concat(
           semantic_form_for(@new_post) do |f|
-            concat(f.input(:publish_at, :as => :datetime_picker, :input_html => { :value => "1111-11-11 11:11" }))
+            concat(f.input(:publish_at, :as => :datetime_picker, :input_html => { :value => "1111-11-11T11:11:11" }))
           end
         )
-        output_buffer.should have_tag "input[value='1111-11-11 11:11']"
+        output_buffer.should have_tag "input[value='1111-11-11T11:11:11']"
       end
       
     end
@@ -251,10 +251,10 @@ describe 'datetime_picker input' do
       it "can be set from :input_html options" do
         concat(
           semantic_form_for(@new_post) do |f|
-            concat(f.input(:publish_at, :as => :datetime_picker, :input_html => { :value => "1111-11-11 11:11" }))
+            concat(f.input(:publish_at, :as => :datetime_picker, :input_html => { :value => "1111-11-11T11:11:11" }))
           end
         )
-        output_buffer.should have_tag "input[value='1111-11-11 11:11']"
+        output_buffer.should have_tag "input[value='1111-11-11T11:11:11']"
       end
       
     end
@@ -487,4 +487,4 @@ describe 'datetime_picker input' do
     end
   end
   
-end
+end

data/spec/inputs/datetime_select_input_spec.rb

@@ -156,6 +156,14 @@ describe 'datetime select input' do
         output_buffer.should_not include(">")
       end
     end
+
+    it "should not display labels for any fields when :labels is falsy" do
+      output_buffer.replace ''
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:created_at, :as => :datetime_select, :labels => false))
+      end)
+      output_buffer.should have_tag('form li.datetime_select fieldset ol li label', :count => 0)
+    end
   end
   
   describe "when required" do