simple_form 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4f641b8e74ebf64e3fb7fe4ebe925c64713eb13
-  data.tar.gz: e74db71fa1d985a906d520673cf82504470c16dd
+  metadata.gz: e0846cac8facbc990fc17731962d98598a2e40ee
+  data.tar.gz: 4e1b4b5645eb07f7273b89b4a50007a6cc72fb82
 SHA512:
-  metadata.gz: bc974c636d805808f4b5fd47e9eec4c656ae53b680113f03eea075dac24a7607c773e1243ceff8201bced0fc849c752def0130efefe5b9d7a24c6e85fc4e176a
-  data.tar.gz: f7a7f67d9ce616e8f7697558ca957cf2701641c0a149eb06b0dab2b60ba17833f432f7bdeeaf29312ff7606acf70971dea86b8ec4f19198ff6420aa7421d646e
+  metadata.gz: 0aeca7d6cf3e6ea92299c4a55f7483e5f9ef3c49fc9497840cb11109eb57872cebc98b71c49669b5334cd8409dae300e40409fae39c0d9f2634060fdf65fb95c
+  data.tar.gz: 7c9fe5310c7403486fbbeeeb2f4633fb9e6987b6c22e663d727e6eacd41f357252a705ac31e5e91cf03575cc053b153f7fa1ff3f31b0545b9ce82ffb34510582

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 2.1.3
+
+### 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
@@ -13,7 +23,7 @@
 ### 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).
+    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).

data/README.md

@@ -35,23 +35,23 @@ Also, if you want to use the country select, you will need the
 gem 'country_select'
 ```
 
-### Twitter Bootstrap
+### Bootstrap
 
-**SimpleForm** 2.0 can be easily integrated to the [Twitter Bootstrap](http://twitter.github.com/bootstrap).
+**Simple Form** can be easily integrated to the [Bootstrap](http://getbootstrap.com/2.3.2/) 2.3.
 To do that you have to use the `bootstrap` option in the install generator, like this:
 
 ```console
 rails generate simple_form:install --bootstrap
 ```
 
-You have to be sure that you added a copy of the [Twitter Bootstrap](http://twitter.github.com/bootstrap)
+You have to be sure that you added a copy of the [Bootstrap](http://getbootstrap.com/2.3.2/)
 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 or higher.
+**NOTE**: **SimpleForm** integration requires Twitter Bootstrap version 2.0 up to 2.3.
 
 ### Zurb Foundation 3
 
@@ -163,6 +163,13 @@ And of course, the `required` property of any input can be overwritten as needed
 <% 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
@@ -176,7 +183,7 @@ And of course, the `required` property of any input can be overwritten as needed
 ```
 
 So instead of a checkbox for the *accepts* attribute, you'll have a pair of radio buttons with yes/no
-labels and a text area instead of a text field for the description. You can also render boolean
+labels and a textarea instead of a text field for the description. You can also render boolean
 attributes using `:as => :select` to show a dropdown.
 
 It is also possible to give the `:disabled` option to **SimpleForm**, and it'll automatically mark
@@ -289,7 +296,7 @@ f.input :shipping_country, :priority => [ "Brazil" ], :collection => [ "Australi
 
 ### Associations
 
-To deal with associations, **SimpleForm** can generate select inputs, a series of radios buttons or check boxes.
+To deal with associations, **SimpleForm** can generate select inputs, a series of radios buttons or checkboxes.
 Lets see how it works: imagine you have a user model that belongs to a company and has_and_belongs_to_many
 roles. The structure would be something like:
 
@@ -321,7 +328,7 @@ Now we have the user form:
 
 Simple enough, right? This is going to render a `:select` input for choosing the `:company`, and another
 `:select` input with `:multiple` option for the `:roles`. You can, of course, change it to use radio
-buttons and check boxes as well:
+buttons and checkboxes as well:
 
 ```ruby
 f.association :company, :as => :radio_buttons
@@ -408,7 +415,7 @@ end
 
 #### Collection Check Boxes
 
-Creates a collection of check boxes with labels associated (same API as `collection_select`):
+Creates a collection of checkboxes with labels associated (same API as `collection_select`):
 
 ```ruby
 form_for @user do |f|
@@ -433,36 +440,36 @@ form_for @user do |f|
 end
 ```
 
-## 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"
-```
+## 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/`
 
 ## Custom inputs
 
@@ -483,6 +490,7 @@ And use it in your views:
 ```ruby
 f.input :money, :as => :currency
 ```
+Note, you may have to create the `app/inputs/` directory and restart your webserver.
 
 You can also redefine existing **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:

data/lib/generators/simple_form/install_generator.rb

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

data/lib/generators/simple_form/templates/README

@@ -1,7 +1,7 @@
 ===============================================================================
 
   Be sure to have a copy of the Bootstrap stylesheet available on your
-  application, you can get it on http://twitter.github.com/bootstrap.
+  application, you can get it on http://getbootstrap.com/2.3.2/.
 
   Inside your views, use the 'simple_form_for' with one of the Bootstrap form
   classes, '.form-horizontal', '.form-inline', '.form-search' or

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

@@ -37,8 +37,8 @@ SimpleForm.setup do |config|
     end
   end
 
-  # Wrappers for forms and inputs using the Twitter Bootstrap toolkit.
-  # Check the Bootstrap docs (http://twitter.github.com/bootstrap)
+  # Wrappers for forms and inputs using the Bootstrap toolkit.
+  # Check the Bootstrap docs (http://getbootstrap.com/2.3.2/)
   # to learn about the different styles for forms and inputs,
   # buttons and other elements.
   config.default_wrapper = :bootstrap

data/lib/simple_form/action_view_extensions/builder.rb

@@ -178,7 +178,8 @@ module SimpleForm
 
         # Append a hidden field to make sure something will be sent back to the
         # server if all checkboxes are unchecked.
-        hidden = @template.hidden_field_tag("#{object_name}[#{attribute}][]", "", :id => nil)
+        hidden_name = html_options[:name] || "#{object_name}[#{attribute}][]"
+        hidden = @template.hidden_field_tag(hidden_name, "", :id => nil)
 
         wrap_rendered_collection(rendered_collection + hidden, options)
       end

data/lib/simple_form/form_builder.rb

@@ -342,7 +342,7 @@ module SimpleForm
     def lookup_model_names
       @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/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 +
@@ -34,7 +35,7 @@ module SimpleForm
       # reuse the method for nested boolean style, but with no unchecked value,
       # which won't generate the hidden checkbox. This is the default functionality
       # in Rails > 3.2.1, and is backported in SimpleForm AV helpers.
-      def build_check_box(unchecked_value = unchecked_value)
+      def build_check_box(unchecked_value = unchecked_value())
         @builder.check_box(attribute_name, input_html_options, checked_value, unchecked_value)
       end
 

data/lib/simple_form/inputs/collection_input.rb

@@ -33,7 +33,7 @@ module SimpleForm
       end
 
       def has_required?
-        super && (input_options[:include_blank] || multiple?)
+        super && (input_options[:include_blank] || input_options[:prompt] || multiple?)
       end
 
       # Check if :include_blank must be included by default.

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "2.1.2".freeze
+  VERSION = "2.1.3".freeze
 end

data/test/action_view_extensions/builder_test.rb

@@ -288,6 +288,13 @@ class BuilderTest < ActionView::TestCase
     assert_select "form input[type=hidden][name='user[tag_ids][]'][value=]", :count => 1
   end
 
+  test "collection check box generates a hidden field using the given :name in :input_html" do
+    collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
+    with_collection_check_boxes @user, :tag_ids, collection, :id, :name, {}, {:name => "user[other_tag_ids][]"}
+
+    assert_select "form input[type=hidden][name='user[other_tag_ids][]'][value=]", :count => 1
+  end
+
   test "collection check box accepts a collection and generate a serie of checkboxes with labels for label method" do
     collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
     with_collection_check_boxes @user, :tag_ids, collection, :id, :name

data/test/form_builder/general_test.rb

@@ -79,6 +79,26 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
+  test 'builder allow to use numbers in the model name' do
+    user = UserNumber1And2.new({
+      :id => 1,
+      :name => 'New in SimpleForm!',
+      :description => 'Hello!',
+      :created_at => Time.now
+    })
+
+    user.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/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_select_input_test.rb

@@ -172,6 +172,12 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_select 'select[required]'
   end
 
+  test 'collection input with select type should generate required html attribute only with blank option or prompt' do
+    with_input_for @user, :name, :select, :prompt => 'Name...', :collection => ['Jose', 'Carlos']
+    assert_select 'select.required'
+    assert_select 'select[required]'
+  end
+
   test 'collection input with select type should not generate required html attribute without blank option' do
     with_input_for @user, :name, :select, :include_blank => false, :collection => ['Jose' , 'Carlos']
     assert_select 'select.required'

data/test/support/models.rb

@@ -214,3 +214,6 @@ class HashBackedAuthor < Hash
     'hash backed author'
   end
 end
+
+class UserNumber1And2 < User
+end

data/test/test_helper.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'test/unit'
-require 'mocha/setup'
+require 'mocha'
 
 require 'active_model'
 require 'action_controller'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - José Valim
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simple_form
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Forms made easy!