simple_form 2.1.3 → 3.0.0.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0846cac8facbc990fc17731962d98598a2e40ee
-  data.tar.gz: 4e1b4b5645eb07f7273b89b4a50007a6cc72fb82
+  metadata.gz: eebdc48d53472ed80e668fd6c2fa30ebf30695a1
+  data.tar.gz: 368a258b70c60fcb73ed568a21f357b39c1fa93f
 SHA512:
-  metadata.gz: 0aeca7d6cf3e6ea92299c4a55f7483e5f9ef3c49fc9497840cb11109eb57872cebc98b71c49669b5334cd8409dae300e40409fae39c0d9f2634060fdf65fb95c
-  data.tar.gz: 7c9fe5310c7403486fbbeeeb2f4633fb9e6987b6c22e663d727e6eacd41f357252a705ac31e5e91cf03575cc053b153f7fa1ff3f31b0545b9ce82ffb34510582
+  metadata.gz: fd1c37c0fffa1d3f3b5a06d19790f37a6aec133ab9d98d792c0c60ba40ea64628085ef8f26ab8f44a50bb17af3b0ee3e8dfdcd6d2997dfea021bc41240c300ed
+  data.tar.gz: ee7024a3684a698d0267fd2469723bfca7775270f064b0e11680cc85891c8d6d235189bd608d636fc551c7d3726b3d8167577ebc49869bc8c6969254c7ee5d00

data/CHANGELOG.md

@@ -1,57 +1,20 @@
-## 2.1.3
+## master
 
-### bug fix
-  * Fix method reflection for Ruby 2.1+. [@badosu](https://github.com/badosu)
-  * Collection input generates `required` attribute if it has `prompt` option. [@nashby](https://github.com/nashby)
-  * Use the given name in `input_html` for the hidden field in `collection_check_boxes` [@angelic](https://github.com/angelic)
-  * 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)
-
-## 2.1.2
-
-### bug fix
-  * Fix XSS vulnerability on error components.
-
-## 2.1.1
+### enhancements
+  * Make `field_error_proc` configurable [@dfens](https://github.com/dfens)
 
 ### bug fix
-  * Fix XSS vulnerability on label, hint and error components.
+  * 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)
 
-## 2.1.0
+## 3.0.0.beta1
 
 ### enhancements
-  * `input_field` supports components that don't generate tags
-    as `:min_max`, `:maxlength`, `:placeholder`, `:pattern`, `:readonly`.
-    Closes [#362](https://github.com/plataformatec/simple_form/issues/632).
-    ([@nashby](https://github.com/nashby))
-  * support for Rails eager loading.
-    Closes [#478](https://github.com/plataformatec/simple_form/issues/478).
-  * generate required attribute for `date_time` input.
-    ([@nashby](https://github.com/nashby))
-    Closes [#730](https://github.com/plataformatec/simple_form/issues/730).
-  * `grouped_collection_select` now accepts proc/lambda as label and value method.
-    ([@svendahlstrand](https://github.com/svendahlstrand))
-    Closes [#623](https://github.com/plataformatec/simple_form/issues/623).
-  * Add Zurb Foundation 3 integration.
-    ([@balexand](https://github.com/balexand))
-  * Generates additional wrapper class based on object + attribute name.
-    ([@lucasmazza](https://github.com/lucasmazza))
-    Closes [#576](https://github.com/plataformatec/simple_form/issues/576).
-  * Allow `input_field` to work with `:defaults` options.
-    ([@smidwap](https://github.com/smidwap))
-
-### bug fix
-  * Do not lookup for hints if it was explicitly given false.
-  After #405 we added hint classes for the wrappers, but this has forced the
-  loading of the hint text doing I18n lookups, even though it was explicitly
-  given false. This checks for the option in `#has_hint?`, avoiding the lookup
-  in such cases. This issues has been caught with #627, thanks to
-  ([@shwoodard](https://github.com/shwoodard)).
-  * Fix default I18n lookup for association input.
-  ([@nashby](https://github.com/nashby))
-  Closes [#679](https://github.com/plataformatec/simple_form/issues/679).
-  * Fix escaping issue in `label_input` component
-  ([@allomov](https://github.com/allomov))
+  * 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)
 
-Please check [v2.0](https://github.com/plataformatec/simple_form/blob/v2.0/CHANGELOG.md) for previous changes.
+Please check [v2.1](https://github.com/plataformatec/simple_form/blob/v2.1/CHANGELOG.md) for previous changes.

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)
+
+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.
 
 **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
 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 **SimpleForm** 3.0. For older releases, check the related branch for your version.
 
 ## Installation
 
@@ -35,23 +43,23 @@ Also, if you want to use the country select, you will need the
 gem 'country_select'
 ```
 
-### Bootstrap
+### Twitter Bootstrap
 
-**Simple Form** can be easily integrated to the [Bootstrap](http://getbootstrap.com/2.3.2/) 2.3.
+**SimpleForm** 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
 rails generate simple_form:install --bootstrap
 ```
 
-You have to be sure that you added a copy of the [Bootstrap](http://getbootstrap.com/2.3.2/)
+You have to be sure that you added a copy of the [Twitter Bootstrap](http://twitter.github.com/bootstrap)
 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**: **SimpleForm** integration requires Twitter Bootstrap version 2.0 up to 2.3.
+**NOTE**: **SimpleForm** integration requires Twitter Bootstrap version 2.0 or higher.
 
 ### Zurb Foundation 3
 
@@ -63,7 +71,7 @@ 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 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
 
@@ -91,10 +99,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 +112,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 +124,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,10 +136,10 @@ 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 %>
 ```
@@ -141,9 +149,9 @@ any html attribute to that wrapper as well using the `:wrapper_html` option, lik
 
 ```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 %>
 ```
@@ -156,35 +164,28 @@ 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 %>
 ```
 
-By default, SimpleForm 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.
-
 **SimpleForm** 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 textarea instead of a text field for the description. You can also render boolean
-attributes using `:as => :select` to show a dropdown.
+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.
 
 It is also possible to give the `:disabled` option to **SimpleForm**, and it'll automatically mark
 the wrapper as disabled with a css class, so you can style labels, hints and other components inside
@@ -192,7 +193,7 @@ 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 %>
 ```
@@ -201,9 +202,9 @@ the wrapper as well:
 
 ```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 %>
 ```
@@ -216,7 +217,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 %>
@@ -224,6 +225,28 @@ the wrapper as well:
 
 Any extra option passed to these methods will be rendered as html option.
 
+### Stripping away all wrapper divs
+
+**SimpleForm** 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:
+
+```erb
+simple_form_for @user do |f|
+  f.input_field :name
+end
+```
+
+Produces:
+
+```erb
+<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
@@ -232,13 +255,13 @@ 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
+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
 helpers (read Extra Helpers session below for more information).
 
@@ -255,13 +278,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
@@ -280,8 +303,8 @@ used to retrieve label/value attributes for the `option` tags. Besides that, you
 `: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
@@ -291,12 +314,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 checkboxes.
+To deal with associations, **SimpleForm** 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:
 
@@ -328,11 +351,11 @@ 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 checkboxes as well:
+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`,
@@ -340,13 +363,13 @@ 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
 ```
 
 ### Buttons
@@ -369,7 +392,7 @@ 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 %>
 ```
 
@@ -415,7 +438,7 @@ end
 
 #### Collection Check Boxes
 
-Creates a collection of checkboxes with labels associated (same API as `collection_select`):
+Creates a collection of check boxes with labels associated (same API as `collection_select`):
 
 ```ruby
 form_for @user do |f|
@@ -440,36 +463,36 @@ form_for @user do |f|
 end
 ```
 
-## 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]`                 | -
-     `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`      | `select`                             | `datetime/timestamp`
-     `date`          | `select`                             | `date`
-     `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/`
+## Mappings/Inputs available
+
+**SimpleForm** 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"
+```
 
 ## Custom inputs
 
@@ -488,9 +511,8 @@ end
 And use it in your views:
 
 ```ruby
-f.input :money, :as => :currency
+f.input :money, as: :currency
 ```
-Note, you may have to create the `app/inputs/` directory and restart your webserver.
 
 You can also redefine existing **SimpleForm** 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:
@@ -524,7 +546,7 @@ 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
 ```
 
@@ -533,7 +555,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
@@ -616,7 +638,7 @@ that would post either `male` or `female` as value. With **SimpleForm** you coul
 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:
@@ -678,7 +700,7 @@ en:
 This difference exists because **SimpleForm** 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`, **SimpleForm** will look for translations
 under `some_user` instead of `admin_user`.
 
 ## Configuration
@@ -694,8 +716,8 @@ With **SimpleForm** you can configure how your components will be rendered using
 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
@@ -706,8 +728,8 @@ 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
 ```
 
@@ -730,9 +752,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
 ```
@@ -745,9 +767,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
 ```
@@ -756,13 +778,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.
@@ -779,33 +801,33 @@ 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
 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
 
@@ -839,7 +861,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 disable the `placeholder` component,
@@ -884,3 +906,5 @@ 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.