simple_form 2.0.0 → 2.0.1

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 2.0.1
+
+### bug fix
+  * Sanitaze html attributes to `label` method. ([@nashby](https://github.com/nashby)).
+  Closes [#472](https://github.com/plataformatec/simple_form/issues/472)
+  * Make `collection_check_boxes` and `collection_radio_buttons` work with local variables.
+  Closes [#474](https://github.com/plataformatec/simple_form/issues/474)
+  * Use `html5` component by default in the bootstrap generator. ([@isc](https://github.com/isc)).
+  Closes [#471](https://github.com/plataformatec/simple_form/issues/471)
+
 ## 2.0.0
 
 ### enhancements

data/lib/generators/simple_form/templates/config/initializers/simple_form.rb.tt

@@ -46,6 +46,7 @@ SimpleForm.setup do |config|
   end
 <% if options.bootstrap? %>
   config.wrappers :bootstrap, :tag => 'div', :class => 'control-group', :error_class => 'error' do |b|
+    b.use :html5
     b.use :placeholder
     b.use :label
     b.wrapper :tag => 'div', :class => 'controls' do |ba|
@@ -56,6 +57,7 @@ SimpleForm.setup do |config|
   end
 
   config.wrappers :prepend, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
+    b.use :html5
     b.use :placeholder
     b.use :label
     b.wrapper :tag => 'div', :class => 'controls' do |input|
@@ -68,6 +70,7 @@ SimpleForm.setup do |config|
   end
 
   config.wrappers :append, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
+    b.use :html5
     b.use :placeholder
     b.use :label
     b.wrapper :tag => 'div', :class => 'controls' do |input|

data/lib/simple_form/action_view_extensions/builder.rb

@@ -5,10 +5,9 @@ module SimpleForm
     class BuilderBase #:nodoc:
       attr_reader :object, :text, :value
 
-      def initialize(template_object, object_name, method_name, object,
-                     sanitized_attribute_name, text, value, input_html_options)
-        @template_object = template_object
-        @object_name = object_name
+      def initialize(form_builder, method_name, object, sanitized_attribute_name, text,
+                     value, input_html_options)
+        @form_builder = form_builder
         @method_name = method_name
         @object = object
         @sanitized_attribute_name = sanitized_attribute_name
@@ -18,7 +17,7 @@ module SimpleForm
       end
 
       def label(label_html_options={}, &block)
-        @template_object.label(@object_name, @sanitized_attribute_name, @text, label_html_options, &block)
+        @form_builder.label(@sanitized_attribute_name, @text, label_html_options, &block)
       end
     end
 
@@ -26,7 +25,7 @@ module SimpleForm
     class RadioButtonBuilder < BuilderBase #:nodoc:
       def radio_button(extra_html_options={})
         html_options = extra_html_options.merge(@input_html_options)
-        @template_object.radio_button(@object_name, @method_name, @value, html_options)
+        @form_builder.radio_button(@method_name, @value, html_options)
       end
     end
 
@@ -34,7 +33,7 @@ module SimpleForm
     class CheckBoxBuilder < BuilderBase #:nodoc:
       def check_box(extra_html_options={})
         html_options = extra_html_options.merge(@input_html_options)
-        @template_object.check_box(@object_name, @method_name, html_options, @value, nil)
+        @form_builder.check_box(@method_name, html_options, @value, nil)
       end
     end
 
@@ -207,7 +206,7 @@ module SimpleForm
       private
 
       def instantiate_builder(builder_class, attribute, item, value, text, html_options)
-        builder_class.new(@template, object_name, attribute, item,
+        builder_class.new(self, attribute, item,
                           sanitize_attribute_name(attribute, value), text, value, html_options)
       end
 

data/lib/simple_form/form_builder.rb

@@ -303,7 +303,7 @@ module SimpleForm
       return super if args.first.is_a?(String) || block_given?
 
       options = args.extract_options!.dup
-      options[:label_html] = options.except(:label, :required)
+      options[:label_html] = options.except(:label, :required, :as)
 
       column      = find_attribute_column(attribute_name)
       input_type  = default_input_type(attribute_name, column, options)

data/lib/simple_form/inputs/collection_radio_buttons_input.rb

@@ -20,16 +20,12 @@ module SimpleForm
       protected
 
       def apply_default_collection_options!(options)
-        unless options.key?(:item_wrapper_tag)
-          options[:item_wrapper_tag] = SimpleForm.item_wrapper_tag
-        end
+        options[:item_wrapper_tag] ||= options.fetch(:item_wrapper_tag, SimpleForm.item_wrapper_tag)
         options[:item_wrapper_class] = [
           item_wrapper_class, options[:item_wrapper_class], SimpleForm.item_wrapper_class
         ].compact.presence
 
-        unless options.key?(:collection_wrapper_tag)
-          options[:collection_wrapper_tag] = SimpleForm.collection_wrapper_tag
-        end
+        options[:collection_wrapper_tag] ||= options.fetch(:collection_wrapper_tag, SimpleForm.collection_wrapper_tag)
         options[:collection_wrapper_class] = [
           options[:collection_wrapper_class], SimpleForm.collection_wrapper_class
         ].compact.presence

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "2.0.0".freeze
+  VERSION = "2.0.1".freeze
 end

data/test/action_view_extensions/builder_test.rb

@@ -48,6 +48,15 @@ class BuilderTest < ActionView::TestCase
     assert_select 'label.collection_radio_buttons[for=user_name_199]', '$1.99'
   end
 
+  test 'collection radio checks the correct value to local variables' do
+    user = User.new
+    user.active = false
+    with_collection_radio_buttons user, :active, [true, false], :to_s, :to_s
+
+    assert_select 'form input[type=radio][value=true]'
+    assert_select 'form input[type=radio][value=false][checked=checked]'
+  end
+
   test 'collection radio accepts checked item' do
     with_collection_radio_buttons @user, :active, [[1, true], [0, false]], :last, :first, :checked => true
 
@@ -276,6 +285,18 @@ class BuilderTest < ActionView::TestCase
     assert_select 'label.collection_check_boxes[for=user_name_199]', '$1.99'
   end
 
+  test 'collection check box checks the correct value to local variables' do
+    user = User.new
+    user.tag_ids = [1, 3]
+    collection = (1..3).map{|i| [i, "Tag #{i}"] }
+    with_collection_check_boxes user, :tag_ids, collection, :first, :last
+
+    assert_select 'form input[type=checkbox][value=1][checked=checked]'
+    assert_select 'form input[type=checkbox][value=3][checked=checked]'
+    assert_no_select 'form input[type=checkbox][value=2][checked=checked]'
+  end
+
+
   test 'collection check box accepts selected values as :checked option' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
     with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :checked => [1, 3]

data/test/form_builder/label_test.rb

@@ -13,6 +13,12 @@ class LabelTest < ActionView::TestCase
     assert_select 'label.string[for=user_name]', /Name/
   end
 
+  test 'builder should generate a label for the boolean attrbiute' do
+    with_label_for @user, :name, :as => :boolean
+    assert_select 'label.boolean[for=user_name]', /Name/
+    assert_no_select 'label[as=boolean]'
+  end
+
   test 'builder should generate a label componet tag with a clean HTML' do
     with_label_for @user, :name
     assert_no_select 'label.string[label_html]'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 Z
+date: 2012-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70196111502700 !ruby/object:Gem::Requirement
+  requirement: &70290445717740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196111502700
+  version_requirements: *70290445717740
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70196111500600 !ruby/object:Gem::Requirement
+  requirement: &70290445716540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,7 +34,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196111500600
+  version_requirements: *70290445716540
 description: Forms made easy!
 email: contact@plataformatec.com.br
 executables: []
@@ -150,18 +150,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 284620577294605378
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 284620577294605378
 requirements: []
 rubyforge_project: simple_form
 rubygems_version: 1.8.11