simple_form 5.3.1 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfdcacda4f77b45f0a314651ceebcc8b55b7ad04292c947df7b8f7058b283b91
-  data.tar.gz: 0cf232b39ab76dc175f729024d35f55551c10a1bb7d391d9feeb5b2252f0fc48
+  metadata.gz: 9ab83cf1fd374f5f1b1a26fb73e903b03f286fd32640db3c67e7cf270529e36d
+  data.tar.gz: 6b73d95e3515adcf607dbfa9a93b3556cf9219b8a32c6540ee98b822c3e75b1a
 SHA512:
-  metadata.gz: c567585213251a013e64188da22598a980451d68fc96d8b9a7eb8f937b2b8d7fef6659d9213133728070c11d9e1ab8f647960cba60a9516b0805d6effcf07dac
-  data.tar.gz: 6912ab15c194e3090b27b9331fd8f3db7402ba64e286c8165b816aa8ee7c7fea4c285b1e8df09ccfb2daaeb51393156df6369df6b4c52b13548c00e498c53494
+  metadata.gz: 5171360f4f381ba58c83a7d0f798770b7f9a90afd4eebd03a573ce2a48f352f3e9ebf1ec079152082fbe88a727b9f57f4cfc85b3ba5537f636a806b81aa298e4
+  data.tar.gz: 69a2e9865036691353286c66e785f11b1a0ba04acf2e9cf4ce701f35e54656db649c6f623b929d828553474cffece865109611690f730eeac1980646b51dcca4

data/CHANGELOG.md

@@ -1,6 +1,17 @@
-## Unreleased
+## 5.4.1
 
+* Ruby 4.0 support (no changes required)
+* Support procs on validators for minlength/maxlength, and improve validators logic across the board to match Rails [#1859](https://github.com/heartcombo/simple_form/pull/1859)
 
+## 5.4.0
+
+* Add support for Ruby 3.4 and Rails 7.2/8.0/8.1. (no changes required)
+* Drop support for Rails < 7 and Ruby < 2.7.
+* Add `weekday` input. [#1846](https://github.com/heartcombo/simple_form/pull/1846)
+* Remove redundant `aria-required` attribute for required fields. [#1823](https://github.com/heartcombo/simple_form/pull/1823)
+* Integrate `:rich_text_area` with placeholders [#1842](https://github.com/heartcombo/simple_form/pull/1842)
+* Fix encrypted attributes improperly casted (later fixed in Rails) [#1836](https://github.com/heartcombo/simple_form/pull/1836)
+* Pass `base` object to `human_attribute_name` in labels [#1812](https://github.com/heartcombo/simple_form/pull/1812)
 
 ## 5.3.1
 
@@ -109,7 +120,7 @@ See http://blog.plataformatec.com.br/2019/09/incorrect-access-control-in-simple-
 ### 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)
+* Silent deprecation 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
@@ -231,7 +242,7 @@ See http://blog.plataformatec.com.br/2019/09/incorrect-access-control-in-simple-
 
 ### bug fix
   * 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.
+  * Fix support 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/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)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2020-2024 Rafael França, Carlos Antônio da Silva
+Copyright (c) 2020-CURRENT Rafael França, Carlos Antonio da Silva
 Copyright (c) 2009-2019 Plataformatec
 
 Permission is hereby granted, free of charge, to any person obtaining

data/README.md

@@ -1,5 +1,7 @@
 ![Simple Form Logo](https://raw.github.com/heartcombo/simple_form/main/simple_form.png)
 
+[![Gem Version](https://fury-badge.herokuapp.com/rb/simple_form.png)](http://badge.fury.io/rb/simple_form)
+
 Rails forms made easy.
 
 **Simple Form** aims to be as flexible as possible while helping you with powerful components to create
@@ -621,11 +623,13 @@ Mapping         | Generated HTML Element               | Database Column Type
 `datetime`      | `datetime select`                    | `datetime/timestamp`
 `date`          | `date select`                        | `date`
 `time`          | `time select`                        | `time`
+`weekday`       | `select` (weekdays as options)       | -
 `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/`
+`rich_text_area`| `trix-editor`                        | -
 
 ## Custom inputs
 
@@ -1187,7 +1191,7 @@ by passing the html5 option:
 <%= f.input :expires_at, as: :date, html5: true %>
 ```
 
-### Using non Active Record objects
+## Using non Active Record objects
 
 There are few ways to build forms with objects that don't inherit from Active Record, as
 follows:
@@ -1236,6 +1240,45 @@ class User
 end
 ```
 
+To have SimpleForm infer the attributes' types, you can provide
+`#has_attribute?` and `#type_for_attribute` methods.
+The later should return an object that responds to `#type`
+with the attribute type. This is useful for generating
+the correct input types (eg: checkboxes for booleans).
+
+```ruby
+class User < Struct.new(:id, :name, :age, :registered)
+  def to_model
+    self
+  end
+
+  def model_name
+    OpenStruct.new(param_key: "user")
+  end
+
+  def to_key
+    id
+  end
+
+  def persisted?
+    id.present?
+  end
+
+  def has_attribute?(attr_name)
+    %w(id name age registered).include?(attr_name.to_s)
+  end
+
+  def type_for_attribute(attr_name)
+    case attr_name.to_s
+      when "id" then OpenStruct.new(type: :integer)
+      when "name" then OpenStruct.new(type: :string)
+      when "age" then OpenStruct.new(type: :integer)
+      when "registered" then OpenStruct.new(type: :boolean)
+    end
+  end
+end
+```
+
 If your object doesn't implement those methods, you must make explicit it when you are
 building the form
 
@@ -1280,19 +1323,12 @@ sending us a pull request.
 
 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
-
-* Carlos Antonio da Silva (https://github.com/carlosantoniodasilva)
-* Rafael Mendonça França (https://github.com/rafaelfranca)
-* Felipe Renan (https://github.com/feliperenan)
-
-[![Gem Version](https://fury-badge.herokuapp.com/rb/simple_form.png)](http://badge.fury.io/rb/simple_form)
-[![Inline docs](http://inch-ci.org/github/heartcombo/simple_form.png)](http://inch-ci.org/github/heartcombo/simple_form)
+If you have discovered a security related bug, please do NOT use the GitHub issue tracker. Send an e-mail to heartcombo.oss@gmail.com.
 
 ## License
 
-MIT License. Copyright 2020-2024 Rafael França, Carlos Antônio da Silva. Copyright 2009-2019 Plataformatec.
+MIT License.
+Copyright 2020-CURRENT Rafael França, Carlos Antonio da Silva.
+Copyright 2009-2019 Plataformatec.
 
 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/simple_form/components/html5.rb

@@ -10,10 +10,7 @@ module SimpleForm
         @html5 = true
 
         input_html_options[:required]        = input_html_required_option
-        input_html_options[:'aria-required'] = input_html_aria_required_option
-
         input_html_options[:'aria-invalid']  = has_errors? || nil
-
         nil
       end
 
@@ -25,10 +22,6 @@ module SimpleForm
         !options[:required].nil? ? required_field? : has_required?
       end
 
-      def input_html_aria_required_option
-        !options[:required].nil? ? (required_field? || nil) : (has_required? || nil)
-      end
-
       def has_required?
         # We need to check browser_validations because
         # some browsers are still checking required even

data/lib/simple_form/components/labels.rb

@@ -74,7 +74,7 @@ module SimpleForm
         if SimpleForm.translate_labels && (translated_label = translate_from_namespace(:labels))
           translated_label
         elsif object.class.respond_to?(:human_attribute_name)
-          object.class.human_attribute_name(reflection_or_attribute_name.to_s)
+          object.class.human_attribute_name(reflection_or_attribute_name.to_s, { base: object })
         else
           attribute_name.to_s.humanize
         end

data/lib/simple_form/components/maxlength.rb

@@ -26,7 +26,8 @@ module SimpleForm
 
       def maximum_length_value_from(length_validator)
         if length_validator
-          length_validator.options[:is] || length_validator.options[:maximum]
+          value = length_validator.options[:is] || length_validator.options[:maximum]
+          resolve_validator_value(value)
         end
       end
     end

data/lib/simple_form/components/min_max.rb

@@ -19,33 +19,23 @@ module SimpleForm
 
       def minimum_value(validator_options)
         if integer? && validator_options.key?(:greater_than)
-          evaluate_numericality_validator_option(validator_options[:greater_than]) + 1
+          resolve_validator_value(validator_options[:greater_than]) + 1
         else
-          evaluate_numericality_validator_option(validator_options[:greater_than_or_equal_to])
+          resolve_validator_value(validator_options[:greater_than_or_equal_to])
         end
       end
 
       def maximum_value(validator_options)
         if integer? && validator_options.key?(:less_than)
-          evaluate_numericality_validator_option(validator_options[:less_than]) - 1
+          resolve_validator_value(validator_options[:less_than]) - 1
         else
-          evaluate_numericality_validator_option(validator_options[:less_than_or_equal_to])
+          resolve_validator_value(validator_options[:less_than_or_equal_to])
         end
       end
 
       def find_numericality_validator
         find_validator(:numericality)
       end
-
-      def evaluate_numericality_validator_option(option)
-        if option.is_a?(Numeric)
-          option
-        elsif option.is_a?(Symbol)
-          object.send(option)
-        elsif option.respond_to?(:call)
-          option.call(object)
-        end
-      end
     end
   end
 end

data/lib/simple_form/components/minlength.rb

@@ -26,7 +26,8 @@ module SimpleForm
 
       def minimum_length_value_from(length_validator)
         if length_validator
-          length_validator.options[:is] || length_validator.options[:minimum]
+          value = length_validator.options[:is] || length_validator.options[:minimum]
+          resolve_validator_value(value)
         end
       end
     end

data/lib/simple_form/components/pattern.rb

@@ -15,21 +15,13 @@ module SimpleForm
         if pattern.is_a?(String)
           pattern
         elsif (pattern_validator = find_pattern_validator) && (with = pattern_validator.options[:with])
-          evaluate_format_validator_option(with).source
+          resolve_validator_value(with).source
         end
       end
 
       def find_pattern_validator
         find_validator(:format)
       end
-
-      def evaluate_format_validator_option(option)
-        if option.respond_to?(:call)
-          option.call(object)
-        else
-          option
-        end
-      end
     end
   end
 end

data/lib/simple_form/form_builder.rb

@@ -274,7 +274,7 @@ module SimpleForm
       options = options.dup
 
       options[:error_prefix] ||= if object.class.respond_to?(:human_attribute_name)
-        object.class.human_attribute_name(attribute_name.to_s)
+        object.class.human_attribute_name(attribute_name.to_s, { base: object })
       else
         attribute_name.to_s.humanize
       end
@@ -599,7 +599,11 @@ module SimpleForm
 
     def find_attribute_column(attribute_name)
       if @object.respond_to?(:type_for_attribute) && @object.has_attribute?(attribute_name)
-        @object.type_for_attribute(attribute_name.to_s)
+        detected_type = @object.type_for_attribute(attribute_name.to_s)
+
+        # Some attributes like ActiveRecord::Encryption::EncryptedAttribute are detected
+        # as different type, in that case we need to use the original type
+        detected_type.respond_to?(:cast_type) ? detected_type.cast_type : detected_type
       elsif @object.respond_to?(:column_for_attribute) && @object.has_attribute?(attribute_name)
         @object.column_for_attribute(attribute_name)
       end

data/lib/simple_form/helpers/validators.rb

@@ -40,6 +40,27 @@ module SimpleForm
       def find_validator(kind)
         attribute_validators.find { |v| v.kind == kind } if has_validators?
       end
+
+      # Implements `ActiveModel::Validations::ResolveValue`, introduced by Rails 7.1.
+      # https://github.com/rails/rails/blob/v7.1.0/activemodel/lib/active_model/validations/resolve_value.rb
+      def resolve_validator_value(value)
+        case value
+        when Proc
+          if value.arity == 0
+            value.call
+          else
+            value.call(object)
+          end
+        when Symbol
+          object.send(value)
+        else
+          if value.respond_to?(:call)
+            value.call(object)
+          else
+            value
+          end
+        end
+      end
     end
   end
 end

data/lib/simple_form/inputs/rich_text_area_input.rb

@@ -2,6 +2,8 @@
 module SimpleForm
   module Inputs
     class RichTextAreaInput < Base
+      enable :placeholder
+
       def input(wrapper_options = nil)
         merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
 

data/lib/simple_form/inputs/weekday_input.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+module SimpleForm
+  module Inputs
+    class WeekdayInput < CollectionSelectInput
+      enable :placeholder
+
+      def input(wrapper_options = nil)
+        merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+
+        @builder.weekday_select(attribute_name, input_options, merged_input_options)
+      end
+    end
+  end
+end

data/lib/simple_form/inputs.rb

@@ -22,5 +22,6 @@ module SimpleForm
     autoload :RichTextAreaInput
     autoload :StringInput
     autoload :TextInput
+    autoload :WeekdayInput
   end
 end

data/lib/simple_form/version.rb

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

data/lib/simple_form.rb

@@ -73,11 +73,11 @@ See http://blog.plataformatec.com.br/2019/09/incorrect-access-control-in-simple-
   mattr_accessor :error_notification_class
   @@error_notification_class = :error_notification
 
-  # Series of attemps to detect a default label method for collection.
+  # Series of attempts to detect a default label method for collection.
   mattr_accessor :collection_label_methods
   @@collection_label_methods = %i[to_label name title to_s]
 
-  # Series of attemps to detect a default value method for collection.
+  # Series of attempts to detect a default value method for collection.
   mattr_accessor :collection_value_methods
   @@collection_value_methods = %i[id to_s]
 
@@ -178,7 +178,7 @@ See http://blog.plataformatec.com.br/2019/09/incorrect-access-control-in-simple-
   mattr_accessor :cache_discovery
   @@cache_discovery = defined?(Rails.env) && !Rails.env.development?
 
-  # Adds a class to each generated button, mostly for compatiblity.
+  # Adds a class to each generated button, mostly for compatibility.
   mattr_accessor :button_class
   @@button_class = 'button'
 

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 5.4.1
 platform: ruby
 authors:
 - José Valim
-- Carlos Antônio
+- Carlos Antonio
 - Rafael França
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -18,30 +17,86 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: country_select
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Forms made easy!
-email: heartcombo@googlegroups.com
+email: heartcombo.oss@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -102,6 +157,7 @@ files:
 - 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/inputs/weekday_input.rb
 - lib/simple_form/map_type.rb
 - lib/simple_form/railtie.rb
 - lib/simple_form/tags.rb
@@ -122,7 +178,6 @@ metadata:
   source_code_uri: https://github.com/heartcombo/simple_form
   bug_tracker_uri: https://github.com/heartcombo/simple_form/issues
   wiki_uri: https://github.com/heartcombo/simple_form/wiki
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -130,15 +185,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Forms made easy!
 test_files: []