simple_form 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1bfd4d5f14c750caf9e2fa6287033c0331473215737a96b4bcece8e6f84a7a9
-  data.tar.gz: 9c09b014e449f5b8823c062092b864e538c638fd418d782919a9c0a3cd50df78
+  metadata.gz: 8260fa0dbaf1a82ae7b8a5c120c4f26ba4e2f0c03a9821241bf6d2d193962384
+  data.tar.gz: f1ef61699c7246302e31eb405c734816491b1698419bc810643b71c54d7ffb2d
 SHA512:
-  metadata.gz: 620056c8b34f6f93229b2ee0771adb0aa7d267fcc22b9d94c214f62287061930e9b0e35a648f47a890452cb8098bc57643a1dce7bbed3df3c2058546b58c5090
-  data.tar.gz: 4fa4e5a106b9065405fbba77b8a84ed99e86d84ea4a4435d0a459ee0196a020afbec0ec62fcd2c79f8885d771e48700409ae055ea4858d15b2b5ddd9c3fb5168
+  metadata.gz: 31be8f22b6fbe417be6051466e6370c8d54e4667df16c1506a84580df69376daae06af454bb46e21b8b86e61fed6efaf954f45c876005f2b33dde00ad3ca8374
+  data.tar.gz: 756ef0c153e13b61a6d6823f3ea9f615ee507e329effce3c31ca477b85de86c6b0aa7bb645802be3c405281b621777191b1c34efba2cdeceb9035c2dfbb9ce82

data/CHANGELOG.md

@@ -1,4 +1,29 @@
-## Unreleased
+## 5.1.0
+
+* Remove `I18nCache` module entirely. It was added complexity for very little gain in some translations, and caused extra trouble upgrading to Ruby 3. If you need that level of caching consider looking into I18n caching as a whole.
+* Add support for Ruby 3.0, drop support for Ruby < 2.5.
+* Add support for Rails 6.1, drop support for Rails < 5.2.
+* Move CI to GitHub Actions.
+
+## 5.0.3
+
+### Bug fix
+* Fix for ActiveStorage::Attached::Many. [@enriquez](https://github.com/enriquez)
+
+## 5.0.2
+
+### Enhancements
+* Remove instruction to use form-inline class. [@goalaleo](https://github.com/goalaleo)
+* Added RichTextAreaInput for ActionText. [itsterry](https://github.com/itsterry)
+* Skip valid_class check if no class defined. [TALlama](https://github.com/TALlama)
+
+### Bug fix
+* Fix 'aria-required' field generated by prompt. [@CarlosAlbertoSantos](https://github.com/CarlosAlbertoSantos)
+
+## 5.0.1
+
+### Bug fix
+* Replace `_url` with `remote_url` when trying to guess file inputs [@tegon](https://github.com/tegon). This has the side-effect of changing carrierwave's support from `0.2.1` to `0.2.2`.
 
 ## 5.0.0
 
@@ -107,7 +132,7 @@ See http://blog.plataformatec.com.br/2019/09/incorrect-access-control-in-simple-
 
 ### bug fix
   * Fix `merge_wrapper_options` to correctly merge options with duplicated keys. [@herminiotorres](https://github.com/herminiotorres)
-  Closes [#1278](https://github.com/plataformatec/simple_form/issues/1278).
+  Closes [#1278](https://github.com/heartcombo/simple_form/issues/1278).
 
 ## 3.2.1
 
@@ -169,11 +194,11 @@ See http://blog.plataformatec.com.br/2019/09/incorrect-access-control-in-simple-
   * Add `boolean_label_class` config.
   * Add `:html` option to include additional attributes on custom wrappers [@remofritzsche](https://github.com/remofritzsche) and [@ulissesalmeida](https://github.com/ulissesalmeida)
   * Make possible to use the Wrappers API to define attributes for the components.
-  See https://github.com/plataformatec/simple_form/pull/997 for more information.
+  See https://github.com/heartcombo/simple_form/pull/997 for more information.
   * Put a whitespace before the `inline_label` options of boolean input if it is present.
   * Add support to configure the `label_text` proc at the wrapper level. [@NOX73](https://github.com/NOX73)
   * `label_text` proc now receive three arguments (label, request, and if the label was explicit). [@timscott](https://github.com/timscott)
-  * Add I18n support to `:include_blank` and `:prompt` when `:translate` is used as value. [@haines](https://github.com/plataformatec/simple_form/pull/616)
+  * Add I18n support to `:include_blank` and `:prompt` when `:translate` is used as value. [@haines](https://github.com/heartcombo/simple_form/pull/616)
   * Add support to define custom error messages for the attributes.
   * Add support to change the I18n scope to be used in Simple Form. [@nielsbuus](https://github.com/nielsbuus)
   * The default form class can now be overridden with `html: { :class }`. [@rmm5t](https://github.com/rmm5t)
@@ -182,16 +207,16 @@ See http://blog.plataformatec.com.br/2019/09/incorrect-access-control-in-simple-
   * Fix `full_error` when the attribute is an association. [@mvdamme](https://github.com/jorge-d)
   * Fix suppport to `:namespace` and `:index` options for nested check boxes and radio buttons when the attribute is an association.
   * Collection input that uses automatic collection translation properly sets checked values.
-  Closes [#971](https://github.com/plataformatec/simple_form/issues/971) [@nashby](https://github.com/nashby)
+  Closes [#971](https://github.com/heartcombo/simple_form/issues/971) [@nashby](https://github.com/nashby)
   * Collection input generates `required` attribute if it has `prompt` option. [@nashby](https://github.com/nashby)
   * Grouped collection uses the first non-empty object to detect label and value methods.
 
 ## deprecation
   * Methods on custom inputs now accept a required argument with the wrapper options.
-  See https://github.com/plataformatec/simple_form/pull/997 for more information.
+  See https://github.com/heartcombo/simple_form/pull/997 for more information.
   * SimpleForm.form_class is deprecated in favor of SimpleForm.default_form_class.
   Future versions of Simple Form will not generate `simple_form` class for the form
   element.
-  See https://github.com/plataformatec/simple_form/pull/1109 for more information.
+  See https://github.com/heartcombo/simple_form/pull/1109 for more information.
 
-Please check [v3.0](https://github.com/plataformatec/simple_form/blob/v3.0/CHANGELOG.md) for previous changes.
+Please check [v3.0](https://github.com/heartcombo/simple_form/blob/v3.0/CHANGELOG.md) for previous changes.

data/MIT-LICENSE

@@ -1,4 +1,5 @@
-Copyright (c) 2009-2019 Plataformatec http://plataformatec.com.br/
+Copyright (c) 2020 Rafael França, Carlos Antônio da Silva
+Copyright (c) 2009-2019 Plataformatec
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,6 +1,4 @@
-![Simple Form Logo](https://raw.github.com/plataformatec/simple_form/master/simple_form.png)
-
-By [Plataformatec](http://plataformatec.com.br/).
+![Simple Form Logo](https://raw.github.com/heartcombo/simple_form/master/simple_form.png)
 
 Rails forms made easy.
 
@@ -9,8 +7,7 @@ your forms. The basic goal of **Simple Form** is to not touch your way of defini
 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 **Simple Form** 3.1. For older releases, check the related branch for your version.
+INFO: This README refers to **Simple Form** 5.0. For older releases, check the related branch for your version.
 
 ## Installation
 
@@ -118,7 +115,7 @@ of any of them:
 
 ```erb
 <%= simple_form_for @user do |f| %>
-  <%= f.input :username, label_html: { class: 'my_class' } %>
+  <%= f.input :username, label_html: { class: 'my_class' }, hint_html: { class: 'hint_class' } %>
   <%= f.input :password, hint: false, error_html: { id: 'password_error'} %>
   <%= f.input :password_confirmation, label: false %>
   <%= f.button :submit %>
@@ -184,7 +181,7 @@ By default, **Simple Form** will look at the column type in the database and use
 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)
+type](https://github.com/heartcombo/simple_form#available-input-types-and-defaults-for-each-column-type)
 for a complete list of defaults.
 
 **Simple Form** also lets you overwrite the default input type it creates:
@@ -288,7 +285,7 @@ end
 </form>
 ```
 
-To view the actual RDocs for this, check them out here - http://rubydoc.info/github/plataformatec/simple_form/master/SimpleForm/FormBuilder:input_field
+To view the actual RDocs for this, check them out here - http://rubydoc.info/github/heartcombo/simple_form/master/SimpleForm/FormBuilder:input_field
 
 ### Collections
 
@@ -318,7 +315,7 @@ 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. 
+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:
@@ -541,7 +538,7 @@ end
 To add a CSS class to the label item, you can use the `item_label_class` option:
 
 ```ruby
-f.collection_check_boxes :role_ids, Role.all, :id, :name, item_label_class: 'my-custom-class' 
+f.collection_check_boxes :role_ids, Role.all, :id, :name, item_label_class: 'my-custom-class'
 ```
 
 ## Available input types and defaults for each column type
@@ -561,6 +558,7 @@ Mapping         | Generated HTML Element               | Database Column Type
 `password`      | `input[type=password]`               | `string` with `name =~ /password/`
 `search`        | `input[type=search]`                 | -
 `uuid`          | `input[type=text]`                   | `uuid`
+`color`         | `input[type=color]`                  | `string`
 `text`          | `textarea`                           | `text`
 `hstore`        | `textarea`                           | `hstore`
 `json`          | `textarea`                           | `json`
@@ -991,7 +989,7 @@ when the content is present.
 
 ## Custom Components
 
-When you use custom wrappers, you might also be looking for a way to add custom components to your 
+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
@@ -1142,7 +1140,7 @@ by passing the html5 option:
 
 ### Using non Active Record objects
 
-There are few ways to build forms with objects that don't inherit from Active Record, as 
+There are few ways to build forms with objects that don't inherit from Active Record, as
 follows:
 
 You can include the module `ActiveModel::Model`.
@@ -1155,14 +1153,14 @@ class User
 end
 ```
 
-If you are using Presenters or Decorators that inherit from `SimpleDelegator` you can delegate 
+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 
+  def to_model
+    self
   end
 end
 ```
@@ -1170,7 +1168,7 @@ end
 You can define all methods required by the helpers.
 
 ```ruby
-class User 
+class User
   extend ActiveModel::Naming
 
   attr_accessor :id, :name
@@ -1179,25 +1177,25 @@ class User
     self
   end
 
-  def to_key 
-    id 
+  def to_key
+    id
   end
 
-  def persisted? 
-    false 
+  def persisted?
+    false
   end
 end
 ```
 
-If your object doesn't implement those methods, you must make explicit it when you are 
+If your object doesn't implement those methods, you must make explicit it when you are
 building the form
 
 ```ruby
-class User 
+class User
   attr_accessor :id, :name
 
   # The only method required to use the f.submit helper.
-  def persisted? 
+  def persisted?
     false
   end
 end
@@ -1205,25 +1203,25 @@ end
 
 ```erb
 <%= simple_form_for(@user, as: :user, method: :post, url: users_path) do |f| %>
-  <%= f.input :name %> 
+  <%= f.input :name %>
   <%= f.submit 'New user' %>
 <% end %>
 ```
 
 ## Information
 
-### Google Group
+### RDocs
 
-If you have any questions, comments, or concerns please use the Google Group instead of the GitHub
-Issues tracker:
+You can view the **Simple Form** documentation in RDoc format here:
 
-http://groups.google.com/group/plataformatec-simpleform
+http://rubydoc.info/github/heartcombo/simple_form/master/frames
 
-### RDocs
+### Supported Ruby / Rails versions
 
-You can view the **Simple Form** documentation in RDoc format here:
+We intend to maintain support for all Ruby / Rails versions that haven't reached end-of-life.
 
-http://rubydoc.info/github/plataformatec/simple_form/master/frames
+For more information about specific versions please check [Ruby](https://www.ruby-lang.org/en/downloads/branches/)
+and [Rails](https://guides.rubyonrails.org/maintenance_policy.html) maintenance policies, and our test matrix.
 
 ### Bug reports
 
@@ -1231,23 +1229,22 @@ If you discover any bugs, feel free to create an issue on GitHub. Please add as
 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
+https://github.com/heartcombo/simple_form/issues
+
+If you have discovered a security related bug, please do NOT use the GitHub issue tracker. Send an e-mail to heartcombo@googlegroups.com.
 
 ## Maintainers
 
-* José Valim (https://github.com/josevalim)
 * Carlos Antonio da Silva (https://github.com/carlosantoniodasilva)
 * Rafael Mendonça França (https://github.com/rafaelfranca)
-* Vasiliy Ermolovich (https://github.com/nashby)
+* Felipe Renan (https://github.com/feliperenan)
 
 [![Gem Version](https://fury-badge.herokuapp.com/rb/simple_form.png)](http://badge.fury.io/rb/simple_form)
-[![Build Status](https://api.travis-ci.org/plataformatec/simple_form.svg?branch=master)](http://travis-ci.org/plataformatec/simple_form)
-[![Code Climate](https://codeclimate.com/github/plataformatec/simple_form.png)](https://codeclimate.com/github/plataformatec/simple_form)
-[![Inline docs](http://inch-ci.org/github/plataformatec/simple_form.png)](http://inch-ci.org/github/plataformatec/simple_form)
+[![Code Climate](https://codeclimate.com/github/heartcombo/simple_form.png)](https://codeclimate.com/github/heartcombo/simple_form)
+[![Inline docs](http://inch-ci.org/github/heartcombo/simple_form.png)](http://inch-ci.org/github/heartcombo/simple_form)
 
 ## License
 
-MIT License. Copyright 2009-2019 Plataformatec. http://plataformatec.com.br
+MIT License. Copyright 2020 Rafael França, Carlos Antônio da Silva. Copyright 2009-2019 Plataformatec.
 
-You are not granted rights or licenses to the trademarks of the Plataformatec, including without
-limitation the Simple Form name or logo.
+The Simple Form logo is licensed under [Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License](https://creativecommons.org/licenses/by-nc-nd/4.0/).

data/lib/generators/simple_form/templates/README

@@ -3,9 +3,8 @@
   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 the Bootstrap form
-  class, '.form-inline', as the following:
+  For usage examples and documentation, see:
 
-    = simple_form_for(@user, html: { class: 'form-inline' }) do |form|
+    http://simple-form-bootstrap.plataformatec.com.br/
 
 ===============================================================================

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

@@ -2,7 +2,7 @@
 #
 # Uncomment this and change the path if necessary to include your own
 # components.
-# See https://github.com/plataformatec/simple_form#custom-components to know
+# See https://github.com/heartcombo/simple_form#custom-components to know
 # more about custom components.
 # Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f }
 #

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

@@ -4,11 +4,11 @@
 # This generator is maintained by the community around simple_form-bootstrap:
 # https://github.com/rafaelfranca/simple_form-bootstrap
 # All future development, tests, and organization should happen there.
-# Background history: https://github.com/plataformatec/simple_form/issues/1561
+# Background history: https://github.com/heartcombo/simple_form/issues/1561
 
 # Uncomment this and change the path if necessary to include your own
 # components.
-# See https://github.com/plataformatec/simple_form#custom-components
+# See https://github.com/heartcombo/simple_form#custom-components
 # to know more about custom components.
 # Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f }
 

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

@@ -2,7 +2,7 @@
 #
 # Uncomment this and change the path if necessary to include your own
 # components.
-# See https://github.com/plataformatec/simple_form#custom-components to know
+# See https://github.com/heartcombo/simple_form#custom-components to know
 # more about custom components.
 # Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f }
 #

data/lib/simple_form.rb

@@ -35,7 +35,7 @@ to
 
     def %{name}(wrapper_options)
 
-See https://github.com/plataformatec/simple_form/pull/997 for more information.
+See https://github.com/heartcombo/simple_form/pull/997 for more information.
   WARN
 
   FILE_METHODS_DEPRECATION_WARN = <<-WARN

data/lib/simple_form/components/labels.rb

@@ -6,11 +6,9 @@ module SimpleForm
 
       module ClassMethods #:nodoc:
         def translate_required_html
-          i18n_cache :translate_required_html do
-            I18n.t(:"required.html", scope: i18n_scope, default:
-              %(<abbr title="#{translate_required_text}">#{translate_required_mark}</abbr>)
-            )
-          end
+          I18n.t(:"required.html", scope: i18n_scope, default:
+            %(<abbr title="#{translate_required_text}">#{translate_required_mark}</abbr>)
+          )
         end
 
         def translate_required_text

data/lib/simple_form/components/maxlength.rb

@@ -24,10 +24,6 @@ module SimpleForm
         find_validator(:length)
       end
 
-      def has_tokenizer?(length_validator)
-        length_validator.options[:tokenizer]
-      end
-
       def maximum_length_value_from(length_validator)
         if length_validator
           length_validator.options[:is] || length_validator.options[:maximum]

data/lib/simple_form/components/minlength.rb

@@ -24,10 +24,6 @@ module SimpleForm
         find_validator(:length)
       end
 
-      def has_tokenizer?(length_validator)
-        length_validator.options[:tokenizer]
-      end
-
       def minimum_length_value_from(length_validator)
         if length_validator
           length_validator.options[:is] || length_validator.options[:minimum]

data/lib/simple_form/form_builder.rb

@@ -26,6 +26,7 @@ module SimpleForm
     map_type :range,                                               to: SimpleForm::Inputs::RangeInput
     map_type :check_boxes,                                         to: SimpleForm::Inputs::CollectionCheckBoxesInput
     map_type :radio_buttons,                                       to: SimpleForm::Inputs::CollectionRadioButtonsInput
+    map_type :rich_text_area,                                      to: SimpleForm::Inputs::RichTextAreaInput
     map_type :select,                                              to: SimpleForm::Inputs::CollectionSelectInput
     map_type :grouped_select,                                      to: SimpleForm::Inputs::GroupedCollectionSelectInput
     map_type :date, :time, :datetime,                              to: SimpleForm::Inputs::DateTimeInput
@@ -580,18 +581,18 @@ module SimpleForm
     #
     # Note: This does not support multiple file upload inputs, as this is very application-specific.
     #
-    # The order here was choosen based on the popularity of Gems and for commodity - e.g. the method
-    # with the suffix `_url` is present in three Gems, so it's checked with priority:
+    # The order here was chosen based on the popularity of Gems:
     #
     # - `#{attribute_name}_attachment` - ActiveStorage >= `5.2` and Refile >= `0.2.0` <= `0.4.0`
-    # - `#{attribute_name}_url` - Shrine >= `0.9.0`, Refile >= `0.6.0` and CarrierWave >= `0.2.1`
+    # - `remote_#{attribute_name}_url` - Refile >= `0.3.0` and CarrierWave >= `0.2.2`
     # - `#{attribute_name}_attacher` - Refile >= `0.4.0` and Shrine >= `0.9.0`
     # - `#{attribute_name}_file_name` - Paperclip ~> `2.0` (added for backwards compatibility)
     #
     # Returns a Boolean.
     def file_method?(attribute_name)
       @object.respond_to?("#{attribute_name}_attachment") ||
-        @object.respond_to?("#{attribute_name}_url") ||
+        @object.respond_to?("#{attribute_name}_attachments") ||
+        @object.respond_to?("remote_#{attribute_name}_url") ||
         @object.respond_to?("#{attribute_name}_attacher") ||
         @object.respond_to?("#{attribute_name}_file_name")
     end

data/lib/simple_form/inputs.rb

@@ -19,6 +19,7 @@ module SimpleForm
     autoload :PasswordInput
     autoload :PriorityInput
     autoload :RangeInput
+    autoload :RichTextAreaInput
     autoload :StringInput
     autoload :TextInput
   end

data/lib/simple_form/inputs/base.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'simple_form/i18n_cache'
 require 'active_support/core_ext/string/output_safety'
 require 'action_view/helpers'
 
@@ -9,8 +8,6 @@ module SimpleForm
       include ERB::Util
       include ActionView::Helpers::TranslationHelper
 
-      extend I18nCache
-
       include SimpleForm::Helpers::Autofocus
       include SimpleForm::Helpers::Disabled
       include SimpleForm::Helpers::Readonly

data/lib/simple_form/inputs/collection_check_boxes_input.rb

@@ -5,7 +5,7 @@ module SimpleForm
       protected
 
       # Checkbox components do not use the required html tag.
-      # More info: https://github.com/plataformatec/simple_form/issues/340#issuecomment-2871956
+      # More info: https://github.com/heartcombo/simple_form/issues/340#issuecomment-2871956
       def has_required?
         false
       end

data/lib/simple_form/inputs/collection_input.rb

@@ -10,10 +10,8 @@ module SimpleForm
       # Texts can be translated using i18n in "simple_form.yes" and
       # "simple_form.no" keys. See the example locale file.
       def self.boolean_collection
-        i18n_cache :boolean_collection do
-          [ [I18n.t(:"simple_form.yes", default: 'Yes'), true],
-            [I18n.t(:"simple_form.no", default: 'No'), false] ]
-        end
+        [ [I18n.t(:"simple_form.yes", default: 'Yes'), true],
+          [I18n.t(:"simple_form.no", default: 'No'), false] ]
       end
 
       def input(wrapper_options = nil)
@@ -41,7 +39,7 @@ module SimpleForm
       end
 
       def has_required?
-        super && (input_options[:include_blank] || input_options[:prompt] || multiple?)
+        super && (input_options[:include_blank] || input_options[:prompt].present? || multiple?)
       end
 
       # Check if :include_blank must be included by default.

data/lib/simple_form/inputs/rich_text_area_input.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+module SimpleForm
+  module Inputs
+    class RichTextAreaInput < Base
+      def input(wrapper_options = nil)
+        merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+
+        @builder.rich_text_area(attribute_name, merged_input_options)
+      end
+    end
+  end
+end

data/lib/simple_form/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module SimpleForm
-  VERSION = "5.0.0".freeze
+  VERSION = "5.1.0".freeze
 end

data/lib/simple_form/wrappers/root.rb

@@ -28,11 +28,16 @@ module SimpleForm
         css += SimpleForm.additional_classes_for(:wrapper) do
           input.additional_classes + [input.input_class]
         end
-        css << (options[:wrapper_error_class] || @defaults[:error_class]) if input.has_errors?
-        css << (options[:wrapper_hint_class] || @defaults[:hint_class]) if input.has_hint?
-        css << (options[:wrapper_valid_class] || @defaults[:valid_class]) if input.valid?
+        css << html_class(:error_class, options) { input.has_errors? }
+        css << html_class(:hint_class, options) { input.has_hint? }
+        css << html_class(:valid_class, options) { input.valid? }
         css.compact
       end
+
+      def html_class(key, options)
+        css = (options[:"wrapper_#{key}"] || @defaults[key])
+        css if css && yield
+      end
     end
   end
 end

data/test/components/label_test.rb

@@ -4,10 +4,6 @@ require 'test_helper'
 
 # Isolated tests for label without triggering f.label.
 class IsolatedLabelTest < ActionView::TestCase
-  setup do
-    SimpleForm::Inputs::Base.reset_i18n_cache :translate_required_html
-  end
-
   def with_label_for(object, attribute_name, type, options = {})
     with_concat_form_for(object) do |f|
       options[:reflection] = Association.new(Company, :company, {}) if options.delete(:setup_association)

data/test/form_builder/general_test.rb

@@ -244,7 +244,12 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'form input#user_with_attachment_avatar.file'
   end
 
-  test 'builder generates file input for Shrine >= 0.9.0, Refile >= 0.6.0 and CarrierWave >= 0.2.1' do
+  test 'builder generates file input for ActiveStorage::Attached::Many' do
+    with_form_for UserWithAttachment.build, :avatars
+    assert_select 'form input#user_with_attachment_avatars.file'
+  end
+
+  test 'builder generates file input for Refile >= 0.3.0 and CarrierWave >= 0.2.2' do
     with_form_for UserWithAttachment.build, :cover
     assert_select 'form input#user_with_attachment_cover.file'
   end

data/test/form_builder/label_test.rb

@@ -19,7 +19,7 @@ class LabelTest < ActionView::TestCase
     assert_select 'label.string[for=user_name]', /Name/
   end
 
-  test 'builder generates a label for the boolean attrbiute' do
+  test 'builder generates a label for the boolean attribute' do
     with_label_for @user, :name, as: :boolean
     assert_select 'label.boolean[for=user_name]', /Name/
     assert_no_select 'label[as=boolean]'

data/test/form_builder/wrapper_test.rb

@@ -59,6 +59,13 @@ class WrapperTest < ActionView::TestCase
     assert_no_select 'input.is-invalid'
   end
 
+  test 'wrapper does not determine if valid class is needed when it is set to nil' do
+    @user.instance_eval { undef errors }
+    with_form_for @user, :name, wrapper: custom_wrapper_with_input_valid_class(valid_class: nil)
+
+    assert_no_select 'div.field_without_errors'
+  end
+
   test 'wrapper adds hint class for attribute with a hint' do
     with_form_for @user, :name, hint: 'hint'
     assert_select 'div.field_with_hint'

data/test/inputs/collection_check_boxes_input_test.rb

@@ -3,10 +3,6 @@
 require 'test_helper'
 
 class CollectionCheckBoxesInputTest < ActionView::TestCase
-  setup do
-    SimpleForm::Inputs::CollectionCheckBoxesInput.reset_i18n_cache :boolean_collection
-  end
-
   test 'input check boxes does not include for attribute by default' do
     with_input_for @user, :gender, :check_boxes, collection: %i[male female]
     assert_select 'label'

data/test/inputs/collection_radio_buttons_input_test.rb

@@ -3,10 +3,6 @@
 require 'test_helper'
 
 class CollectionRadioButtonsInputTest < ActionView::TestCase
-  setup do
-    SimpleForm::Inputs::CollectionRadioButtonsInput.reset_i18n_cache :boolean_collection
-  end
-
   test 'input generates boolean radio buttons by default for radio types' do
     with_input_for @user, :active, :radio_buttons
     assert_select 'input[type=radio][value=true].radio_buttons#user_active_true'

data/test/inputs/collection_select_input_test.rb

@@ -3,10 +3,6 @@
 require 'test_helper'
 
 class CollectionSelectInputTest < ActionView::TestCase
-  setup do
-    SimpleForm::Inputs::CollectionSelectInput.reset_i18n_cache :boolean_collection
-  end
-
   test 'input generates a boolean select with options by default for select types' do
     with_input_for @user, :active, :select
     assert_select 'select.select#user_active'
@@ -284,6 +280,12 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_select 'select[required]'
   end
 
+  test "collection input generated aria-label should contain 'true'" do
+    with_input_for @user, :age, :select, collection: 18..30, prompt: "Please select foo"
+    assert_select 'select.required'
+    assert_select 'select[aria-required=true]'
+  end
+
   test 'collection input with select type does not generate required html attribute without blank option' do
     with_input_for @user, :name, :select, include_blank: false, collection: %w[Jose Carlos]
     assert_select 'select.required'

data/test/inputs/rich_text_area_input_test.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+# encoding: UTF-8
+require 'test_helper'
+
+class RichTextAreaInputTest < ActionView::TestCase
+  test 'input generates a text area for text attributes' do
+    with_input_for @user, :description, :text
+    assert_select 'textarea.text#user_description'
+  end
+
+  test 'input generates a text area for text attributes that accept placeholder' do
+    with_input_for @user, :description, :text, placeholder: 'Put in some text'
+    assert_select 'textarea.text[placeholder="Put in some text"]'
+  end
+end

data/test/support/misc_helpers.rb

@@ -213,8 +213,8 @@ module MiscHelpers
     end
   end
 
-  def custom_wrapper_with_input_valid_class
-    SimpleForm.build tag: :div, class: "custom_wrapper", valid_class: :field_without_errors do |b|
+  def custom_wrapper_with_input_valid_class(valid_class: :field_without_errors)
+    SimpleForm.build tag: :div, class: "custom_wrapper", valid_class: valid_class do |b|
       b.use :label
       b.use :input, class: 'inline-class', valid_class: 'is-valid'
     end

data/test/support/models.rb

@@ -339,7 +339,11 @@ class UserWithAttachment < User
     OpenStruct.new
   end
 
-  def cover_url
+  def avatars_attachments
+    OpenStruct.new
+  end
+
+  def remote_cover_url
     "/uploads/cover.png"
   end
 

data/test/test_helper.rb

@@ -60,7 +60,7 @@ class ActionView::TestCase
 
     @validating_user = ValidatingUser.build({
       name: 'Tester McTesterson',
-      description: 'A test user of the most distinguised caliber',
+      description: 'A test user of the most distinguished caliber',
       home_picture: 'Home picture',
       age: 19,
       amount: 15,

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - José Valim
 - Carlos Antônio
 - Rafael França
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -18,30 +18,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 description: Forms made easy!
-email: opensource@plataformatec.com.br
+email: heartcombo@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -82,7 +82,6 @@ files:
 - lib/simple_form/helpers/readonly.rb
 - lib/simple_form/helpers/required.rb
 - lib/simple_form/helpers/validators.rb
-- lib/simple_form/i18n_cache.rb
 - lib/simple_form/inputs.rb
 - lib/simple_form/inputs/base.rb
 - lib/simple_form/inputs/block_input.rb
@@ -100,6 +99,7 @@ files:
 - lib/simple_form/inputs/password_input.rb
 - lib/simple_form/inputs/priority_input.rb
 - lib/simple_form/inputs/range_input.rb
+- lib/simple_form/inputs/rich_text_area_input.rb
 - lib/simple_form/inputs/string_input.rb
 - lib/simple_form/inputs/text_input.rb
 - lib/simple_form/map_type.rb
@@ -142,6 +142,7 @@ files:
 - test/inputs/priority_input_test.rb
 - test/inputs/readonly_test.rb
 - test/inputs/required_test.rb
+- test/inputs/rich_text_area_input_test.rb
 - test/inputs/string_input_test.rb
 - test/inputs/text_input_test.rb
 - test/simple_form_test.rb
@@ -150,11 +151,11 @@ files:
 - test/support/mock_controller.rb
 - test/support/models.rb
 - test/test_helper.rb
-homepage: https://github.com/plataformatec/simple_form
+homepage: https://github.com/heartcombo/simple_form
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -162,16 +163,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.2.6
+signing_key:
 specification_version: 4
 summary: Forms made easy!
 test_files:
@@ -197,6 +197,7 @@ test_files:
 - test/simple_form_test.rb
 - test/inputs/string_input_test.rb
 - test/inputs/numeric_input_test.rb
+- test/inputs/rich_text_area_input_test.rb
 - test/inputs/readonly_test.rb
 - test/inputs/grouped_collection_select_input_test.rb
 - test/inputs/text_input_test.rb

data/lib/simple_form/i18n_cache.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-module SimpleForm
-  # A lot of configuration values are retrived from I18n,
-  # like boolean collection, required string. This module provides
-  # caching facility to speed up form construction.
-  module I18nCache
-    def i18n_cache(key)
-      get_i18n_cache(key)[I18n.locale] ||= yield.freeze
-    end
-
-    def get_i18n_cache(key)
-      if class_variable_defined?(:"@@#{key}")
-        class_variable_get(:"@@#{key}")
-      else
-        reset_i18n_cache(key)
-      end
-    end
-
-    def reset_i18n_cache(key)
-      class_variable_set(:"@@#{key}", {})
-    end
-  end
-end