simple_form 3.0.2 → 3.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0b1424f33f30519ecda1b748031fdbd3a3a5ac8
-  data.tar.gz: aebd1dbf4c0537ed49040cd5641a892f116b2bc8
+  metadata.gz: 88d85494e222c13d302bed66c947ebc999702a46
+  data.tar.gz: 6974cf74dc9cada33d515c0125c4506262aa4118
 SHA512:
-  metadata.gz: 94c159b4f89974808ddd180935003b32f9023beb9e32878a5c0fdfbd82ef88f3d14f4efc5d748a13f8ce05b3490f05c7ce36002cd9b343486929b214281f811b
-  data.tar.gz: f003707ac3883c392678b6423cb7912668e18b37473a2c4425cfd2a3e9f4f94e0173152f5bc00aa5aade4dad17b4975960b171e49e157c68a1c4a649307aa8f0
+  metadata.gz: c2f1599b149fd691ccc0471af01e5f2f997465f55449bfea0924768c45f83510d36911342e54e8c42dfa75adf5da278261188f17c938b3571446b97c419e2011
+  data.tar.gz: 4c1677e4c36aa1381a378ef3a2c688db1881089d014cb97078f14dd2f5000a618fddc9671f78663fd693c86e4bc8524f3f2c9837aa5e8f7707c9b07b223cf114

data/CHANGELOG.md

@@ -1,38 +1,41 @@
-## 3.0.2
+## 3.1.0.rc2
 
 ### enhancements
-
-  * Support Rails 4.1
-
-## 3.0.1
+  * Add mapping to `uuid` columns.
+  * Add custom namespaces for custom inputs feature. [@vala](https://github.com/vala)
+  * Add `:unless_blank` option to the wrapper API. [@IanVaughan](https://github.com/IanVaughan)
+  * Add support to html markup in the I18n options. [@laurocaetano](https://github.com/laurocaetano)
+  * Add the `full_error` component. [@laurocaetano](https://github.com/laurocaetano)
+  * Add support to `scope` to be used on associations. [@laurocaetano](https://github.com/laurocaetano)
+  * Execute the association `condition` in the object context. [@laurocaetano](https://github.com/laurocaetano)
+  * Check if the given association responds to `order` before calling it. [@laurocaetano](https://github.com/laurocaetano)
+  * Add Bootstrap 3 initializer template.
+  * For radio or checkbox collection always use `:item_wrapper_tag` to wrap the content and add `label` when using `boolean_style` with `:nested` [@kassio](https://github.com/kassio) and [@erichkist](https://github.com/erichkist)
+  * `input_field` uses the same wrapper as input but only with attribute components. [@nashby](https://github.com/nashby)
+  * Add wrapper mapping per form basis [@rcillo](https://github.com/rcillo) and [@bernardoamc](https://github.com/bernardoamc)
+  * Add `for` attribute to `label` when collections are rendered as radio or checkbox [@erichkist](https://github.com/erichkist), [@ulissesalmeida](https://github.com/ulissesalmeida) and [@fabioyamate](https://github.com/fabioyamate)
+  * Add `include_default_input_wrapper_class` config [@luizcosta](https://github.com/luizcosta)
+  * Map `datetime`, `date` and `time` input types to their respective HTML5 input tags
+  when the `:html5` is set to `true` [@volmer](https://github.com/volmer)
+  * Add `boolean_label_class` config.
+  * Add `:html` option to include additional attributes on custom wrappers [@remofritzsche](https://github.com/remofritzsche) and [@ulissesalmeida](https://github.com/ulissesalmeida)
+  * Make possible to use the Wrappers API to define attributes for the components.
+  See https://github.com/plataformatec/simple_form/pull/997 for more information.
+  * Put a whitespace before the `inline_label` options of boolean input if it is present.
+  * Add support to configure the `label_text` proc at the wrapper level. [@NOX73](https://github.com/NOX73)
+  * `label_text` proc now receive three arguments (label, request, and if the label was explicit). [@timscott](https://github.com/timscott)
+  * Add I18n support to `:include_blank` and `:prompt` when `:translate` is used as value. [@haines](https://github.com/plataformatec/simple_form/pull/616)
+  * Add support to define custom error messages for the attributes.
+  * Add support to change the I18n scope to be used in Simple Form. [@nielsbuus](https://github.com/nielsbuus)
 
 ### bug fix
-  * Fix XSS vulnerability on label, hint and error components.
-
-## 3.0.0
+  * Collection input that uses automatic collection translation properly sets checked values.
+  Closes [#971](https://github.com/plataformatec/simple_form/issues/971) [@nashby](https://github.com/nashby)
+  * Collection input generates `required` attribute if it has `prompt` option. [@nashby](https://github.com/nashby)
+  * Grouped collection uses the first non-empty object to detect label and value methods.
 
-### enhancements
-  * New `input_class` global config option to set a class to be generated in all inputs.
-  * Collection tags accept html attributes as the last element of collection [@nashby](https://github.com/nashby)
-  * Change default `:value_method` of collection tags from `:last` to `:second` [@nashby](https://github.com/nashby)
-  * Support `Proc` object in `:conditions` option of associations [@bradly](https://github.com/bradly)
-  * `input_field` supports `html5` component [@nashby](https://github.com/nashby)
-  * Make `field_error_proc` configurable [@dfens](https://github.com/dfens)
-  * Support to Rails 4.
-  * Removed deprecated methods.
-  * SimpleForm no longer sets the `size` attribute automatically and the `default_input_size` setting
-  is now deprecated.
-  * Support to aria-required attribute to required fields [@ckundo](https://github.com/ckundo)
-
-### bug fix
-  * Make `DateTimeInput#label_target` method to work with string values in `I18n.t('date.order')` (default
-  behaviour in Rails 4)
-  Closes [#846](https://github.com/plataformatec/simple_form/issues/846) [@mjankowski](https://github.com/mjankowski)
-  * Add "checkbox" class to the label of boolean input when there is no `:label`
-  in `generate_additional_classes_for` config option [@nashby](https://github.com/nashby)
-  * Support models with digits in their names [@webgago](https://github.com/webgago)
-  * Remove deprecation warnings related to `Relation#all` from Rails 4.
-  * Form builder can be used outside the context of a controller [@jasonwebster](https://github.com/jasonwebster)
-  * Skip pattern attribute when using `validates_format_of` with `:without` option [@glebm](https://github.com/glebm)
+## deprecation
+  * Methods on custom inputs now accept a required argument with the wrapper options.
+  See https://github.com/plataformatec/simple_form/pull/997 for more information.
 
-Please check [v2.1](https://github.com/plataformatec/simple_form/blob/v2.1/CHANGELOG.md) for previous changes.
+Please check [v3.0](https://github.com/plataformatec/simple_form/blob/v3.0/CHANGELOG.md) for previous changes.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2013 Plataformatec http://plataformatec.com.br/
+Copyright (c) 2009-2014 Plataformatec http://plataformatec.com.br/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -2,10 +2,6 @@
 
 By [Plataformatec](http://plataformatec.com.br/).
 
-[![Gem Version](https://fury-badge.herokuapp.com/rb/simple_form.png)](http://badge.fury.io/rb/simple_form)
-[![Build Status](https://api.travis-ci.org/plataformatec/simple_form.png?branch=master)](http://travis-ci.org/plataformatec/simple_form)
-[![Code Climate](https://codeclimate.com/github/plataformatec/simple_form.png)](https://codeclimate.com/github/plataformatec/simple_form)
-
 Rails forms made easy.
 
 **Simple Form** aims to be as flexible as possible while helping you with powerful components to create
@@ -14,7 +10,7 @@ you find the better design for your eyes. Most of the DSL was inherited from For
 which we are thankful for and should make you feel right at home.
 
 INFO: This README is [also available in a friendly navigable format](http://simple-form.plataformatec.com.br/)
-and refers to **Simple Form** 3.0. For older releases, check the related branch for your version.
+and refers to **Simple Form** 3.1. For older releases, check the related branch for your version.
 
 ## Installation
 
@@ -43,24 +39,22 @@ Also, if you want to use the country select, you will need the
 gem 'country_select'
 ```
 
-### Twitter Bootstrap
+### Bootstrap
 
-**Simple Form** can be easily integrated to the [Twitter Bootstrap](http://twitter.github.com/bootstrap).
+**Simple Form** can be easily integrated to the [Bootstrap](http://getbootstrap.com/).
 To do that you have to use the `bootstrap` option in the install generator, like this:
 
 ```console
 rails generate simple_form:install --bootstrap
 ```
 
-You have to be sure that you added a copy of the [Twitter Bootstrap](http://twitter.github.com/bootstrap)
+You have to be sure that you added a copy of the [Bootstrap](http://getbootstrap.com/)
 assets on your application.
 
 For more information see the generator output, our
 [example application code](https://github.com/rafaelfranca/simple_form-bootstrap) and
 [the live example app](http://simple-form-bootstrap.plataformatec.com.br/).
 
-**NOTE**: **Simple Form** integration requires Twitter Bootstrap version 2.0 or higher.
-
 ### Zurb Foundation 3
 
 To generate wrappers that are compatible with [Zurb Foundation 3](http://foundation.zurb.com/), pass
@@ -81,7 +75,7 @@ Please see the [instructions on how to install Foundation in a Rails app](http:/
 **Simple Form** was designed to be customized as you need to. Basically it's a stack of components that
 are invoked to create a complete html input for you, which by default contains label, hints, errors
 and the input itself. It does not aim to create a lot of different logic from the default Rails
-form helpers, as they do a great work by themselves. Instead, **Simple Form** acts as a DSL and just
+form helpers, as they do a great job by themselves. Instead, **Simple Form** acts as a DSL and just
 maps your input type (retrieved from the column definition in the database) to a specific helper method.
 
 To start using **Simple Form** you just have to use the helper it provides:
@@ -176,6 +170,13 @@ And of course, the `required` property of any input can be overwritten as needed
 <% end %>
 ```
 
+By default, **Simple Form** will look at the column type in the database and use an
+appropriate input for the column. For example, a column created with type
+`:text` in the database will use a `textarea` input by default. See the section
+[Available input types and defaults for each column
+type](https://github.com/plataformatec/simple_form#available-input-types-and-defaults-for-each-column-type)
+for a complete list of defaults.
+
 **Simple Form** also lets you overwrite the default input type it creates:
 
 ```erb
@@ -189,11 +190,11 @@ And of course, the `required` property of any input can be overwritten as needed
 ```
 
 So instead of a checkbox for the *accepts* attribute, you'll have a pair of radio buttons with yes/no
-labels and a text area instead of a text field for the description. You can also render boolean
+labels and a textarea instead of a text field for the description. You can also render boolean
 attributes using `as: :select` to show a dropdown.
 
 It is also possible to give the `:disabled` option to **Simple Form**, and it'll automatically mark
-the wrapper as disabled with a css class, so you can style labels, hints and other components inside
+the wrapper as disabled with a CSS class, so you can style labels, hints and other components inside
 the wrapper as well:
 
 ```erb
@@ -210,6 +211,7 @@ the wrapper as well:
   <%= f.input :date_of_birth, as: :date, start_year: Date.today.year - 90,
                               end_year: Date.today.year - 12, discard_day: true,
                               order: [:month, :year] %>
+  <%= f.input :accepts, as: :boolean, checked_value: true, unchecked_value: false %>
   <%= f.button :submit %>
 <% end %>
 ```
@@ -241,9 +243,42 @@ Example:
 ```ruby
 simple_form_for @user do |f|
   f.input_field :name
+  f.input_field :remember_me, as: :boolean
+end
+```
+
+```html
+<form>
+  ...
+  <input class="string required" id="user_name" maxlength="255" name="user[name]" size="255" type="text">
+  <input name="user[remember_me]" type="hidden" value="0">
+  <label class="checkbox">
+    <input class="boolean optional" id="user_published" name="user[remember_me]" type="checkbox" value="1">
+  </label>
+</form>
+```
+
+For check boxes and radio buttons you can remove the label changing `boolean_style` from default value `:nested` to `:inline`.
+Also, `item_wrapper_tag` will not work when `boolean_style` is set to `:nested`.
+
+Example:
+
+```ruby
+simple_form_for @user do |f|
+  f.input_field :name
+  f.input_field :remember_me, as: :boolean, boolean_style: :inline
 end
 ```
 
+```html
+<form>
+  ...
+  <input class="string required" id="user_name" maxlength="255" name="user[name]" size="255" type="text">
+  <input name="user[remember_me]" type="hidden" value="0">
+  <input class="boolean optional" id="user_remember_me" name="user[remember_me]" type="checkbox" value="1">
+</form>
+```
+
 Produces:
 
 ```html
@@ -269,14 +304,14 @@ overriding the `:collection` option:
 Collections can be arrays or ranges, and when a `:collection` is given the `:select` input will be
 rendered by default, so we don't need to pass the `as: :select` option. Other types of collection
 are `:radio_buttons` and `:check_boxes`. Those are added by **Simple Form** to Rails set of form
-helpers (read Extra Helpers session below for more information).
+helpers (read Extra Helpers section below for more information).
 
 Collection inputs accept two other options beside collections:
 
-* _label_method_ => the label method to be applied to the collection to retrieve the label (use this
+* *label_method* => the label method to be applied to the collection to retrieve the label (use this
   instead of the `text_method` option in `collection_select`)
 
-* _value_method_ => the value method to be applied to the collection to retrieve the value
+* *value_method* => the value method to be applied to the collection to retrieve the value
 
 Those methods are useful to manipulate the given collection. Both of these options also accept
 lambda/procs in case you want to calculate the value or label in a special way eg. custom
@@ -296,24 +331,24 @@ f.input :country_id, collection: @continents, as: :grouped_select, group_method:
 Grouped collection inputs accept the same `:label_method` and `:value_method` options, which will be
 used to retrieve label/value attributes for the `option` tags. Besides that, you can give:
 
-* _group_method_ => the method to be called on the given collection to generate the options for
+* *group_method* => the method to be called on the given collection to generate the options for
   each group (required)
 
-* _group_label_method_ => the label method to be applied on the given collection to retrieve the label
+* *group_label_method* => the label method to be applied on the given collection to retrieve the label
   for the _optgroup_ (**Simple Form** will attempt to guess the best one the same way it does with
   `:label_method`)
 
 ### Priority
 
 **Simple Form** also supports `:time_zone` and `:country`. When using such helpers, you can give
-`:priority` as option to select which time zones and/or countries should be given higher priority:
+`:priority` as an option to select which time zones and/or countries should be given higher priority:
 
 ```ruby
 f.input :residence_country, priority: [ "Brazil" ]
 f.input :time_zone, priority: /US/
 ```
 
-Those values can also be configured with a default value to be used site use through the
+Those values can also be configured with a default value to be used on the site through the
 `SimpleForm.country_priority` and `SimpleForm.time_zone_priority` helpers.
 
 Note: While using `country_select` if you want to restrict to only a subset of countries for a specific
@@ -325,8 +360,8 @@ f.input :shipping_country, priority: [ "Brazil" ], collection: [ "Australia", "B
 
 ### Associations
 
-To deal with associations, **Simple Form** can generate select inputs, a series of radios buttons or check boxes.
-Lets see how it works: imagine you have a user model that belongs to a company and has_and_belongs_to_many
+To deal with associations, **Simple Form** can generate select inputs, a series of radios buttons or checkboxes.
+Lets see how it works: imagine you have a user model that belongs to a company and `has_and_belongs_to_many`
 roles. The structure would be something like:
 
 ```ruby
@@ -357,7 +392,7 @@ Now we have the user form:
 
 Simple enough, right? This is going to render a `:select` input for choosing the `:company`, and another
 `:select` input with `:multiple` option for the `:roles`. You can, of course, change it to use radio
-buttons and check boxes as well:
+buttons and checkboxes as well:
 
 ```ruby
 f.association :company, as: :radio_buttons
@@ -420,7 +455,7 @@ Rails helper, but change the builder to use the `SimpleForm::FormBuilder`.
 
 ```ruby
 form_for @user do |f|
-  f.simple_fields_for :posts do |posts_form|
+  simple_fields_for :posts do |posts_form|
     # Here you have all simple_form methods available
     posts_form.input :title
   end
@@ -446,7 +481,7 @@ end
 
 #### Collection Check Boxes
 
-Creates a collection of check boxes with labels associated (same API as `collection_select`):
+Creates a collection of checkboxes with labels associated (same API as `collection_select`):
 
 ```ruby
 form_for @user do |f|
@@ -471,36 +506,37 @@ form_for @user do |f|
 end
 ```
 
-## Mappings/Inputs available
-
-**Simple Form** comes with a lot of default mappings:
-
-```text
-Mapping               Input                         Column Type
-
-boolean               check box                     boolean
-string                text field                    string
-email                 email field                   string with name matching "email"
-url                   url field                     string with name matching "url"
-tel                   tel field                     string with name matching "phone"
-password              password field                string with name matching "password"
-search                search                        -
-text                  text area                     text
-file                  file field                    string, responding to file methods
-hidden                hidden field                  -
-integer               number field                  integer
-float                 number field                  float
-decimal               number field                  decimal
-range                 range field                   -
-datetime              datetime select               datetime/timestamp
-date                  date select                   date
-time                  time select                   time
-select                collection select             belongs_to/has_many/has_and_belongs_to_many associations
-radio_buttons         collection radio buttons      belongs_to
-check_boxes           collection check boxes        has_many/has_and_belongs_to_many associations
-country               country select                string with name matching "country"
-time_zone             time zone select              string with name matching "time_zone"
-```
+## Available input types and defaults for each column type
+
+The following table shows the html element you will get for each attribute
+according to its database definition. These defaults can be changed by
+specifying the helper method in the column `Mapping` as the `as:` option.
+
+     Mapping         | Generated HTML Element               | Database Column Type
+     --------------- |:-------------------------------------|:--------------------
+     `boolean`       | `input[type=checkbox]`               | `boolean`
+     `string`        | `input[type=text]`                   | `string`
+     `email`         | `input[type=email]`                  | `string` with `name =~ /email/`
+     `url`           | `input[type=url]`                    | `string` with `name =~ /url/`
+     `tel`           | `input[type=tel]`                    | `string` with `name =~ /phone/`
+     `password`      | `input[type=password]`               | `string` with `name =~ /password/`
+     `search`        | `input[type=search]`                 | -
+     `uuid`          | `input[type=text]`                   | `uuid`
+     `text`          | `textarea`                           | `text`
+     `file`          | `input[type=file]`                   | `string` responding to file methods
+     `hidden`        | `input[type=hidden]`                 | -
+     `integer`       | `input[type=number]`                 | `integer`
+     `float`         | `input[type=number]`                 | `float`
+     `decimal`       | `input[type=number]`                 | `decimal`
+     `range`         | `input[type=range]`                  | -
+     `datetime`      | `datetime select`                    | `datetime/timestamp`
+     `date`          | `date select`                        | `date`
+     `time`          | `time select`                        | `time`
+     `select`        | `select`                             | `belongs_to`/`has_many`/`has_and_belongs_to_many` associations
+     `radio_buttons` | collection of `input[type=radio]`    | `belongs_to` associations
+     `check_boxes`   | collection of `input[type=checkbox]` | `has_many`/`has_and_belongs_to_many` associations
+     `country`       | `select` (countries as options)      | `string` with `name =~ /country/`
+     `time_zone`     | `select` (timezones as options)      | `string` with `name =~ /time_zone/`
 
 ## Custom inputs
 
@@ -510,7 +546,7 @@ that extends the string one, you just need to add this file:
 ```ruby
 # app/inputs/currency_input.rb
 class CurrencyInput < SimpleForm::Inputs::Base
-  def input
+  def input(wrapper_options)
     "$ #{@builder.text_field(attribute_name, input_html_options)}".html_safe
   end
 end
@@ -521,6 +557,7 @@ And use it in your views:
 ```ruby
 f.input :money, as: :currency
 ```
+Note, you may have to create the `app/inputs/` directory and restart your webserver.
 
 You can also redefine existing **Simple Form** inputs by creating a new class with the same name. For
 instance, if you want to wrap date/time/datetime in a div, you can do:
@@ -528,7 +565,7 @@ instance, if you want to wrap date/time/datetime in a div, you can do:
 ```ruby
 # app/inputs/date_time_input.rb
 class DateTimeInput < SimpleForm::Inputs::DateTimeInput
-  def input
+  def input(wrapper_options)
     template.content_tag(:div, super)
   end
 end
@@ -545,6 +582,28 @@ class CollectionSelectInput < SimpleForm::Inputs::CollectionSelectInput
 end
 ```
 
+If needed, you can namespace your custom inputs in a module and tell **Simple Form** to look for
+their definitions in this module. This can avoid conflicts with other form libraries (like Formtastic) that look up
+the global context to find inputs definition too.
+
+```ruby
+# app/inputs/custom_inputs/numeric_input
+module CustomInputs
+  class NumericInput < SimpleForm::Inputs::NumericInput
+    def input_html_classes
+      super.push('no-spinner')
+    end
+  end
+end
+```
+
+And in the **SimpleForm** initializer :
+
+```ruby
+# config/simple_form.rb
+config.custom_inputs_namespaces << "CustomInputs"
+```
+
 ## Custom form builder
 
 You can create a custom form builder that uses **Simple Form**.
@@ -563,15 +622,14 @@ Create a form builder class that inherits from `SimpleForm::FormBuilder`.
 ```ruby
 class CustomFormBuilder < SimpleForm::FormBuilder
   def input(attribute_name, options = {}, &block)
-    options[:input_html].merge! class: 'custom'
-    super
+    super(attribute_name, options.merge(label: false), &block)
   end
 end
 ```
 
 ## I18n
 
-**Simple Form** uses all power of I18n API to lookup labels, hints and placeholders. To customize your
+**Simple Form** uses all power of I18n API to lookup labels, hints, prompts and placeholders. To customize your
 forms you can create a locale file like this:
 
 ```yaml
@@ -589,12 +647,18 @@ en:
       user:
         username: 'Your username'
         password: '****'
+    include_blanks:
+      user:
+        age: 'Rather not say'
+    prompts:
+      user:
+        gender: 'Select your gender'
 ```
 
 And your forms will use this information to render the components for you.
 
-**Simple Form** also lets you be more specific, separating lookups through actions for labels, hints and
-placeholders. Let's say you want a different label for new and edit actions, the locale file would
+**Simple Form** also lets you be more specific, separating lookups through actions.
+Let's say you want a different label for new and edit actions, the locale file would
 be something like:
 
 ```yaml
@@ -633,13 +697,19 @@ en:
 ```
 
 **Simple Form** will always look for a default attribute translation under the "defaults" key if no
-specific is found inside the model key. Note that this syntax is different from 1.x. To migrate to
-the new syntax, just move "labels.#{attribute}" to "labels.defaults.#{attribute}".
+specific is found inside the model key.
 
-In addition, **Simple Form** will fallback to default human_attribute_name from Rails when no other
+In addition, **Simple Form** will fallback to default `human_attribute_name` from Rails when no other
 translation is found for labels. Finally, you can also overwrite any label, hint or placeholder
 inside your view, just by passing the option manually. This way the I18n lookup will be skipped.
 
+For `:prompt` and `:include_blank` the I18n lookup is optional and to enable it is necessary to pass
+`:translate` as value.
+
+```ruby
+f.input :gender, prompt: :translate
+```
+
 **Simple Form** also has support for translating options in collection helpers. For instance, given a
 User with a `:gender` attribute, you might want to create a select box showing translated labels
 that would post either `male` or `female` as value. With **Simple Form** you could create an input
@@ -770,13 +840,23 @@ end
 
 this will wrap the hint and error components within a `div` tag using the class `'separator'`.
 
+You can customize _Form components_ passing options to them:
+
+```ruby
+config.wrappers do |b|
+  b.use :label_input, class: 'label-input-class'
+end
+```
+
+This you set the input and label class to `'label-input-class'`.
+
 If you want to customize the custom _Form components_ on demand you can give it a name like this:
 
 ```ruby
 config.wrappers do |b|
   b.use :placeholder
   b.use :label_input
-  b.wrapper :my_wrapper, tag: :div, class: 'separator' do |component|
+  b.wrapper :my_wrapper, tag: :div, class: 'separator', html: { id: 'my_wrapper_id' } do |component|
     component.use :hint,  wrap_with: { tag: :span, class: :hint }
     component.use :error, wrap_with: { tag: :span, class: :error }
   end
@@ -838,6 +918,15 @@ end
 By setting it as `optional`, a hint will only be generated when `hint: true` is explicitly used.
 The same for placeholder.
 
+It is also possible to give the option `:unless_blank` to the wrapper if you want to render it only
+when the content is present.
+
+```ruby
+  b.wrapper tag: :span, class: 'hint', unless_blank: true do |component|
+    component.optional :hint
+  end
+```
+
 ## HTML 5 Notice
 
 By default, **Simple Form** will generate input field types and attributes that are supported in HTML5,
@@ -850,10 +939,25 @@ required attribute to force a value into an input and will prevent form submissi
 Depending on the design of the application this may or may not be desired. In many cases it can
 break existing UI's.
 
-It is possible to disable all HTML 5 extensions in **Simple Form** with the following configuration:
+It is possible to disable all HTML 5 extensions in **Simple Form** removing the `html5` component
+from the wrapper used to render the inputs.
+
+For example, change:
+
+```ruby
+config.wrappers tag: :div do |b|
+  b.use :html5
+
+  b.use :label_input
+end
+```
+
+To:
 
 ```ruby
-SimpleForm.html5 = false # default is true
+config.wrappers tag: :div do |b|
+  b.use :label_input
+end
 ```
 
 If you want to have all other HTML 5 features, such as the new field types, you can disable only
@@ -870,7 +974,7 @@ help you to use some generic javascript validation.
 You can also add `novalidate` to a specific form by setting the option on the form itself:
 
 ```erb
-<%= simple_form_for(resource, html: {novalidate: true}) do |form| %>
+<%= simple_form_for(resource, html: { novalidate: true }) do |form| %>
 ```
 
 Please notice that any of the configurations above will not disable the `placeholder` component,
@@ -894,9 +998,6 @@ You can view the **Simple Form** documentation in RDoc format here:
 
 http://rubydoc.info/github/plataformatec/simple_form/master/frames
 
-If you need to use **Simple Form** with Rails 2.3, you can always run `gem server` from the command line
-after you install the gem to access the old documentation.
-
 ### Bug reports
 
 If you discover any bugs, feel free to create an issue on GitHub. Please add as much information as
@@ -912,9 +1013,14 @@ https://github.com/plataformatec/simple_form/issues
 * Rafael Mendonça França (https://github.com/rafaelfranca)
 * Vasiliy Ermolovich (https://github.com/nashby)
 
+[![Gem Version](https://fury-badge.herokuapp.com/rb/simple_form.png)](http://badge.fury.io/rb/simple_form)
+[![Build Status](https://api.travis-ci.org/plataformatec/simple_form.svg?branch=master)](http://travis-ci.org/plataformatec/simple_form)
+[![Code Climate](https://codeclimate.com/github/plataformatec/simple_form.png)](https://codeclimate.com/github/plataformatec/simple_form)
+[![Inline docs](http://inch-ci.org/github/plataformatec/simple_form.png)](http://inch-ci.org/github/plataformatec/simple_form)
+
 ## License
 
-MIT License. Copyright 2009-2013 Plataformatec. http://plataformatec.com.br
+MIT License. Copyright 2009-2014 Plataformatec. http://plataformatec.com.br
 
 You are not granted rights or licenses to the trademarks of the Plataformatec, including without
 limitation the Simple Form name or logo.

data/lib/generators/simple_form/install_generator.rb

@@ -4,12 +4,12 @@ module SimpleForm
       desc "Copy SimpleForm default files"
       source_root File.expand_path('../templates', __FILE__)
       class_option :template_engine, desc: 'Template engine to be invoked (erb, haml or slim).'
-      class_option :bootstrap, type: :boolean, desc: 'Add the Twitter Bootstrap wrappers to the SimpleForm initializer.'
+      class_option :bootstrap, type: :boolean, desc: 'Add the Bootstrap wrappers to the SimpleForm initializer.'
       class_option :foundation, type: :boolean, desc: 'Add the Zurb Foundation 3 wrappers to the SimpleForm initializer.'
 
       def info_bootstrap
         return if options.bootstrap? || options.foundation?
-        puts "SimpleForm 2 supports Twitter Bootstrap and Zurb Foundation 3. If you want "\
+        puts "SimpleForm 2 supports Bootstrap and Zurb Foundation 3. If you want "\
           "a configuration that is compatible with one of these frameworks, then please " \
           "re-run this generator with --bootstrap or --foundation as an option."
       end

data/lib/generators/simple_form/templates/README

@@ -1,12 +1,11 @@
 ===============================================================================
 
   Be sure to have a copy of the Bootstrap stylesheet available on your
-  application, you can get it on http://twitter.github.com/bootstrap.
+  application, you can get it on http://getbootstrap.com/.
 
   Inside your views, use the 'simple_form_for' with one of the Bootstrap form
-  classes, '.form-horizontal', '.form-inline', '.form-search' or
-  '.form-vertical', as the following:
+  classes, '.form-horizontal' or '.form-inline', as the following:
 
-    = simple_form_for(@user, html: {class: 'form-horizontal' }) do |form|
+    = simple_form_for(@user, html: { class: 'form-horizontal' }) do |form|
 
 ===============================================================================