simple_form 3.4.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 534c9396c2be271ccbb32518e9e5026b5ff523e1
-  data.tar.gz: bb8085d4a664110a941f6cd7e732db16f9eef1ec
+SHA256:
+  metadata.gz: 1461390ccbd2b434d67a43a84ada68f255d08bc48a9e23d7734075c8f105b400
+  data.tar.gz: c81c4b918e6f9e467081e8b534273ef8807ef6e508da40077fe4c91b5b85a66f
 SHA512:
-  metadata.gz: d8e81c8af57b65150d3b9a53433c9d9adb3c5d64fa00ae70b1263a33ce05173d2dc65775ab66e91507d1db452e0f59cb254c0b5eb1ca905ec4b95bbc4eb98282
-  data.tar.gz: 249e0e56f352267ab529db921125ac214d6baeb17153278cba26c61951ce31867cf9d94b4188dab9e50457d2e23d6aebabacf29e475b31c8f7c85c382ab318f2
+  metadata.gz: 71d69573ae8125232a436ea4c23115584497647de1a3b5fa996c9c95f78599b3a3e9ff07ce0812cd5370a1e2c0351dc8fdc43bbea30b7f35d6c68213c68a5f84
+  data.tar.gz: dacdc01de808196a155ad1219f913bafff072578ad0bb3c0a9602a9f0377d4359f03e54880dd77a3e27307a35754568064d9dd5dcec95abf8a93f5f0164149a8

data/CHANGELOG.md

@@ -1,5 +1,67 @@
 ## Unreleased
 
+### Enhancements
+* Guess input type more carefully. [@sringling](https://github.com/sringling)
+* Allow custom error on forms without model. [@victorperez](https://github.com/victorperez)
+* Do not support Ruby < 2.3 anymore. [@gssbzn](https://github.com/gssbzn)
+* Add color inout type. [@gssbzn](https://github.com/gssbzn)
+
+### Bug fix
+* Improve disabled option to input_field. [@betelgeuse](https://github.com/betelgeuse)
+* Memoize `input_html_classes` in `SimpleForm::Inputs::Base`. [@RigoTheDev](https://github.com/RigoTheDev)
+* Fix column type citext HTML5 input type bug. [@brucew](https://github.com/brucew)
+* Use form attribute in the nested boolean hidden field when it is given. [@feliperenan](https://github.com/feliperenan)
+
+## 4.0.1
+
+### Bug fix
+* Do not support Rails 4 anymore. [@rafaelfranca](https://github.com/rafaelfranca)
+* Add missing comma. [@vill](https://github.com/vill)
+
+## 4.0.0
+
+### Enhancements
+* Add bootstrap v4.1 generator template. [@m5o](https://github.com/m5o)
+* Add Rails 5.2 support. [@gobijan](https://github.com/gobijan)
+* Add API to register custom components.[@feliperenan](https://github.com/feliperenan)
+* Allow custom errors classes to inputs.[@feliperenan](https://github.com/feliperenan)
+* Remove support from Rails 4.0, 4.1 and 4.2. [@feliperenan](https://github.com/feliperenan)
+* Add support for citext, hstore, json & jsonb column types. [@swrobel](https://github.com/swrobel)
+* Add :valid_class on input wrapper when value is present and valid [@aeberlin](https://github.com/aeberlin), [@m5o](https://github.com/m5o)
+* Allow :valid_class to inputs when value is present and valid. [@m5o](https://github.com/m5o)
+* Allow validation classes on input_field. [@feliperenan](https://github.com/feliperenan)
+* Add basic ActiveStorage support. [@murb](https://github.com/murb)
+
+### Bug fix
+* Fix horizontal form label position, from right to text-right. [@cavpollo](https://github.com/cavpollo)
+* Add base error display alongside existing errors. [@bluefalcon26](https://github.com/bluefalcon26)
+* Silent deprication warning for placeholder_text. [@moofkit](https://github.com/moofkit)
+* Use custom i18n scope for label required html. [@tvdeyen](https://github.com/tvdeyen)
+
+## 3.5.1
+
+### Enhancements
+* Exclude hidden field when unchecked_value: false. [@fschwahn](https://github.com/fschwahn)
+* Add frozen_string_literal magic comment to several files. [@oniofchaos](https://github.com/oniofchaos)
+* Try convert @object to model in case we got decorated object [@timurvafin](https://github.com/timurvafin)
+- From now, if you are using some object that inherits from `SimpleDelegator`, you must implement
+  `def to_model; self; end`. Otherwise, *Simple Form* will convert the decorated object to the model
+  since `SimpleDelegator` will delegate it to the model.
+* Code cleanup [@Fornacula](https://github.com/Fornacula)
+
+### Bug fix
+* Fix error when the scope from association has parameter. [@feliperenan](https://github.com/feliperenan)
+* Only call `where` on associations when they respond to it. [@anicholson](https://github.com/anicholson)
+* require 'action_pack' before using it. [@etagwerker](https://github.com/etagwerker)
+* Check if Rails.env is defined. [@etagwerker](https://github.com/etagwerker)
+* Fix minlength. [@mameier](https://github.com/mameier)
+* Make errors_on_attribute return [] when not present. [@redrick](https://github.com/redrick)
+* Fix boolean inputs in nested style for label non-string. [@feliperenan](https://github.com/feliperenan)
+
+## 3.5.0
+
+* Updated gem dependency to support Rails 5.1.x.
+
 ## 3.4.0
 
 * Removed Ruby 2.4.0 `Integer` unification deprecation warning.

data/README.md

@@ -113,7 +113,7 @@ an error, or even a placeholder. For boolean inputs, you can add an inline label
 <% end %>
 ```
 
-In some cases you may want to disable labels, hints or error. Or you may want to configure the html
+In some cases you may want to disable labels, hints or errors. Or you may want to configure the html
 of any of them:
 
 ```erb
@@ -164,7 +164,7 @@ 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 includes `ActiveModel::Validations` 
+By default all inputs are required. When the form object includes `ActiveModel::Validations`
 (which, for example, happens with Active Record models), fields are required only when there is `presence` validation.
 Otherwise, **Simple Form** will mark fields as optional. For performance reasons, this
 detection is skipped on validations that make use of conditional options, such as `:if` and `:unless`.
@@ -214,7 +214,7 @@ the wrapper as well:
 <% end %>
 ```
 
-**Simple Form** accepts same options as their corresponding input type helper in Rails:
+**Simple Form** inputs accept the same options as their corresponding input type helper in Rails:
 
 ```erb
 <%= simple_form_for @user do |f| %>
@@ -325,8 +325,18 @@ Collection inputs accept two other options beside collections:
 Those methods are useful to manipulate the given collection. Both of these options also accept
 lambda/procs in case you want to calculate the value or label in a special way eg. custom
 translation. You can also define a `to_label` method on your model as **Simple Form** will search for
-and use `:to_label` as a `:label_method` first if it is found. All other options given are sent
-straight to the underlying helper. For example, you can give prompt as:
+and use `:to_label` as a `:label_method` first if it is found. 
+
+By default, **Simple Form** will use the first item from an array as the label and the second one as the value.
+If you want to change this behavior you must make it explicit, like this:
+
+```erb
+<%= simple_form_for @user do |f| %>
+  <%= f.input :gender, as: :radio_buttons, collection: [['0', 'female'], ['1', 'male']], label_method: :second, value_method: :first %>
+<% end %>
+```
+
+All other options given are sent straight to the underlying helper. For example, you can give prompt as:
 
 ```ruby
 f.input :age, collection: 18..60, prompt: "Select your age", selected: 21
@@ -541,31 +551,35 @@ 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]`                 | -
-     `uuid`          | `input[type=text]`                   | `uuid`
-     `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`      | `datetime select`                    | `datetime/timestamp`
-     `date`          | `date select`                        | `date`
-     `time`          | `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/`
+Mapping         | Generated HTML Element               | Database Column Type
+--------------- |--------------------------------------|---------------------
+`boolean`       | `input[type=checkbox]`               | `boolean`
+`string`        | `input[type=text]`                   | `string`
+`citext`        | `input[type=text]`                   | `citext`
+`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]`                 | -
+`uuid`          | `input[type=text]`                   | `uuid`
+`text`          | `textarea`                           | `text`
+`hstore`        | `textarea`                           | `hstore`
+`json`          | `textarea`                           | `json`
+`jsonb`         | `textarea`                           | `jsonb`
+`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`      | `datetime select`                    | `datetime/timestamp`
+`date`          | `date select`                        | `date`
+`time`          | `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
 
@@ -812,7 +826,7 @@ object itself. Thus, similarly, if a form for an `Admin::User` object is defined
 `simple_form_for @admin_user, as: :some_user`, **Simple Form** will look for translations
 under `some_user` instead of `admin_user`.
 
-When translate `simple_fields_for` attributes be sure to use the same name you pass to it, e.g. `simple_fields_for :posts` should be placed under `posts` not `post`:
+When translating `simple_fields_for` attributes be sure to use the same name you pass to it, e.g. `simple_fields_for :posts` should be placed under `posts` not `post`:
 
 ```yaml
 en:
@@ -842,7 +856,8 @@ The syntax looks like this:
 
 ```ruby
 config.wrappers tag: :div, class: :input,
-                error_class: :field_with_errors do |b|
+                error_class: :field_with_errors,
+                valid_class: :field_without_errors do |b|
 
   # Form extensions
   b.use :html5
@@ -891,11 +906,12 @@ You can customize _Form components_ passing options to them:
 
 ```ruby
 config.wrappers do |b|
-  b.use :label_input, class: 'label-input-class'
+  b.use :label_input, class: 'label-input-class', error_class: 'is-invalid', valid_class: 'is-valid'
 end
 ```
 
-This you set the input and label class to `'label-input-class'`.
+This you set the input and label class to `'label-input-class'` and will set the class `'is-invalid'`
+when the input has errors and `'is-valid'` if the input is valid.
 
 If you want to customize the custom _Form components_ on demand you can give it a name like this:
 
@@ -974,6 +990,92 @@ when the content is present.
   end
 ```
 
+## Custom Components
+
+When you use custom wrappers, you might also be looking for a way to add custom components to your 
+wrapper. The default 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
+```
+
+A custom component might be interesting for you if your views look something like this:
+
+```erb
+<%= simple_form_for @blog do |f| %>
+  <div class="row">
+    <div class="span1 number">
+      1
+    </div>
+    <div class="span8">
+      <%= f.input :title %>
+    </div>
+  </div>
+  <div class="row">
+    <div class="span1 number">
+      2
+    </div>
+    <div class="span8">
+      <%= f.input :body, as: :text %>
+    </div>
+  </div>
+<% end %>
+```
+
+A cleaner method to create your views would be:
+
+```erb
+<%= simple_form_for @blog, wrapper: :with_numbers do |f| %>
+  <%= f.input :title, number: 1 %>
+  <%= f.input :body, as: :text, number: 2 %>
+<% end %>
+```
+
+To use the number option on the input, first, tells to Simple Form the place where the components
+will be:
+
+``` ruby
+# config/initializers/simple_form.rb
+Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f }
+```
+
+Create a new component within the path specified above:
+
+```ruby
+# lib/components/numbers_component.rb
+module NumbersComponent
+  # To avoid deprecation warning, you need to make the wrapper_options explicit
+  # even when they won't be used.
+  def number(wrapper_options = nil)
+    @number ||= begin
+      options[:number].to_s.html_safe if options[:number].present?
+    end
+  end
+end
+
+SimpleForm.include_component(NumbersComponent)
+```
+
+Finally, add a new wrapper to the config/initializers/simple_form.rb file:
+
+```ruby
+config.wrappers :with_numbers, tag: 'div', class: 'row', error_class: 'error' do |b|
+  b.use :html5
+  b.use :number, wrap_with: { tag: 'div', class: 'span1 number'}
+  b.wrapper tag: 'div', class: 'span8' do |ba|
+    ba.use :placeholder
+    ba.use :label
+    ba.use :input
+    ba.use :error, wrap_with: { tag: 'span', class: 'help-inline' }
+    ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+end
+```
+
 ## HTML 5 Notice
 
 By default, **Simple Form** will generate input field types and attributes that are supported in HTML5,
@@ -1039,6 +1141,76 @@ by passing the html5 option:
 <%= f.input :expires_at, as: :date, html5: true %>
 ```
 
+### Using non Active Record objects
+
+There are few ways to build forms with objects that don't inherit from Active Record, as 
+follow:
+
+You can include the module `ActiveModel::Model`.
+
+```ruby
+class User
+  include ActiveModel::Model
+
+  attr_accessor :id, :name
+end
+```
+
+If you are using Presenters or Decorators that inherit from `SimpleDelegator` you can delegate 
+it to the model.
+
+```ruby
+class UserPresenter < SimpleDelegator
+  # Without that, Simple Form will consider the user model as the object.
+  def to_model 
+    self 
+  end
+end
+```
+
+You can define all methods required by the helpers.
+
+```ruby
+class User 
+  extend ActiveModel::Naming
+
+  attr_accessor :id, :name
+
+  def to_model
+    self
+  end
+
+  def to_key 
+    id 
+  end
+
+  def persisted? 
+    false 
+  end
+end
+```
+
+If your object doesn't implement those methods, you must make explicit it when you are 
+building the form
+
+```ruby
+class User 
+  attr_accessor :id, :name
+
+  # The only method required to use the f.submit helper.
+  def persisted? 
+    false
+  end
+end
+```
+
+```erb
+<%= simple_form_for(@user, as: :user, method: :post, url: users_path) do |f| %>
+  <%= f.input :name %> 
+  <%= f.submit 'New user' %>
+<% end %>
+```
+
 ## Information
 
 ### Google Group
@@ -1057,7 +1229,7 @@ http://rubydoc.info/github/plataformatec/simple_form/master/frames
 ### Bug reports
 
 If you discover any bugs, feel free to create an issue on GitHub. Please add as much information as
-possible to help us fixing the possible bug. We also encourage you to help even more by forking and
+possible to help us in fixing the potential bug. We also encourage you to help even more by forking and
 sending us a pull request.
 
 https://github.com/plataformatec/simple_form/issues
@@ -1076,7 +1248,7 @@ https://github.com/plataformatec/simple_form/issues
 
 ## License
 
-MIT License. Copyright 2009-2016 Plataformatec. http://plataformatec.com.br
+MIT License. Copyright 2009-2018 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.

data/lib/generators/simple_form/install_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module SimpleForm
   module Generators
     class InstallGenerator < Rails::Generators::Base

data/lib/generators/simple_form/templates/README

@@ -3,9 +3,9 @@
   Be sure to have a copy of the Bootstrap stylesheet available on your
   application, you can get it on http://getbootstrap.com/.
 
-  Inside your views, use the 'simple_form_for' with one of the Bootstrap form
-  classes, '.form-horizontal' or '.form-inline', as the following:
+  Inside your views, use the 'simple_form_for' with the Bootstrap form
+  class, '.form-inline', as the following:
 
-    = simple_form_for(@user, html: { class: 'form-horizontal' }) do |form|
+    = simple_form_for(@user, html: { class: 'form-inline' }) do |form|
 
 ===============================================================================

data/lib/generators/simple_form/templates/_form.html.erb

@@ -1,5 +1,7 @@
+<%# frozen_string_literal: true %>
 <%%= simple_form_for(@<%= singular_table_name %>) do |f| %>
   <%%= f.error_notification %>
+  <%%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
 
   <div class="form-inputs">
   <%- attributes.each do |attribute| -%>

data/lib/generators/simple_form/templates/_form.html.haml

@@ -1,5 +1,7 @@
+-# frozen_string_literal: true
 = simple_form_for(@<%= singular_table_name %>) do |f|
   = f.error_notification
+  = f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present?
 
   .form-inputs
   <%- attributes.each do |attribute| -%>

data/lib/generators/simple_form/templates/_form.html.slim

@@ -1,5 +1,6 @@
 = simple_form_for(@<%= singular_table_name %>) do |f|
   = f.error_notification
+  = f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present?
 
   .form-inputs
 <%- attributes.each do |attribute| -%>

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

@@ -1,3 +1,11 @@
+# frozen_string_literal: true
+#
+# Uncomment this and change the path if necessary to include your own
+# components.
+# See https://github.com/plataformatec/simple_form#custom-components to know
+# more about custom components.
+# Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f }
+#
 # Use this setup block to configure all options available in SimpleForm.
 SimpleForm.setup do |config|
   # Wrappers are used by the form builder to generate a
@@ -6,7 +14,7 @@ SimpleForm.setup do |config|
   # stack. The options given below are used to wrap the
   # whole input.
   config.wrappers :default, class: :input,
-    hint_class: :field_with_hint, error_class: :field_with_errors do |b|
+    hint_class: :field_with_hint, error_class: :field_with_errors, valid_class: :field_without_errors do |b|
     ## Extensions enabled by default
     # Any of these extensions can be disabled for a
     # given input by passing: `f.input EXTENSION_NAME => false`.
@@ -44,6 +52,7 @@ SimpleForm.setup do |config|
     b.optional :readonly
 
     ## Inputs
+    # b.use :input, class: 'input', error_class: 'is-invalid', valid_class: 'is-valid'
     b.use :label_input
     b.use :hint,  wrap_with: { tag: :span, class: :hint }
     b.use :error, wrap_with: { tag: :span, class: :error }
@@ -78,9 +87,6 @@ SimpleForm.setup do |config|
   # CSS class to add for error notification helper.
   config.error_notification_class = 'error_notification'
 
-  # ID to add for error notification helper.
-  # config.error_notification_id = nil
-
   # Series of attempts to detect a default label method for collection.
   # config.collection_label_methods = [ :to_label, :name, :title, :to_s ]
 
@@ -124,7 +130,7 @@ SimpleForm.setup do |config|
   config.browser_validations = false
 
   # Collection of methods to detect if a file type was given.
-  # config.file_methods = [ :mounted_as, :file?, :public_filename ]
+  # config.file_methods = [ :mounted_as, :file?, :public_filename, :attached? ]
 
   # Custom mappings for input types. This should be a hash containing a regexp
   # to match as key, and the input type that will be used when the field name
@@ -166,4 +172,8 @@ SimpleForm.setup do |config|
 
   # Defines which i18n scope will be used in Simple Form.
   # config.i18n_scope = 'simple_form'
+
+  # Defines validation classes to the input_field. By default it's nil.
+  # config.input_field_valid_class = 'is-valid'
+  # config.input_field_error_class = 'is-invalid'
 end