formtastic 0.9.10 → 1.0.0.beta

data/lib/formtastic.rb

@@ -536,7 +536,7 @@ module Formtastic #:nodoc:
       #
       def strip_formtastic_options(options) #:nodoc:
         options.except(:value_method, :label_method, :collection, :required, :label,
-                       :as, :hint, :input_html, :label_html, :value_as_class)
+                       :as, :hint, :input_html, :label_html, :value_as_class, :find_options)
       end
 
       # Determins if the attribute (eg :title) should be considered required or not.
@@ -885,8 +885,13 @@ module Formtastic #:nodoc:
           li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
           template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
-
-        field_set_and_list_wrapping_for_method(method, options, list_item_content)
+        
+        template.content_tag(:fieldset,
+          template.content_tag(:legend, 
+            template.label_tag(nil, localized_string(method, method, :label) || humanized_attribute_name(method), :for => nil), :class => :label
+          ) << 
+          template.content_tag(:ol, list_item_content)
+        )
       end
       alias :boolean_radio_input :radio_input
 
@@ -1152,7 +1157,12 @@ module Formtastic #:nodoc:
           template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
 
-        field_set_and_list_wrapping_for_method(method, options, list_item_content)
+        template.content_tag(:fieldset,
+          template.content_tag(:legend, 
+            template.label_tag(nil, localized_string(method, method, :label) || humanized_attribute_name(method), :for => nil), :class => :label
+          ) << 
+          template.content_tag(:ol, list_item_content)
+        )
       end
 
       # Outputs a country select input, wrapping around a regular country_select helper. 
@@ -1531,7 +1541,8 @@ module Formtastic #:nodoc:
         elsif type == :numeric || column.nil? || column.limit.nil?
           { :size => @@default_text_field_size }
         else
-          { :maxlength => column.limit, :size => [column.limit, @@default_text_field_size].min }
+          { :maxlength => column.limit, 
+            :size => @@default_text_field_size && [column.limit, @@default_text_field_size].min }
         end
       end
 

data/lib/formtastic/util.rb

@@ -13,7 +13,8 @@ module Formtastic
     def html_safe(text)
       return text if text.nil?
       return text.html_safe if defined?(ActiveSupport::SafeBuffer)
-      return text.html_safe!
+      return text.html_safe! if text.respond_to?(:html_safe!)
+      text
     end
 
     def rails_safe_buffer_class

data/spec/inputs/check_boxes_input_spec.rb

@@ -231,10 +231,29 @@ describe 'check_boxes input' do
       end
 
     end
+    
+    describe "with i18n of the legend label" do
+
+      before do
+        ::I18n.backend.store_translations :en, :formtastic => { :labels => { :post => { :authors => "Translated!" }}}
+
+        @new_post.stub!(:author_ids).and_return(nil)
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:authors, :as => :check_boxes))
+        end
+      end
 
+      after do
+        ::I18n.backend.reload!
+      end
+
+      it "should do foo" do
+        output_buffer.should have_tag("legend.label label", /Translated/)
+      end
+
+    end
+    
   end
-  
-  
 
 end
 

data/spec/inputs/radio_input_spec.rb

@@ -29,7 +29,7 @@ describe 'radio input' do
     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^="post_author_id_"]')
+      output_buffer.should_not have_tag('form li fieldset legend label[@for]')
     end
 
     it 'should generate an ordered list with a list item for each choice' do
@@ -76,6 +76,16 @@ describe 'radio input' do
 
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
+      
+      it "should not contain invalid HTML attributes" do
+        
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:author, :as => :radio))
+        end
+        
+        output_buffer.should_not have_tag("form li fieldset ol li input[@find_options]")
+      end
+      
     end
 
     describe 'and no object is given' do
@@ -151,5 +161,26 @@ describe 'radio input' do
     end
 
   end
+  
+  describe "with i18n of the legend label" do
+    
+    before do
+      ::I18n.backend.store_translations :en, :formtastic => { :labels => { :post => { :authors => "Translated!" }}}
+
+      @new_post.stub!(:author_ids).and_return(nil)
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:authors, :as => :radio))
+      end
+    end
+    
+    after do
+      ::I18n.backend.reload!
+    end
+    
+    it "should do foo" do
+      output_buffer.should have_tag("legend.label label", /Translated/)
+    end
+    
+  end
 
 end

data/spec/inputs/string_input_spec.rb

@@ -8,26 +8,30 @@ describe 'string input' do
   before do
     @output_buffer = ''
     mock_everything
-    
-    semantic_form_for(@new_post) do |builder|
-      concat(builder.input(:title, :as => :string))
+  end
+  
+  describe "when object is provided" do
+    before do
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :string))
+      end
     end
+    
+    it_should_have_input_wrapper_with_class(:string)
+    it_should_have_input_wrapper_with_id("post_title_input")
+    it_should_have_label_with_text(/Title/)
+    it_should_have_label_for("post_title")
+    it_should_have_input_with_id("post_title")
+    it_should_have_input_with_type(:text)
+    it_should_have_input_with_name("post[title]")
+    it_should_have_maxlength_matching_column_limit
+    it_should_use_default_text_field_size_for_columns_longer_than_default_text_field_size(:string)
+    it_should_use_column_size_for_columns_shorter_than_default_text_field_size(:string)
+    it_should_use_default_text_field_size_when_method_has_no_database_column(:string)
+    it_should_apply_custom_input_attributes_when_input_html_provided(:string)
+    it_should_apply_custom_for_to_label_when_input_html_id_provided(:string)
+    it_should_apply_error_logic_for_input_type(:string)
   end
-
-  it_should_have_input_wrapper_with_class(:string)
-  it_should_have_input_wrapper_with_id("post_title_input")
-  it_should_have_label_with_text(/Title/)
-  it_should_have_label_for("post_title")
-  it_should_have_input_with_id("post_title")
-  it_should_have_input_with_type(:text)
-  it_should_have_input_with_name("post[title]")
-  it_should_have_maxlength_matching_column_limit
-  it_should_use_default_text_field_size_for_columns_longer_than_default_text_field_size(:string)
-  it_should_use_column_size_for_columns_shorter_than_default_text_field_size(:string)
-  it_should_use_default_text_field_size_when_method_has_no_database_column(:string)
-  it_should_apply_custom_input_attributes_when_input_html_provided(:string)
-  it_should_apply_custom_for_to_label_when_input_html_id_provided(:string)
-  it_should_apply_error_logic_for_input_type(:string)
   
   describe "when no object is provided" do
     before do
@@ -43,5 +47,17 @@ describe 'string input' do
     it_should_have_input_with_name("project[title]")
   end
   
+  describe "when size is nil" do
+    before do
+      semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+        concat(builder.input(:title, :as => :string, :input_html => {:size => nil}))
+      end
+    end
+  
+    it "should have no size attribute" do
+      output_buffer.should_not have_tag("input[@size]")
+    end
+  end
+  
 end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: formtastic
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
+  - 1
+  - 0
   - 0
-  - 9
-  - 10
-  version: 0.9.10
+  - beta
+  version: 1.0.0.beta
 platform: ruby
 authors: 
 - Justin French
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 +10:00
+date: 2010-06-07 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,11 +152,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: