simple_form 2.1.0 → 3.0.0

data/README.md

@@ -1,12 +1,20 @@
-# SimpleForm - Rails forms made easy.
-[![Build Status](https://secure.travis-ci.org/plataformatec/simple_form.png?branch=master)](http://travis-ci.org/plataformatec/simple_form)
+![Simple Form Logo](https://raw.github.com/plataformatec/simple_form/master/simple_form.png)
 
-**SimpleForm** aims to be as flexible as possible while helping you with powerful components to create
-your forms. The basic goal of SimpleForm is to not touch your way of defining the layout, letting
+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
+your forms. The basic goal of **Simple Form** is to not touch your way of defining the layout, letting
 you find the better design for your eyes. Most of the DSL was inherited from Formtastic,
 which we are thankful for and should make you feel right at home.
 
-INFO: This README refers to **SimpleForm** 2.1. For older releases, check the related branch for your version.
+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.
 
 ## Installation
 
@@ -37,7 +45,7 @@ gem 'country_select'
 
 ### Twitter Bootstrap
 
-**SimpleForm** 2.0 can be easily integrated to the [Twitter Bootstrap](http://twitter.github.com/bootstrap).
+**Simple Form** can be easily integrated to the [Twitter Bootstrap](http://twitter.github.com/bootstrap).
 To do that you have to use the `bootstrap` option in the install generator, like this:
 
 ```console
@@ -51,29 +59,32 @@ 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**: **SimpleForm** integration requires Twitter Bootstrap version 2.0 or higher.
+**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 the `foundation` option to the generator, like this:
+To generate wrappers that are compatible with [Zurb Foundation 3](http://foundation.zurb.com/), pass
+the `foundation` option to the generator, like this:
 
 ```console
 rails generate simple_form:install --foundation
 ```
 
-Please note that the Foundation wrapper does not support the `:hint` option by default. In order to enable hints, please uncomment the appropriate line in `config/initializers/simple_form_foundation.rb`. You will need to provide your own CSS styles for hints.
+Please note that the Foundation wrapper does not support the `:hint` option by default. In order to
+enable hints, please uncomment the appropriate line in `config/initializers/simple_form_foundation.rb`.
+You will need to provide your own CSS styles for hints.
 
-Please see the [instructions on how to install Foundation in a Rails app](http://foundation.zurb.com/docs/rails.php).
+Please see the [instructions on how to install Foundation in a Rails app](http://foundation.zurb.com/old-docs/f3/rails.php).
 
 ## Usage
 
-**SimpleForm** was designed to be customized as you need to. Basically it's a stack of components that
+**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, **SimpleForm** acts as a DSL and just
+form helpers, as they do a great work 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 **SimpleForm** you just have to use the helper it provides:
+To start using **Simple Form** you just have to use the helper it provides:
 
 ```erb
 <%= simple_form_for @user do |f| %>
@@ -91,10 +102,10 @@ even a placeholder. For boolean inputs, you can add an inline label as well:
 
 ```erb
 <%= simple_form_for @user do |f| %>
-  <%= f.input :username, :label => 'Your username please' %>
-  <%= f.input :password, :hint => 'No special characters.' %>
-  <%= f.input :email, :placeholder => 'user@domain.com' %>
-  <%= f.input :remember_me, :inline_label => 'Yes, remember me' %>
+  <%= f.input :username, label: 'Your username please' %>
+  <%= f.input :password, hint: 'No special characters.' %>
+  <%= f.input :email, placeholder: 'user@domain.com' %>
+  <%= f.input :remember_me, inline_label: 'Yes, remember me' %>
   <%= f.button :submit %>
 <% end %>
 ```
@@ -104,9 +115,9 @@ of any of them:
 
 ```erb
 <%= simple_form_for @user do |f| %>
-  <%= f.input :username, :label_html => { :class => 'my_class' } %>
-  <%= f.input :password, :hint => false, :error_html => { :id => 'password_error'} %>
-  <%= f.input :password_confirmation, :label => false %>
+  <%= f.input :username, label_html: { class: 'my_class' } %>
+  <%= f.input :password, hint: false, error_html: { id: 'password_error'} %>
+  <%= f.input :password_confirmation, label: false %>
   <%= f.button :submit %>
 <% end %>
 ```
@@ -116,9 +127,9 @@ option, for instance:
 
 ```erb
 <%= simple_form_for @user do |f| %>
-  <%= f.input :username, :input_html => { :class => 'special' } %>
-  <%= f.input :password, :input_html => { :maxlength => 20 } %>
-  <%= f.input :remember_me, :input_html => { :value => '1' } %>
+  <%= f.input :username, input_html: { class: 'special' } %>
+  <%= f.input :password, input_html: { maxlength: 20 } %>
+  <%= f.input :remember_me, input_html: { value: '1' } %>
   <%= f.button :submit %>
 <% end %>
 ```
@@ -128,80 +139,82 @@ you can use the `:defaults` option in `simple_form_for`. Specific options in `in
 overwrite the defaults:
 
 ```erb
-<%= simple_form_for @user, :defaults => { :input_html => { :class => 'default_class' } } do |f| %>
-  <%= f.input :username, :input_html => { :class => 'special' } %>
-  <%= f.input :password, :input_html => { :maxlength => 20 } %>
-  <%= f.input :remember_me, :input_html => { :value => '1' } %>
+<%= simple_form_for @user, defaults: { input_html: { class: 'default_class' } } do |f| %>
+  <%= f.input :username, input_html: { class: 'special' } %>
+  <%= f.input :password, input_html: { maxlength: 20 } %>
+  <%= f.input :remember_me, input_html: { value: '1' } %>
   <%= f.button :submit %>
 <% end %>
 ```
 
-Since **SimpleForm** generates a wrapper div around your label and input by default, you can pass
+Since **Simple Form** generates a wrapper div around your label and input by default, you can pass
 any html attribute to that wrapper as well using the `:wrapper_html` option, like so:
 
 ```erb
 <%= simple_form_for @user do |f| %>
-  <%= f.input :username, :wrapper_html => { :class => 'username' } %>
-  <%= f.input :password, :wrapper_html => { :id => 'password' } %>
-  <%= f.input :remember_me, :wrapper_html => { :class => 'options' } %>
+  <%= f.input :username, wrapper_html: { class: 'username' } %>
+  <%= f.input :password, wrapper_html: { id: 'password' } %>
+  <%= f.input :remember_me, wrapper_html: { class: 'options' } %>
   <%= f.button :submit %>
 <% end %>
 ```
 
 Required fields are marked with an * prepended to their labels.
 
-By default all inputs are required. When the form object has `presence` validations attached to its fields, **SimpleForm** tells required and optional fields apart. For performance reasons, this detection is skipped on validations that make use of conditional options, such as `:if` and `:unless`.
+By default all inputs are required. When the form object has `presence` validations attached to its
+fields, **Simple Form** tells required and optional fields apart. For performance reasons, this
+detection is skipped on validations that make use of conditional options, such as `:if` and `:unless`.
 
 And of course, the `required` property of any input can be overwritten as needed:
 
 ```erb
 <%= simple_form_for @user do |f| %>
-  <%= f.input :name, :required => false %>
+  <%= f.input :name, required: false %>
   <%= f.input :username %>
   <%= f.input :password %>
   <%= f.button :submit %>
 <% end %>
 ```
 
-**SimpleForm** also lets you overwrite the default input type it creates:
+**Simple Form** also lets you overwrite the default input type it creates:
 
 ```erb
 <%= simple_form_for @user do |f| %>
   <%= f.input :username %>
   <%= f.input :password %>
-  <%= f.input :description, :as => :text %>
-  <%= f.input :accepts,     :as => :radio_buttons %>
+  <%= f.input :description, as: :text %>
+  <%= f.input :accepts,     as: :radio_buttons %>
   <%= f.button :submit %>
 <% end %>
 ```
 
 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
-attributes using `:as => :select` to show a dropdown.
+attributes using `as: :select` to show a dropdown.
 
-It is also possible to give the `:disabled` option to **SimpleForm**, and it'll automatically mark
+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 well:
 
 ```erb
 <%= simple_form_for @user do |f| %>
-  <%= f.input :username, :disabled => true, :hint => 'You cannot change your username.' %>
+  <%= f.input :username, disabled: true, hint: 'You cannot change your username.' %>
   <%= f.button :submit %>
 <% end %>
 ```
 
-**SimpleForm** accepts same options as their corresponding input type helper in Rails:
+**Simple Form** accepts same options as their corresponding input type helper in Rails:
 
 ```erb
 <%= simple_form_for @user do |f| %>
-  <%= 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 :date_of_birth, as: :date, start_year: Date.today.year - 90,
+                              end_year: Date.today.year - 12, discard_day: true,
+                              order: [:month, :year] %>
   <%= f.button :submit %>
 <% end %>
 ```
 
-**SimpleForm** also allows you to use label, hint, input_field, error and full_error helpers
+**Simple Form** also allows you to use label, hint, input_field, error and full_error helpers
 (please take a look at the rdocs for each method for more info):
 
 ```erb
@@ -209,7 +222,7 @@ the wrapper as well:
   <%= f.label :username %>
   <%= f.input_field :username %>
   <%= f.hint 'No special characters, please!' %>
-  <%= f.error :username, :id => 'user_name_error' %>
+  <%= f.error :username, id: 'user_name_error' %>
   <%= f.full_error :token %>
   <%= f.submit 'Save' %>
 <% end %>
@@ -217,6 +230,29 @@ the wrapper as well:
 
 Any extra option passed to these methods will be rendered as html option.
 
+### Stripping away all wrapper divs
+
+**Simple Form** also allows you to strip away all the div wrappers around the `<input>` field that is
+generated with the usual `f.input`.
+The easiest way to achieve this is to use `f.input_field`.
+
+Example:
+
+```ruby
+simple_form_for @user do |f|
+  f.input_field :name
+end
+```
+
+Produces:
+
+```html
+<input class="string required" id="user_name" maxlength="100"
+   name="user[name]" size="100" type="text" value="Carlos" />
+```
+
+To view the actual RDocs for this, check them out here - http://rubydoc.info/github/plataformatec/simple_form/master/SimpleForm/FormBuilder:input_field
+
 ### Collections
 
 And what if you want to create a select containing the age from 18 to 60 in your form? You can do it
@@ -225,14 +261,14 @@ overriding the `:collection` option:
 ```erb
 <%= simple_form_for @user do |f| %>
   <%= f.input :user %>
-  <%= f.input :age, :collection => 18..60 %>
+  <%= f.input :age, collection: 18..60 %>
   <%= f.button :submit %>
 <% end %>
 ```
 
 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 **SimpleForm** to Rails set of form
+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).
 
 Collection inputs accept two other options beside collections:
@@ -248,13 +284,13 @@ translation. All other options given are sent straight to the underlying helper.
 can give prompt as:
 
 ```ruby
-f.input :age, :collection => 18..60, :prompt => "Select your age"
+f.input :age, collection: 18..60, prompt: "Select your age"
 ```
 
 It is also possible to create grouped collection selects, that will use the html *optgroup* tags, like this:
 
 ```ruby
-f.input :country_id, :collection => @continents, :as => :grouped_select, :group_method => :countries
+f.input :country_id, collection: @continents, as: :grouped_select, group_method: :countries
 ```
 
 Grouped collection inputs accept the same `:label_method` and `:value_method` options, which will be
@@ -264,17 +300,17 @@ used to retrieve label/value attributes for the `option` tags. Besides that, you
   each group (required)
 
 * _group_label_method_ => the label method to be applied on the given collection to retrieve the label
-  for the _optgroup_ (**SimpleForm** will attempt to guess the best one the same way it does with
+  for the _optgroup_ (**Simple Form** will attempt to guess the best one the same way it does with
   `:label_method`)
 
 ### Priority
 
-**SimpleForm** also supports `:time_zone` and `:country`. When using such helpers, you can give
+**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:
 
 ```ruby
-f.input :residence_country, :priority => [ "Brazil" ]
-f.input :time_zone, :priority => /US/
+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
@@ -284,12 +320,12 @@ Note: While using `country_select` if you want to restrict to only a subset of c
 drop down then you may use the `:collection` option:
 
 ```ruby
-f.input :shipping_country, :priority => [ "Brazil" ], :collection => [ "Australia", "Brazil", "New Zealand"]
+f.input :shipping_country, priority: [ "Brazil" ], collection: [ "Australia", "Brazil", "New Zealand"]
 ```
 
 ### Associations
 
-To deal with associations, **SimpleForm** can generate select inputs, a series of radios buttons or check boxes.
+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
 roles. The structure would be something like:
 
@@ -324,8 +360,8 @@ Simple enough, right? This is going to render a `:select` input for choosing the
 buttons and check boxes as well:
 
 ```ruby
-f.association :company, :as => :radio_buttons
-f.association :roles,   :as => :check_boxes
+f.association :company, as: :radio_buttons
+f.association :roles,   as: :check_boxes
 ```
 
 The association helper just invokes `input` under the hood, so all options available to `:select`,
@@ -333,18 +369,21 @@ The association helper just invokes `input` under the hood, so all options avail
 the collection by hand, all together with the prompt:
 
 ```ruby
-f.association :company, :collection => Company.active.all(:order => 'name'), :prompt => "Choose a Company"
+f.association :company, collection: Company.active.all(order: 'name'), prompt: "Choose a Company"
 ```
 
 In case you want to declare different labels and values:
 
 ```ruby
-f.association :company, :label_method => :company_name, :value_method => :id, :include_blank => false
+f.association :company, label_method: :company_name, value_method: :id, include_blank: false
 ```
 
+Please note that the association helper is currently only tested with Active Record. It currently
+does not work well with Mongoid and depending on the ORM you're using your mileage may vary.
+
 ### Buttons
 
-All web forms need buttons, right? **SimpleForm** wraps them in the DSL, acting like a proxy:
+All web forms need buttons, right? **Simple Form** wraps them in the DSL, acting like a proxy:
 
 ```erb
 <%= simple_form_for @user do |f| %>
@@ -357,12 +396,12 @@ The above will simply call submit. You choose to use it or not, it's just a ques
 
 ### Wrapping Rails Form Helpers
 
-Say you wanted to use a rails form helper but still wrap it in **SimpleForm** goodness? You can, by
+Say you wanted to use a rails form helper but still wrap it in **Simple Form** goodness? You can, by
 calling input with a block like so:
 
 ```erb
 <%= f.input :role do %>
-  <%= f.select :role, Role.all.map { |r| [r.name, r.id, { :class => r.company.id }] }, :include_blank => true %>
+  <%= f.select :role, Role.all.map { |r| [r.name, r.id, { class: r.company.id }] }, include_blank: true %>
 <% end %>
 ```
 
@@ -371,12 +410,12 @@ hash of additional attributes for each option.
 
 ### Extra helpers
 
-**SimpleForm** also comes with some extra helpers you can use inside rails default forms without relying
+**Simple Form** also comes with some extra helpers you can use inside rails default forms without relying
 on `simple_form_for` helper. They are listed below.
 
 #### Simple Fields For
 
-Wrapper to use **SimpleForm** inside a default rails form. It works in the same way that the `field_for`
+Wrapper to use **Simple Form** inside a default rails form. It works in the same way that the `fields_for`
 Rails helper, but change the builder to use the `SimpleForm::FormBuilder`.
 
 ```ruby
@@ -388,7 +427,6 @@ form_for @user do |f|
 end
 ```
 
-
 #### Collection Radio Buttons
 
 Creates a collection of radio inputs with labels associated (same API as `collection_select`):
@@ -435,7 +473,7 @@ end
 
 ## Mappings/Inputs available
 
-**SimpleForm** comes with a lot of default mappings:
+**Simple Form** comes with a lot of default mappings:
 
 ```text
 Mapping               Input                         Column Type
@@ -466,7 +504,7 @@ time_zone             time zone select              string with name matching "t
 
 ## Custom inputs
 
-It is very easy to add custom inputs to **SimpleForm**. For instance, if you want to add a custom input
+It is very easy to add custom inputs to **Simple Form**. For instance, if you want to add a custom input
 that extends the string one, you just need to add this file:
 
 ```ruby
@@ -481,10 +519,10 @@ end
 And use it in your views:
 
 ```ruby
-f.input :money, :as => :currency
+f.input :money, as: :currency
 ```
 
-You can also redefine existing **SimpleForm** inputs by creating a new class with the same name. For
+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:
 
 ```ruby
@@ -509,14 +547,14 @@ end
 
 ## Custom form builder
 
-You can create a custom form builder that uses **SimpleForm**.
+You can create a custom form builder that uses **Simple Form**.
 
 Create a helper method that calls `simple_form_for` with a custom builder:
 
 ```ruby
 def custom_form_for(object, *args, &block)
   options = args.extract_options!
-  simple_form_for(object, *(args << options.merge(:builder => CustomFormBuilder)), &block)
+  simple_form_for(object, *(args << options.merge(builder: CustomFormBuilder)), &block)
 end
 ```
 
@@ -525,7 +563,7 @@ 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'
+    options[:input_html].merge! class: 'custom'
     super
   end
 end
@@ -533,7 +571,7 @@ end
 
 ## I18n
 
-**SimpleForm** 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 and placeholders. To customize your
 forms you can create a locale file like this:
 
 ```yaml
@@ -555,7 +593,7 @@ en:
 
 And your forms will use this information to render the components for you.
 
-**SimpleForm** also lets you be more specific, separating lookups through actions for labels, hints and
+**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
 be something like:
 
@@ -571,7 +609,7 @@ en:
           password: 'Change password'
 ```
 
-This way **SimpleForm** will figure out the right translation for you, based on the action being
+This way **Simple Form** will figure out the right translation for you, based on the action being
 rendered. And to be a little bit DRYer with your locale file, you can specify defaults for all
 models under the 'defaults' key:
 
@@ -594,24 +632,24 @@ en:
         password: '****'
 ```
 
-**SimpleForm** will always look for a default attribute translation under the "defaults" key if no
+**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}".
 
-In addition, **SimpleForm** 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.
 
-**SimpleForm** also has support for translating options in collection helpers. For instance, given a
+**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 **SimpleForm** you could create an input
+that would post either `male` or `female` as value. With **Simple Form** you could create an input
 like this:
 
 ```ruby
-f.input :gender, :collection => [:male, :female]
+f.input :gender, collection: [:male, :female]
 ```
 
-And **SimpleForm** will try a lookup like this in your locale file, to find the right labels to show:
+And **Simple Form** will try a lookup like this in your locale file, to find the right labels to show:
 
 ```yaml
 en:
@@ -624,7 +662,7 @@ en:
 ```
 
 You can also use the `defaults` key as you would do with labels, hints and placeholders. It is
-important to notice that **SimpleForm** will only do the lookup for options if you give a collection
+important to notice that **Simple Form** will only do the lookup for options if you give a collection
 composed of symbols only. This is to avoid constant lookups to I18n.
 
 It's also possible to translate buttons, using Rails' built-in I18n support:
@@ -667,27 +705,27 @@ en:
             name: Name
 ```
 
-This difference exists because **SimpleForm** relies on `object_name` provided by Rails'
+This difference exists because **Simple Form** relies on `object_name` provided by Rails'
 FormBuilder to determine the translation path for a given object instead of `i18n_key` from the
 object itself. Thus, similarly, if a form for an `Admin::User` object is defined by calling
-`simple_form_for @admin_user, :as => :some_user`, **SimpleForm** will look for translations
+`simple_form_for @admin_user, as: :some_user`, **Simple Form** will look for translations
 under `some_user` instead of `admin_user`.
 
 ## Configuration
 
-**SimpleForm** has several configuration options. You can read and change them in the initializer
-created by **SimpleForm**, so if you haven't executed the command below yet, please do:
+**Simple Form** has several configuration options. You can read and change them in the initializer
+created by **Simple Form**, so if you haven't executed the command below yet, please do:
 
 `rails generate simple_form:install`
 
 ### The wrappers API
 
-With **SimpleForm** you can configure how your components will be rendered using the wrappers API.
+With **Simple Form** you can configure how your components will be rendered using the wrappers API.
 The syntax looks like this:
 
 ```ruby
-config.wrappers :tag => :div, :class => :input,
-                :error_class => :field_with_errors do |b|
+config.wrappers tag: :div, class: :input,
+                error_class: :field_with_errors do |b|
 
   # Form extensions
   b.use :html5
@@ -698,12 +736,13 @@ config.wrappers :tag => :div, :class => :input,
 
   # Form components
   b.use :label_input
-  b.use :hint,  :wrap_with => { :tag => :span, :class => :hint }
-  b.use :error, :wrap_with => { :tag => :span, :class => :error }
+  b.use :hint,  wrap_with: { tag: :span, class: :hint }
+  b.use :error, wrap_with: { tag: :span, class: :error }
 end
 ```
 
-The _Form components_ will generate the form tags like labels, inputs, hints or errors contents. The available components are:
+The _Form components_ will generate the form tags like labels, inputs, hints or errors contents.
+The available components are:
 
 ```ruby
 :label         # The <label> tag alone
@@ -722,9 +761,9 @@ You can create new _Form components_ using the wrappers API as in the following
 config.wrappers do |b|
   b.use :placeholder
   b.use :label_input
-  b.wrapper :tag => :div, :class => 'separator' do |component|
-    component.use :hint,  :wrap_with => { :tag => :span, :class => :hint }
-    component.use :error, :wrap_with => { :tag => :span, :class => :error }
+  b.wrapper tag: :div, class: 'separator' do |component|
+    component.use :hint,  wrap_with: { tag: :span, class: :hint }
+    component.use :error, wrap_with: { tag: :span, class: :error }
   end
 end
 ```
@@ -737,9 +776,9 @@ If you want to customize the custom _Form components_ on demand you can give it
 config.wrappers do |b|
   b.use :placeholder
   b.use :label_input
-  b.wrapper :my_wrapper, :tag => :div, :class => 'separator' do |component|
-    component.use :hint,  :wrap_with => { :tag => :span, :class => :hint }
-    component.use :error, :wrap_with => { :tag => :span, :class => :error }
+  b.wrapper :my_wrapper, tag: :div, class: 'separator' do |component|
+    component.use :hint,  wrap_with: { tag: :span, class: :hint }
+    component.use :error, wrap_with: { tag: :span, class: :error }
   end
 end
 ```
@@ -748,13 +787,13 @@ and now you can pass options to your `input` calls to customize the `:my_wrapper
 
 ```ruby
 # Completely turns off the custom wrapper
-f.input :name, :my_wrapper => false
+f.input :name, my_wrapper: false
 
 # Configure the html
-f.input :name, :my_wrapper_html => { :id => 'special_id' }
+f.input :name, my_wrapper_html: { id: 'special_id' }
 
 # Configure the tag
-f.input :name, :my_wrapper_tag => :p
+f.input :name, my_wrapper_tag: :p
 ```
 
 You can also define more than one wrapper and pick one to render in a specific form or input.
@@ -771,37 +810,37 @@ and use it in this way:
 
 ```ruby
 # Specifying to whole form
-simple_form_for @user, :wrapper => :small do |f|
+simple_form_for @user, wrapper: :small do |f|
   f.input :name
 end
 
 # Specifying to one input
 simple_form_for @user do |f|
-  f.input :name, :wrapper => :small
+  f.input :name, wrapper: :small
 end
 ```
 
-**SimpleForm** also allows you to use optional elements. For instance, let's suppose you want to use
+**Simple Form** also allows you to use optional elements. For instance, let's suppose you want to use
 hints or placeholders, but you don't want them to be generated automatically. You can set their
-default values to `false` or use the `optional` method. Is preferible to use the `optional` syntax:
+default values to `false` or use the `optional` method. Is preferable to use the `optional` syntax:
 
 ```ruby
-config.wrappers :placeholder => false do |b|
+config.wrappers placeholder: false do |b|
   b.use :placeholder
   b.use :label_input
-  b.wrapper :tag => :div, :class => 'separator' do |component|
-    component.optional :hint, :wrap_with => { :tag => :span, :class => :hint }
-    component.use :error, :wrap_with => { :tag => :span, :class => :error }
+  b.wrapper tag: :div, class: 'separator' do |component|
+    component.optional :hint, wrap_with: { tag: :span, class: :hint }
+    component.use :error, wrap_with: { tag: :span, class: :error }
   end
 end
 ```
 
-By setting it as `optional`, a hint will only be generated when `:hint => true` is explicitly used.
-The same for placehold.
+By setting it as `optional`, a hint will only be generated when `hint: true` is explicitly used.
+The same for placeholder.
 
 ## HTML 5 Notice
 
-By default, **SimpleForm** will generate input field types and attributes that are supported in HTML5,
+By default, **Simple Form** will generate input field types and attributes that are supported in HTML5,
 but are considered invalid HTML for older document types such as HTML4 or XHTML1.0. The HTML5
 extensions include the new field types such as email, number, search, url, tel, and the new
 attributes such as required, autofocus, maxlength, min, max, step.
@@ -811,7 +850,7 @@ 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 **SimpleForm** with the following configuration:
+It is possible to disable all HTML 5 extensions in **Simple Form** with the following configuration:
 
 ```ruby
 SimpleForm.html5 = false # default is true
@@ -831,14 +870,14 @@ 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 disable the `placeholder` component,
+Please notice that any of the configurations above will not disable the `placeholder` component,
 which is an HTML 5 feature. We believe most of the newest browsers are handling this attribute fine,
 and if they aren't, any plugin you use would take of using the placeholder attribute to do it.
 However, you can disable it if you want, by removing the placeholder component from the components
-list in **SimpleForm** configuration file.
+list in **Simple Form** configuration file.
 
 ## Information
 
@@ -851,11 +890,11 @@ http://groups.google.com/group/plataformatec-simpleform
 
 ### RDocs
 
-You can view the **SimpleForm** documentation in RDoc format here:
+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 **SimpleForm** with Rails 2.3, you can always run `gem server` from the command line
+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
@@ -876,3 +915,6 @@ https://github.com/plataformatec/simple_form/issues
 ## License
 
 MIT License. Copyright 2009-2013 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.