simple_form 3.0.0.rc → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eebdc48d53472ed80e668fd6c2fa30ebf30695a1
-  data.tar.gz: 368a258b70c60fcb73ed568a21f357b39c1fa93f
+  metadata.gz: 16a083a7be892436f572b9e055699a94d889d8ca
+  data.tar.gz: 5240794b73edefddc037c5a528f3a5eb362fb7bc
 SHA512:
-  metadata.gz: fd1c37c0fffa1d3f3b5a06d19790f37a6aec133ab9d98d792c0c60ba40ea64628085ef8f26ab8f44a50bb17af3b0ee3e8dfdcd6d2997dfea021bc41240c300ed
-  data.tar.gz: ee7024a3684a698d0267fd2469723bfca7775270f064b0e11680cc85891c8d6d235189bd608d636fc551c7d3726b3d8167577ebc49869bc8c6969254c7ee5d00
+  metadata.gz: 54cfce6263962c3918d36467a0681dc31e48262a777110c2e05ebf4f8daa8bf2ce8c0dec773c9cf37d60af34f424936d09766e34ccb98572780c0f877d9051b8
+  data.tar.gz: 70d460b6f6f5467aa84b599ffc5e1cdbb59b6b581d5cc51ac064c2f2100b1ed70f1550073db7ca3670a4955a2a33a49657b81a3c70b6e3bdccef1a0ab88227e4

data/CHANGELOG.md

@@ -1,20 +1,32 @@
-## master
-
-### enhancements
-  * Make `field_error_proc` configurable [@dfens](https://github.com/dfens)
+## 3.0.1
 
 ### bug fix
-  * 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)
+  * Fix XSS vulnerability on label, hint and error components.
 
-## 3.0.0.beta1
+## 3.0.0
 
 ### 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)
+
 Please check [v2.1](https://github.com/plataformatec/simple_form/blob/v2.1/CHANGELOG.md) for previous changes.

data/README.md

@@ -8,13 +8,13 @@ By [Plataformatec](http://plataformatec.com.br/).
 
 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
+**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 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.
+and refers to **Simple Form** 3.0. For older releases, check the related branch for your version.
 
 ## Installation
 
@@ -45,7 +45,7 @@ gem 'country_select'
 
 ### Twitter Bootstrap
 
-**SimpleForm** 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
@@ -59,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/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| %>
@@ -144,7 +147,7 @@ overwrite the defaults:
 <% 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
@@ -158,7 +161,9 @@ any html attribute to that wrapper as well using the `:wrapper_html` option, lik
 
 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:
 
@@ -171,7 +176,7 @@ And of course, the `required` property of any input can be overwritten as needed
 <% 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| %>
@@ -187,7 +192,7 @@ So instead of a checkbox for the *accepts* attribute, you'll have a pair of radi
 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
+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:
 
@@ -198,7 +203,7 @@ the wrapper as well:
 <% 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| %>
@@ -209,7 +214,7 @@ the wrapper as well:
 <% 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
@@ -227,12 +232,13 @@ 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`.
+**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:
 
-```erb
+```ruby
 simple_form_for @user do |f|
   f.input_field :name
 end
@@ -240,7 +246,7 @@ end
 
 Produces:
 
-```erb
+```html
 <input class="string required" id="user_name" maxlength="100"
    name="user[name]" size="100" type="text" value="Carlos" />
 ```
@@ -262,7 +268,7 @@ 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 **SimpleForm** to Rails set of form
+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:
@@ -294,12 +300,12 @@ 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
@@ -319,7 +325,7 @@ f.input :shipping_country, priority: [ "Brazil" ], collection: [ "Australia", "B
 
 ### 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:
 
@@ -372,9 +378,12 @@ In case you want to declare different labels and values:
 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| %>
@@ -387,7 +396,7 @@ 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
@@ -401,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
@@ -418,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`):
@@ -465,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
@@ -496,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
@@ -514,7 +522,7 @@ And use it in your views:
 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
@@ -539,7 +547,7 @@ 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:
 
@@ -563,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
@@ -585,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:
 
@@ -601,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:
 
@@ -624,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]
 ```
 
-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:
@@ -654,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:
@@ -697,22 +705,22 @@ 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
@@ -733,7 +741,8 @@ config.wrappers tag: :div, class: :input,
 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
@@ -811,7 +820,7 @@ simple_form_for @user do |f|
 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 preferable to use the `optional` syntax:
 
@@ -831,7 +840,7 @@ 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.
@@ -841,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
@@ -864,11 +873,11 @@ You can also add `novalidate` to a specific form by setting the option on the fo
 <%= 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
 
@@ -881,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
@@ -907,4 +916,5 @@ https://github.com/plataformatec/simple_form/issues
 
 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.
+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/templates/config/initializers/simple_form.rb

@@ -139,4 +139,7 @@ SimpleForm.setup do |config|
 
   # Cache SimpleForm inputs discovery
   # config.cache_discovery = !Rails.env.development?
+
+  # Default class for inputs
+  # config.input_class = nil
 end

data/lib/simple_form/components/errors.rb

@@ -12,7 +12,7 @@ module SimpleForm
       protected
 
       def error_text
-        "#{options[:error_prefix]} #{errors.send(error_method)}".lstrip.html_safe
+        "#{html_escape(options[:error_prefix])} #{errors.send(error_method)}".lstrip.html_safe
       end
 
       def error_method

data/lib/simple_form/components/hints.rb

@@ -5,8 +5,13 @@ module SimpleForm
       def hint
         @hint ||= begin
           hint = options[:hint]
-          hint_content = hint.is_a?(String) ? hint : translate(:hints)
-          hint_content.html_safe if hint_content
+
+          if hint.is_a?(String)
+            html_escape(hint)
+          else
+            content = translate(:hints)
+            content.html_safe if content
+          end
         end
       end
 

data/lib/simple_form/components/labels.rb

@@ -30,7 +30,7 @@ module SimpleForm
       end
 
       def label_text
-        SimpleForm.label_text.call(raw_label_text, required_label_text).strip.html_safe
+        SimpleForm.label_text.call(html_escape(raw_label_text), required_label_text).strip.html_safe
       end
 
       def label_target

data/lib/simple_form/form_builder.rb

@@ -12,6 +12,8 @@ module SimpleForm
       update: :edit
     }
 
+    ATTRIBUTE_COMPONENTS = [:html5, :min_max, :maxlength, :placeholder, :pattern, :readonly]
+
     extend MapType
     include SimpleForm::Inputs
 
@@ -135,10 +137,10 @@ module SimpleForm
     #
     def input_field(attribute_name, options={})
       options = options.dup
-      options[:input_html] = options.except(:as, :collection, :label_method, :value_method)
+      options[:input_html] = options.except(:as, :collection, :label_method, :value_method, *ATTRIBUTE_COMPONENTS)
       options = @defaults.deep_dup.deep_merge(options) if @defaults
 
-      SimpleForm::Wrappers::Root.new([:min_max, :maxlength, :placeholder, :pattern, :readonly, :input], wrapper: false).render find_input(attribute_name, options)
+      SimpleForm::Wrappers::Root.new(ATTRIBUTE_COMPONENTS + [:input], wrapper: false).render find_input(attribute_name, options)
     end
 
     # Helper for dealing with association selects/radios, generating the
@@ -167,6 +169,8 @@ module SimpleForm
     #
     # From the options above, only :collection can also be supplied.
     #
+    # Please note that the association helper is currently only tested with Active Record. Depending on the ORM you are using your mileage may vary.
+    #
     def association(association, options={}, &block)
       options = options.dup
 
@@ -180,7 +184,9 @@ module SimpleForm
 
       options[:as] ||= :select
       options[:collection] ||= options.fetch(:collection) {
-        reflection.klass.where(reflection.options[:conditions]).order(reflection.options[:order]).to_a
+        conditions = reflection.options[:conditions]
+        conditions = conditions.call if conditions.respond_to?(:call)
+        reflection.klass.where(conditions).order(reflection.options[:order])
       }
 
       attribute = case reflection.macro
@@ -446,7 +452,7 @@ module SimpleForm
     def lookup_model_names #:nodoc:
       @lookup_model_names ||= begin
         child_index = options[:child_index]
-        names = object_name.to_s.scan(/([a-zA-Z_]+)/).flatten
+        names = object_name.to_s.scan(/(?!\d)\w+/).flatten
         names.delete(child_index) if child_index
         names.each { |name| name.gsub!('_attributes', '') }
         names.freeze

data/lib/simple_form/inputs/base.rb

@@ -1,8 +1,11 @@
 require 'simple_form/i18n_cache'
+require 'active_support/core_ext/string/output_safety'
 
 module SimpleForm
   module Inputs
     class Base
+      include ERB::Util
+
       extend I18nCache
 
       include SimpleForm::Helpers::Autofocus
@@ -65,6 +68,10 @@ module SimpleForm
         @html_classes = SimpleForm.additional_classes_for(:input) { additional_classes }
 
         @input_html_classes = @html_classes.dup
+        if SimpleForm.input_class && !input_html_classes.empty?
+          input_html_classes << SimpleForm.input_class
+        end
+
         @input_html_options = html_options_for(:input, input_html_classes).tap do |o|
           o[:readonly]  = true if has_readonly?
           o[:disabled]  = true if has_disabled?

data/lib/simple_form/inputs/boolean_input.rb

@@ -17,6 +17,7 @@ module SimpleForm
           input
         elsif nested_boolean_style?
           html_options = label_html_options.dup
+          html_options[:class] ||= []
           html_options[:class].push(:checkbox)
 
           build_hidden_field_for_checkbox +

data/lib/simple_form/inputs/collection_input.rb

@@ -66,7 +66,7 @@ module SimpleForm
         collection_translated = translate_collection if collection_classes == [Symbol]
 
         if collection_translated || collection_classes.include?(Array)
-          { label: :first, value: :last }
+          { label: :first, value: :second }
         elsif collection_includes_basic_objects?(collection_classes)
           { label: :to_s, value: :to_s }
         else

data/lib/simple_form/inputs/date_time_input.rb

@@ -11,7 +11,7 @@ module SimpleForm
         position = case input_type
         when :date, :datetime
           date_order = input_options[:order] || I18n.t('date.order')
-          date_order.first
+          date_order.first.to_sym
         else
           :hour
         end

data/lib/simple_form/tags.rb

@@ -11,8 +11,9 @@ module SimpleForm
           value = value_for_collection(item, @value_method)
           text  = value_for_collection(item, @text_method)
           default_html_options = default_html_options_for_collection(item, value)
+          additional_html_options = option_html_attributes(item)
 
-          rendered_item = yield item, value, text, default_html_options
+          rendered_item = yield item, value, text, default_html_options.merge(additional_html_options)
 
           item_wrapper_tag ? @template_object.content_tag(item_wrapper_tag, rendered_item, class: item_wrapper_class) : rendered_item
         end.join.html_safe

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "3.0.0.rc".freeze
+  VERSION = "3.0.1".freeze
 end

data/lib/simple_form.rb

@@ -147,6 +147,10 @@ module SimpleForm
     html_tag
   end
 
+  # Adds a class to each generated inputs
+  mattr_accessor :input_class
+  @@input_class = nil
+
   ## WRAPPER CONFIGURATION
   # The default wrapper to be used by the FormBuilder.
   mattr_accessor :default_wrapper

data/test/action_view_extensions/builder_test.rb

@@ -49,8 +49,7 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection radio checks the correct value to local variables" do
-    user = User.new
-    user.active = false
+    user = User.build(active: false)
     with_collection_radio_buttons user, :active, [true, false], :to_s, :to_s
 
     assert_select 'form input[type=radio][value=true]'
@@ -297,9 +296,9 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection check box checks the correct value to local variables" do
-    user = User.new
-    user.tag_ids = [1, 3]
+    user = User.build(tag_ids: [1, 3])
     collection = (1..3).map { |i| [i, "Tag #{i}"] }
+
     with_collection_check_boxes user, :tag_ids, collection, :first, :last
 
     assert_select 'form input[type=checkbox][value=1][checked=checked]'

data/test/form_builder/association_test.rb

@@ -105,6 +105,14 @@ class AssociationTest < ActionView::TestCase
     assert_select 'form input.radio_buttons#user_company_id_3'
   end
 
+  test 'builder allows collection to have a proc as a condition' do
+    with_association_for @user, :extra_special_company
+    assert_select 'form select.select#user_extra_special_company_id'
+    assert_select 'form select option[value=1]'
+    assert_no_select 'form select option[value=2]'
+    assert_no_select 'form select option[value=3]'
+  end
+
   test 'builder marks the record which already belongs to the user' do
     @user.company_id = 2
     with_association_for @user, :company, as: :radio_buttons

data/test/form_builder/error_test.rb

@@ -80,8 +80,13 @@ class ErrorTest < ActionView::TestCase
     assert_no_select 'p.error[error_method]'
   end
 
-  test 'error should generate an error message with raw HTML tags' do
+  test 'error should escape error prefix text' do
     with_error_for @user, :name, error_prefix: '<b>Name</b>'
+    assert_select 'span.error', "&lt;b&gt;Name&lt;/b&gt; can't be blank"
+  end
+
+  test 'error should generate an error message with raw HTML tags' do
+    with_error_for @user, :name, error_prefix: '<b>Name</b>'.html_safe
     assert_select 'span.error', "Name can't be blank"
     assert_select 'span.error b', "Name"
   end

data/test/form_builder/general_test.rb

@@ -87,6 +87,19 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
+  test 'builder allow to use numbers in the model name' do
+    user = UserNumber1And2.build(tags: [Tag.new(nil, 'Tag1')])
+
+    with_concat_form_for(user, url: '/') do |f|
+      f.simple_fields_for(:tags) do |tags|
+        tags.input :name
+      end
+    end
+
+    assert_select 'form .user_number1_and2_tags_name'
+    assert_no_select 'form .user_number1_and2_tags_1_name'
+  end
+
   # INPUT TYPES
   test 'builder should generate text fields for string columns' do
     with_form_for @user, :name

data/test/form_builder/hint_test.rb

@@ -43,8 +43,14 @@ class HintTest < ActionView::TestCase
   end
 
   test 'hint should be output as html_safe' do
-    with_hint_for @user, :name, hint: '<b>Bold</b> and not...'
+    with_hint_for @user, :name, hint: '<b>Bold</b> and not...'.html_safe
     assert_select 'span.hint', 'Bold and not...'
+    assert_select 'span.hint b', 'Bold'
+  end
+
+  test 'builder should escape hint text' do
+    with_hint_for @user, :name, hint: '<script>alert(1337)</script>'
+    assert_select 'span.hint', "&lt;script&gt;alert(1337)&lt;/script&gt;"
   end
 
   # Without attribute name
@@ -132,7 +138,7 @@ class HintTest < ActionView::TestCase
   test 'hint with custom wrappers works' do
     swap_wrapper do
       with_hint_for @user, :name, hint: "can't be blank"
-      assert_select 'div.omg_hint', "can't be blank"
+      assert_select 'div.omg_hint', "can&#39;t be blank"
     end
   end
 end

data/test/form_builder/input_field_test.rb

@@ -21,6 +21,23 @@ class InputFieldTest < ActionView::TestCase
     assert_select 'textarea#user_name.text'
   end
 
+  test 'builder input_field should generate input type based on column type' do
+    with_concat_form_for(@user) do |f|
+      f.input_field :age
+    end
+
+    assert_select 'input[type=number].integer#user_age'
+  end
+
+  test 'builder input_field should be able to disable any component' do
+    with_concat_form_for(@user) do |f|
+      f.input_field :age, html5: false
+    end
+
+    assert_no_select 'input[html5=false]#user_age'
+    assert_select 'input[type=text].integer#user_age'
+  end
+
   test 'builder input_field should allow passing options to input tag' do
     with_concat_form_for(@user) do |f|
       f.input_field :name, id: 'name_input', class: 'name'

data/test/form_builder/label_test.rb

@@ -19,7 +19,7 @@ class LabelTest < ActionView::TestCase
     assert_no_select 'label[as=boolean]'
   end
 
-  test 'builder should generate a label componet tag with a clean HTML' do
+  test 'builder should generate a label component tag with a clean HTML' do
     with_label_for @user, :name
     assert_no_select 'label.string[label_html]'
   end
@@ -29,6 +29,16 @@ class LabelTest < ActionView::TestCase
     assert_select 'label.string.required[for=validating_user_name]', /Name/
   end
 
+  test 'builder should escape label text' do
+    with_label_for @user, :name, label: '<script>alert(1337)</script>', required: false
+    assert_select 'label.string', "&lt;script&gt;alert(1337)&lt;/script&gt;"
+  end
+
+  test 'builder should not escape label text if it is safe' do
+    with_label_for @user, :name, label: '<script>alert(1337)</script>'.html_safe, required: false
+    assert_select 'label.string script', "alert(1337)"
+  end
+
   test 'builder should allow passing options to label tag' do
     with_label_for @user, :name, label: 'My label', id: 'name_label'
     assert_select 'label.string#name_label', /My label/

data/test/inputs/boolean_input_test.rb

@@ -137,4 +137,16 @@ class BooleanInputTest < ActionView::TestCase
       end
     end
   end
+
+  test 'input boolean without additional classes should add "checkbox" class to label' do
+    swap_wrapper :default, self.custom_wrapper_without_top_level do
+      swap SimpleForm, boolean_style: :nested, generate_additional_classes_for: [:input] do
+        with_input_for @user, :active, :boolean
+
+        assert_select 'label'
+        assert_select 'label.checkbox'
+        assert_no_select 'label.boolean'
+      end
+    end
+  end
 end

data/test/inputs/collection_check_boxes_input_test.rb

@@ -60,6 +60,11 @@ class CollectionCheckBoxesInputTest < ActionView::TestCase
     assert_no_select 'form ul'
   end
 
+  test 'input check boxes accepts html options as the last element of collection' do
+    with_input_for @user, :name, :check_boxes, collection: [['Jose', 'jose', class: 'foo']]
+    assert_select 'input.foo[type=checkbox][value=jose]'
+  end
+
   test 'input check boxes wraps the collection in the configured collection wrapper tag' do
     swap SimpleForm, collection_wrapper_tag: :ul do
       with_input_for @user, :active, :check_boxes

data/test/inputs/collection_radio_buttons_input_test.rb

@@ -82,6 +82,11 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     assert_select 'input[type=radio][value=Carlos][checked=checked]'
   end
 
+  test 'input should accept html options as the last element of collection' do
+    with_input_for @user, :name, :radio_buttons, collection: [['Jose', 'jose', class: 'foo']]
+    assert_select 'input.foo[type=radio][value=jose]'
+  end
+
   test 'input should allow using a collection with text/value arrays' do
     with_input_for @user, :name, :radio_buttons, collection: [['Jose', 'jose'], ['Carlos', 'carlos']]
     assert_select 'input[type=radio][value=jose]'

data/test/inputs/collection_select_input_test.rb

@@ -56,6 +56,12 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_select 'select option[selected=selected]', 'Carlos'
   end
 
+  test 'input should accept html options as the last element of collection' do
+    with_input_for @user, :name, :select, collection: [['Jose', class: 'foo']]
+    assert_select 'select.select#user_name'
+    assert_select 'select option.foo', 'Jose'
+  end
+
   test 'input should mark the selected value also when using integers' do
     @user.age = 18
     with_input_for @user, :age, :select, collection: 18..60
@@ -112,7 +118,7 @@ class CollectionSelectInputTest < ActionView::TestCase
   end
 
   test 'input should detect label and value on collections' do
-    users = [ setup_new_user(id: 1, name: "Jose"), setup_new_user(id: 2, name: "Carlos") ]
+    users = [User.build(id: 1, name: "Jose"), User.build(id: 2, name: "Carlos")]
     with_input_for @user, :description, :select, collection: users
     assert_select 'select option[value=1]', 'Jose'
     assert_select 'select option[value=2]', 'Carlos'

data/test/inputs/datetime_input_test.rb

@@ -63,26 +63,26 @@ class DateTimeInputTest < ActionView::TestCase
   end
 
   test 'label should use i18n to get target for date input type' do
-    store_translations(:en, date: { order: [:month, :day, :year] }) do
+    store_translations(:en, date: { order: ['month', 'day', 'year'] }) do
       with_input_for :project, :created_at, :date
       assert_select 'label[for=project_created_at_2i]'
     end
   end
 
   test 'label should use i18n to get target for datetime input type' do
-    store_translations(:en, date: { order: [:month, :day, :year] }) do
+    store_translations(:en, date: { order: ['month', 'day', 'year'] }) do
       with_input_for :project, :created_at, :datetime
       assert_select 'label[for=project_created_at_2i]'
     end
   end
 
   test 'label should use order to get target when date input type' do
-    with_input_for :project, :created_at, :date, order: [:month, :year, :day]
+    with_input_for :project, :created_at, :date, order: ['month', 'year', 'day']
     assert_select 'label[for=project_created_at_2i]'
   end
 
   test 'label should use order to get target when datetime input type' do
-    with_input_for :project, :created_at, :datetime, order: [:month, :year, :day]
+    with_input_for :project, :created_at, :datetime, order: ['month', 'year', 'day']
     assert_select 'label[for=project_created_at_2i]'
   end
 

data/test/inputs/general_test.rb

@@ -20,6 +20,22 @@ class InputTest < ActionView::TestCase
     assert_select 'input.string[autofocus]'
   end
 
+  test 'input accepts input_class configuration' do
+    swap SimpleForm, input_class: :xlarge do
+      with_input_for @user, :name, :string
+      assert_select 'input.xlarge'
+      assert_no_select 'div.xlarge'
+    end
+  end
+
+  test 'input does not add input_class when configured to not generate additional classes for input' do
+    swap SimpleForm, input_class: 'xlarge', generate_additional_classes_for: [:wrapper] do
+      with_input_for @user, :name, :string
+      assert_select 'input'
+      assert_no_select '.xlarge'
+    end
+  end
+
   test 'text input should generate autofocus attribute when autofocus option is true' do
     with_input_for @user, :description, :text, autofocus: true
     assert_select 'textarea.text[autofocus]'

data/test/inputs/grouped_collection_select_input_test.rb

@@ -130,4 +130,17 @@ class GroupedCollectionSelectInputTest < ActionView::TestCase
       end
     end
   end
+
+  test 'grouped collection should accept html options as the last element of collection' do
+    with_input_for @user, :tag_ids, :grouped_select,
+      collection: [['Authors', [['Jose', 'jose', class: 'foo'], ['Carlos', 'carlos', class: 'bar']]]],
+      group_method: :last
+
+    assert_select 'select.grouped_select#user_tag_ids' do
+      assert_select 'optgroup[label=Authors]' do
+        assert_select 'option.foo', 'Jose'
+        assert_select 'option.bar', 'Carlos'
+      end
+    end
+  end
 end

data/test/support/models.rb

@@ -52,7 +52,19 @@ class User
     :description, :created_at, :updated_at, :credit_limit, :password, :url,
     :delivery_time, :born_at, :special_company_id, :country, :tags, :tag_ids,
     :avatar, :home_picture, :email, :status, :residence_country, :phone_number,
-    :post_count, :lock_version, :amount, :attempts, :action, :credit_card, :gender
+    :post_count, :lock_version, :amount, :attempts, :action, :credit_card, :gender,
+    :extra_special_company_id
+
+  def self.build(extra_attributes = {})
+    attributes = {
+      id: 1,
+      name: 'New in SimpleForm!',
+      description: 'Hello!',
+      created_at: Time.now
+    }.merge! extra_attributes
+
+    new attributes
+  end
 
   def initialize(options={})
     @new_record = false
@@ -119,6 +131,8 @@ class User
         Association.new(Company, association, :has_one, {})
       when :special_company
         Association.new(Company, association, :belongs_to, { conditions: { id: 1 } })
+      when :extra_special_company
+        Association.new(Company, association, :belongs_to, { conditions: proc { { id: 1 } } })
     end
   end
 
@@ -215,3 +229,6 @@ class HashBackedAuthor < Hash
     'hash backed author'
   end
 end
+
+class UserNumber1And2 < User
+end

data/test/test_helper.rb

@@ -35,40 +35,27 @@ class ActionView::TestCase
   include SimpleForm::ActionViewExtensions::FormHelper
 
   setup :set_controller
-  setup :setup_new_user
+  setup :setup_users
 
   def set_controller
     @controller = MockController.new
   end
 
-  def setup_new_user(options={})
-    @user = User.new({
-      id: 1,
-      name: 'New in SimpleForm!',
-      description: 'Hello!',
-      created_at: Time.now
-    }.merge(options))
-
-    @validating_user = ValidatingUser.new({
-      id: 1,
-      name: 'New in SimpleForm!',
-      description: 'Hello!',
+  def setup_users(extra_attributes = {})
+    @user = User.build(extra_attributes)
+
+    @validating_user = ValidatingUser.build({
       home_picture: 'Home picture',
-      created_at: Time.now,
       age: 19,
       amount: 15,
       attempts: 1,
       company: [1]
-    }.merge(options))
+    }.merge!(extra_attributes))
 
-    @other_validating_user = OtherValidatingUser.new({
-      id: 1,
-      name: 'New in SimpleForm!',
-      description: 'Hello!',
-      created_at: Time.now,
+    @other_validating_user = OtherValidatingUser.build({
       age: 19,
       company: 1
-    }.merge(options))
+    }.merge!(extra_attributes))
   end
 
   def protect_against_forgery?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc
+  version: 3.0.1
 platform: ruby
 authors:
 - José Valim
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0
     - - <
       - !ruby/object:Gem::Version
         version: '4.1'
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0
     - - <
       - !ruby/object:Gem::Version
         version: '4.1'
@@ -38,7 +38,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0
     - - <
       - !ruby/object:Gem::Version
         version: '4.1'
@@ -48,7 +48,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0
     - - <
       - !ruby/object:Gem::Version
         version: '4.1'
@@ -172,12 +172,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: simple_form
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Forms made easy!