formtastic 2.1.0 → 2.1.1

data/CHANGELOG

@@ -1,3 +1,13 @@
+2.1.1
+
+* Documentation improvements and updates
+* Fixed that the required string was appended to the label over and over due to localizer caching
+* Fixed that the checkbox's `name` attribute was included in the attributes of the matching label element on boolean fields
+
+2.1.0
+
+* no changes
+
 2.1.0.rc
 
 * documentation improvements

data/README.textile

@@ -317,14 +317,14 @@ Customize the default class used for hints on each attribute or globally in the
 Many inputs provide a collection of options to choose from (like @:select@, @:radio@, @:check_boxes@, @:boolean@). In many cases, Formtastic can find choices through the model associations, but if you want to use your own set of choices, the @:collection@ option is what you want.  You can pass in an Array of objects, an array of Strings, a Hash... Throw almost anything at it! Examples:
 
 <pre>
-  f.input :authors, :as => :check_boxes, :collection => User.find(:all, :order => "last_name ASC")
+  f.input :authors, :as => :check_boxes, :collection => User.order("last_name ASC").all
   f.input :authors, :as => :check_boxes, :collection => current_user.company.users.active
   f.input :authors, :as => :check_boxes, :collection => [@justin, @kate]
   f.input :authors, :as => :check_boxes, :collection => ["Justin", "Kate", "Amelia", "Gus", "Meg"]
-  f.input :author,  :as => :select,      :collection => Author.find(:all)
+  f.input :author,  :as => :select,      :collection => Author.all
   f.input :author,  :as => :select,      :collection => { @justin.name => @justin.id, @kate.name => @kate.id }
   f.input :author,  :as => :select,      :collection => ["Justin", "Kate", "Amelia", "Gus", "Meg"]
-  f.input :author,  :as => :radio,       :collection => User.find(:all)
+  f.input :author,  :as => :radio,       :collection => User.all
   f.input :author,  :as => :radio,       :collection => [@justin, @kate]
   f.input :author,  :as => :radio,       :collection => { @justin.name => @justin.id, @kate.name => @kate.id }
   f.input :author,  :as => :radio,       :collection => ["Justin", "Kate", "Amelia", "Gus", "Meg"]

data/lib/formtastic/inputs/base/labelling.rb

@@ -20,7 +20,7 @@ module Formtastic
         end
         
         def label_text
-          ((localized_label || humanized_method_name) << requirement_text).html_safe
+          ((localized_label || humanized_method_name) + requirement_text).html_safe
         end
         
         # TODO: why does this need to be memoized in order to make the inputs_spec tests pass? 

data/lib/formtastic/inputs/boolean_input.rb

@@ -57,8 +57,9 @@ module Formtastic
         
         input_html_options.merge(
           prev.merge(
-            :id => nil,
-            :for => input_html_options[:id]
+            :id   => nil,
+            :name => nil,
+            :for  => input_html_options[:id]
           )
         )
       end
@@ -101,4 +102,4 @@ module Formtastic
 
     end
   end
-end
+end

data/lib/formtastic/version.rb

@@ -1,3 +1,3 @@
 module Formtastic
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/spec/inputs/boolean_input_spec.rb

@@ -29,6 +29,10 @@ describe 'boolean input' do
     output_buffer.should_not have_tag('form li label input[@type="hidden"]', :count => 1) # invalid HTML5
   end
 
+  it 'should not add a "name" attribute to the label' do
+    output_buffer.should_not have_tag('form li label[@name]')
+  end
+
   it 'should generate a checkbox input' do
     output_buffer.should have_tag('form li label input')
     output_buffer.should have_tag('form li label input#post_allow_comments')

data/spec/inputs/label_spec.rb

@@ -10,6 +10,28 @@ describe 'Formtastic::FormBuilder#label' do
     mock_everything
   end
 
+  it 'should add "required string" only once with caching enabled' do
+    with_config :i18n_cache_lookups, true do
+      ::I18n.backend.store_translations :en, { :formtastic => { :labels => { :post => { :title => "I18n title" } } } }
+      required_string = "[req_string]"
+      default_required_str = Formtastic::FormBuilder.required_string
+      Formtastic::FormBuilder.required_string = required_string
+
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :required => true, :label => true)
+      end)
+      output_buffer.replace ''
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :required => true, :label => true)
+      end)
+
+      ::I18n.backend.store_translations :en, { :formtastic => { :labels => { :post => { :title => nil } } } }
+      Formtastic::FormBuilder.required_string = default_required_str
+
+      output_buffer.scan(required_string).count.should == 1
+    end
+  end
+
   it 'should humanize the given attribute' do
     concat(semantic_form_for(@new_post) do |builder|
       builder.input(:title)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: formtastic
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 2
   - 1
-  - 0
-  version: 2.1.0
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - Justin French
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-25 00:00:00 +11:00
+date: 2012-03-03 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency