simple_form 2.0.1 → 2.0.2

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 2.0.2
+
+### enhancements
+  * Add `:inline_label` option to nested booleans to display text inline with checkbox.
+  If the value is `true` it uses the default label text. ([@ehoch](https://github.com/ehoch))
+  * Add html support for hints. ([@findrails](https://github.com/findrails))
+
+### bug fix
+  * Fix `min_max` component to not output maximum value. ([@julian7](https://github.com/julian7)).
+  Closes [#483](https://github.com/plataformatec/simple_form/issues/483)
+  * Remove leading and trailing whitespace from `label_text`.
+  Closes [#492](https://github.com/plataformatec/simple_form/issues/492)
+  * Fix checked radio button issue when value is false. ([@georgehemmings](https://github.com/georgehemmings)).
+  * Propagate defaults options to nested forms.
+  Closes [#553](https://github.com/plataformatec/simple_form/issues/533).
+  ([@nashby](https://github.com/nashby))
+  * Fix limit and maxlength with decimal points. ([@shwoodard](https://github.com/shwoodard))
+  * Fix issue when html are duplicated.
+  Closes [#488](https://github.com/plataformatec/simple_form/issues/488).
+  ([@ebonical](https://github.com/ebonical))
+
 ## 2.0.1
 
 ### bug fix

data/MIT-LICENSE

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

data/README.md

@@ -31,13 +31,6 @@ Also, if you want to use the country select, you will need the
 
 `gem 'country_select'`
 
-## 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:
-
-`rails generate simple_form:install`
-
 ### Twitter Bootstrap
 
 **SimpleForm** 2.0 can be easily integrated to the [Twitter Bootstrap](http://twitter.github.com/bootstrap).
@@ -54,117 +47,6 @@ For more information see the generator output, our
 
 **NOTE**: **SimpleForm** integration requires Twitter Bootstrap version 2.0 or higher.
 
-### The wrappers API
-
-With **SimpleForm** 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|
-
-  # Form extensions
-  b.use :html5
-  b.optional :pattern
-  b.use :maxlength
-  b.use :placeholder
-  b.use :readonly
-
-  # Form components
-  b.use :label_input
-  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 _Form extensions_ are used to generate some attributes or perform some lookups on the model to
-add extra information to your components.
-
-You can create new _Form components_ using the wrappers API as in the following example:
-
-```ruby
-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 }
-  end
-end
-```
-
-this will wrap the hint and error components within a `div` tag using the class `'separator'`.
-
-If you want to customize the custom _Form components_ on demand you can give it a name like this:
-
-```ruby
-config.wrappers do |b|
-  b.use :placeholder
-  b.use :label_input
-  b.wrapper :my_wrapper, :tag => :div, :class => 'separator' do |component|
-    component.use :hint,  :wrap_with => { :tag => :span, :class => :hint }
-    component.use :error, :wrap_with => { :tag => :span, :class => :error }
-  end
-end
-```
-
-and now you can pass options to your `input` calls to customize the `:my_wrapper` _Form component_.
-
-```ruby
-# Completely turns off the custom wrapper
-f.input :name, :my_wrapper => false
-
-# Configure the html
-f.input :name, :my_wrapper_html => { :id => 'special_id' }
-
-# Configure the tag
-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.
-To define another wrapper you have to give it a name, as the follow:
-
-```ruby
-config.wrappers :small do |b|
-  b.use :placeholder
-  b.use :label_input
-end
-```
-
-and use it in this way:
-
-```ruby
-# Specifying to whole form
-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
-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:
-
-```ruby
-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 }
-  end
-end
-```
-
-By setting it as `optional`, a hint will only be generated when `:hint => true` is explicitly used.
-The same for placehold.
-
 ## Usage
 
 **SimpleForm** was designed to be customized as you need to. Basically it's a stack of components that
@@ -383,26 +265,7 @@ drop down then you may use the `:collection` option:
 f.input :shipping_country, :priority => [ "Brazil" ], :collection => [ "Australia", "Brazil", "New Zealand"]
 ```
 
-### Wrapper
-
-**SimpleForm** allows you to add a wrapper which contains the label, error, hint and input.
-The first step is to configure a wrapper tag:
-
-```ruby
-SimpleForm.wrapper_tag = :p
-```
-
-And now, you no longer need to wrap your `f.input` calls anymore:
-
-```erb
-<%= simple_form_for @user do |f| %>
-  <%= f.input :username %>
-  <%= f.input :password %>
-  <%= f.button :submit %>
-<% end %>
-```
-
-## Associations
+### Associations
 
 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
@@ -451,7 +314,7 @@ the collection by hand, all together with the prompt:
 f.association :company, :collection => Company.active.all(:order => 'name'), :prompt => "Choose a Company"
 ```
 
-## Buttons
+### Buttons
 
 All web forms need buttons, right? **SimpleForm** wraps them in the DSL, acting like a proxy:
 
@@ -464,7 +327,7 @@ All web forms need buttons, right? **SimpleForm** wraps them in the DSL, acting
 
 The above will simply call submit. You choose to use it or not, it's just a question of taste.
 
-## Wrapping Rails Form Helpers
+### Wrapping Rails Form Helpers
 
 Say you wanted to use a rails form helper but still wrap it in **SimpleForm** goodness? You can, by
 calling input with a block like so:
@@ -478,14 +341,15 @@ calling input with a block like so:
 In the above example, we're taking advantage of Rails 3's select method that allows us to pass in a
 hash of additional attributes for each option.
 
-## Extra helpers
+### Extra helpers
 
 **SimpleForm** 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
+#### Simple Fields For
 
-Wrapper to use SimpleForm inside a default rails form
+Wrapper to use **SimpleForm** inside a default rails form. It works in the same way that the `field_for`
+Rails helper, but change the builder to use the `SimpleForm::FormBuilder`.
 
 ```ruby
 form_for @user do |f|
@@ -496,7 +360,8 @@ form_for @user do |f|
 end
 ```
 
-### Collection Radio Buttons
+
+#### Collection Radio Buttons
 
 Creates a collection of radio inputs with labels associated (same API as `collection_select`):
 
@@ -513,7 +378,7 @@ end
 <label class="collection_radio_buttons" for="user_options_false">No</label>
 ```
 
-### Collection Check Boxes
+#### Collection Check Boxes
 
 Creates a collection of check boxes with labels associated (same API as `collection_select`):
 
@@ -544,7 +409,7 @@ end
 
 **SimpleForm** comes with a lot of default mappings:
 
-```
+```text
 Mapping               Input                         Column Type
 
 boolean               check box                     boolean
@@ -603,6 +468,17 @@ class DateTimeInput < SimpleForm::Inputs::DateTimeInput
 end
 ```
 
+Or if you want to add a class to all the select fields you can do:
+
+```ruby
+# app/inputs/collection_select_input.rb
+class CollectionSelectInput < SimpleForm::Inputs::CollectionSelectInput
+  def input_html_classes
+    super.push('chosen')
+  end
+end
+```
+
 ## Custom form builder
 
 You can create a custom form builder that uses **SimpleForm**.
@@ -738,6 +614,132 @@ There are other options that can be configured through I18n API, such as require
 Be sure to check our locale file or the one copied to your application after you run
 `rails generate simple_form:install`.
 
+## 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:
+
+`rails generate simple_form:install`
+
+### The wrappers API
+
+With **SimpleForm** 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|
+
+  # Form extensions
+  b.use :html5
+  b.optional :pattern
+  b.use :maxlength
+  b.use :placeholder
+  b.use :readonly
+
+  # Form components
+  b.use :label_input
+  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:
+
+```ruby
+:label         # The <label> tag alone
+:input         # The <input> tag alone
+:label_input   # The <label> and the <input> tags
+:hint          # The hint for the input
+:error         # The error for the input
+```
+
+The _Form extensions_ are used to generate some attributes or perform some lookups on the model to
+add extra information to your components.
+
+You can create new _Form components_ using the wrappers API as in the following example:
+
+```ruby
+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 }
+  end
+end
+```
+
+this will wrap the hint and error components within a `div` tag using the class `'separator'`.
+
+If you want to customize the custom _Form components_ on demand you can give it a name like this:
+
+```ruby
+config.wrappers do |b|
+  b.use :placeholder
+  b.use :label_input
+  b.wrapper :my_wrapper, :tag => :div, :class => 'separator' do |component|
+    component.use :hint,  :wrap_with => { :tag => :span, :class => :hint }
+    component.use :error, :wrap_with => { :tag => :span, :class => :error }
+  end
+end
+```
+
+and now you can pass options to your `input` calls to customize the `:my_wrapper` _Form component_.
+
+```ruby
+# Completely turns off the custom wrapper
+f.input :name, :my_wrapper => false
+
+# Configure the html
+f.input :name, :my_wrapper_html => { :id => 'special_id' }
+
+# Configure the tag
+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.
+To define another wrapper you have to give it a name, as the follow:
+
+```ruby
+config.wrappers :small do |b|
+  b.use :placeholder
+  b.use :label_input
+end
+```
+
+and use it in this way:
+
+```ruby
+# Specifying to whole form
+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
+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:
+
+```ruby
+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 }
+  end
+end
+```
+
+By setting it as `optional`, a hint will only be generated when `:hint => true` is explicitly used.
+The same for placehold.
+
 ## HTML 5 Notice
 
 By default, **SimpleForm** will generate input field types and attributes that are supported in HTML5,
@@ -813,4 +815,4 @@ https://github.com/plataformatec/simple_form/issues
 
 ## License
 
-MIT License. Copyright 2012 Plataforma Tecnologia. http://blog.plataformatec.com.br
+MIT License. Copyright 2012 Plataformatec. http://plataformatec.com.br

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

@@ -100,7 +100,9 @@ SimpleForm.setup do |config|
   # Default class for buttons
   config.button_class = 'btn'
 
-  # Method used to tidy up errors.
+  # Method used to tidy up errors. Specify any Rails Array method.
+  # :first lists the first message for each field.
+  # Use :to_sentence to list all errors for each field.
   # config.error_method = :first
 
   # Default tag used for error notification helper.

data/lib/generators/simple_form/templates/config/locales/simple_form.en.yml

@@ -9,16 +9,18 @@ en:
       # When using html, text and mark won't be used.
       # html: '<abbr title="required">*</abbr>'
     error_notification:
-      default_message: "Some errors were found, please take a look:"
+      default_message: "Please review the problems below:"
     # Labels and hints examples
     # labels:
-    #   password: 'Password'
+    #   defaults:
+    #     password: 'Password'
     #   user:
     #     new:
-    #       email: 'E-mail para efetuar o sign in.'
+    #       email: 'E-mail to sign in.'
     #     edit:
     #       email: 'E-mail.'
     # hints:
-    #   username: 'User name to sign in.'
-    #   password: 'No special characters, please.'
+    #   defaults:
+    #     username: 'User name to sign in.'
+    #     password: 'No special characters, please.'
 

data/lib/simple_form/action_view_extensions/builder.rb

@@ -193,7 +193,8 @@ module SimpleForm
       #   end
       def simple_fields_for(*args, &block)
         options = args.extract_options!
-        options[:wrapper] ||= self.options[:wrapper]
+        options[:wrapper]  ||= self.options[:wrapper]
+        options[:defaults] ||= self.options[:defaults]
 
         if self.class < ActionView::Helpers::FormBuilder
           options[:builder] ||= self.class
@@ -216,7 +217,8 @@ module SimpleForm
         html_options = html_options.dup
 
         [:checked, :selected, :disabled].each do |option|
-          next unless current_option = options[option]
+          current_option = options[option]
+          next if current_option.nil?
 
           accept = if current_option.respond_to?(:call)
             current_option.call(item)

data/lib/simple_form/components/hints.rb

@@ -5,7 +5,8 @@ module SimpleForm
       def hint
         @hint ||= begin
           hint = options[:hint]
-          hint.is_a?(String) ? hint : translate(:hints)
+          hint_content = hint.is_a?(String) ? hint : translate(:hints)
+          hint_content.html_safe if hint_content
         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).html_safe
+        SimpleForm.label_text.call(raw_label_text, required_label_text).strip.html_safe
       end
 
       def label_target

data/lib/simple_form/components/min_max.rb

@@ -7,6 +7,7 @@ module SimpleForm
           input_html_options[:min] ||= minimum_value(validator_options)
           input_html_options[:max] ||= maximum_value(validator_options)
         end
+        nil
       end
 
       private

data/lib/simple_form/error_notification.rb

@@ -41,7 +41,7 @@ module SimpleForm
       lookups = []
       lookups << :"#{object_name}"
       lookups << :default_message
-      lookups << "Some errors were found, please take a look:"
+      lookups << "Please review the problems below:"
       I18n.t(lookups.shift, :scope => :"simple_form.error_notification", :default => lookups)
     end
   end

data/lib/simple_form/form_builder.rb

@@ -100,7 +100,7 @@ module SimpleForm
     # == Priority
     #
     # Some inputs, as :time_zone and :country accepts a :priority option. If none is
-    # given SimpleForm.time_zone_priority and SimpleForm.country_priority are used respectivelly.
+    # given SimpleForm.time_zone_priority and SimpleForm.country_priority are used respectively.
     #
     def input(attribute_name, options={}, &block)
       options = @defaults.deep_dup.deep_merge(options) if @defaults

data/lib/simple_form/inputs/base.rb

@@ -48,6 +48,7 @@ module SimpleForm
       def initialize(builder, attribute_name, column, input_type, options = {})
         super
 
+        options             = options.dup
         @builder            = builder
         @attribute_name     = attribute_name
         @column             = column
@@ -86,7 +87,22 @@ module SimpleForm
       end
 
       def limit
-        column && column.limit
+        if column
+          decimal_or_float? ? decimal_limit : column_limit
+        end
+      end
+
+      def column_limit
+        column.limit
+      end
+
+      # Add one for decimal point
+      def decimal_limit
+        column_limit && (column_limit + 1)
+      end
+
+      def decimal_or_float?
+        column.number? && column.type != :integer
       end
 
       def nested_boolean_style?
@@ -100,7 +116,8 @@ module SimpleForm
 
       # Retrieve options for the given namespace from the options hash
       def html_options_for(namespace, css_classes)
-        html_options = options[:"#{namespace}_html"] || {}
+        html_options = options[:"#{namespace}_html"]
+        html_options = html_options ? html_options.dup : {}
         css_classes << html_options[:class] if html_options.key?(:class)
         html_options[:class] = css_classes
         html_options

data/lib/simple_form/inputs/boolean_input.rb

@@ -5,7 +5,7 @@ module SimpleForm
         if nested_boolean_style?
           build_hidden_field_for_checkbox +
             template.label_tag(nil, :class => "checkbox") {
-              build_check_box_without_hidden_field
+              build_check_box_without_hidden_field + inline_label
             }
         else
           build_check_box
@@ -53,6 +53,11 @@ module SimpleForm
                               :disabled => input_html_options[:disabled])
       end
 
+      def inline_label
+        inline_option = options[:inline_label]
+        inline_option == true ? label_text : inline_option
+      end
+
       # Booleans are not required by default because in most of the cases
       # it makes no sense marking them as required. The only exception is
       # Terms of Use usually presented at most sites sign up screen.

data/lib/simple_form/version.rb

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

data/test/action_view_extensions/builder_test.rb

@@ -63,6 +63,12 @@ class BuilderTest < ActionView::TestCase
     assert_select 'form input[type=radio][value=true][checked=checked]'
     assert_no_select 'form input[type=radio][value=false][checked=checked]'
   end
+ 
+  test 'collection radio accepts checked item which has a value of false' do
+    with_collection_radio_buttons @user, :active, [[1, true], [0, false]], :last, :first, :checked => false
+    assert_no_select 'form input[type=radio][value=true][checked=checked]'
+    assert_select 'form input[type=radio][value=false][checked=checked]'
+  end
 
   test 'collection radio accepts multiple disabled items' do
     collection = [[1, true], [0, false], [2, 'other']]