simple_form 5.4.0 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff2bd28ca5c8e4588daf7186c1f6e251bdfe463631da20c80afc9b3586dc52be
-  data.tar.gz: 304fdd3acf41d26dd2a02d1b1f301485956851582bab406069ad70d805157eea
+  metadata.gz: 9ab83cf1fd374f5f1b1a26fb73e903b03f286fd32640db3c67e7cf270529e36d
+  data.tar.gz: 6b73d95e3515adcf607dbfa9a93b3556cf9219b8a32c6540ee98b822c3e75b1a
 SHA512:
-  metadata.gz: 57766d87e4fe98416ef41c7a2e30e32f8f91c3b0e5640b64afb4186b9c1e0e6730528c7f3a0b2079ace45d2b3fb8e936e47308324d57d6c2e0bf1db9e34043b1
-  data.tar.gz: ee60f97f3e42d518e3a37dfcd324d4020b16da685a151e6329aadb8a84747707e89ea8b9801729ef55974bf7965c9cecf65070f1598ebc10ccc990dd9b1bebc6
+  metadata.gz: 5171360f4f381ba58c83a7d0f798770b7f9a90afd4eebd03a573ce2a48f352f3e9ebf1ec079152082fbe88a727b9f57f4cfc85b3ba5537f636a806b81aa298e4
+  data.tar.gz: 69a2e9865036691353286c66e785f11b1a0ba04acf2e9cf4ce701f35e54656db649c6f623b929d828553474cffece865109611690f730eeac1980646b51dcca4

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-## 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.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2020-2025 Rafael França, Carlos Antonio 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

@@ -1328,7 +1328,7 @@ If you have discovered a security related bug, please do NOT use the GitHub issu
 ## License
 
 MIT License.
-Copyright 2020-2025 Rafael França, Carlos Antonio da Silva.
+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/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/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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.4.1
 platform: ruby
 authors:
 - José Valim
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !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
@@ -67,6 +81,20 @@ dependencies:
     - - ">="
       - !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.oss@gmail.com
 executables: []
@@ -164,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Forms made easy!
 test_files: []