activemodel 8.1.0.beta1 → 8.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0477968c49c9249ac55371d34c8035ada03438da3b79f12d53f29179913018a
-  data.tar.gz: e9481d73df257802b3b69b46837b9806417f2244ecb672c397a2dc9944528799
+  metadata.gz: 15e9ea079cc98d8eae87b1d0984234ae0f75b8ef6b4a8b57f54643d5127cdd94
+  data.tar.gz: f1880854a5c91b5844a0edb2568602834f0e319d2441cda48773233920f53bf3
 SHA512:
-  metadata.gz: 652d349baa6d7d2354878e7e70300036f6529ca8a0e5ef700eca8ed58e936b3d2fa18f293dc69aba2ba3ed7c54bec30631b23070969f7e9e57c18e663f289e15
-  data.tar.gz: c188746810b0ce0b3645cbc32d288c16864eed5c1ce1c1569a5f6d0aa93b4d761e68bfacb77956be90a3de7449f60d6467813c74e3115a5baddd618190013ea9
+  metadata.gz: 2c8e42a8d461ee9d3b525360f66a47e13076464a56334d13314fb39045cea5b9264fbb7b4e15ce276438e918dc3e9162f6e3c21a01d77bb1994ea226d4c8fd33
+  data.tar.gz: 67e48079d3fbfd352069a4c0fbb6c4fcf523a461658d7877a1686ca007e3e6c26149d5836b2fac445e50904b006ef025e0aa015d6d2280b49463ccb666876e09

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## Rails 8.1.0.rc1 (October 15, 2025) ##
+
+*   Add `reset_token: { expires_in: ... }` option to `has_secure_password`.
+
+    Allows configuring the expiry duration of password reset tokens (default remains 15 minutes for backwards compatibility).
+
+    ```ruby
+    has_secure_password reset_token: { expires_in: 1.hour }
+    ```
+
+    *Jevin Sew*, *Abeid Ahmed*
+
 ## Rails 8.1.0.beta1 (September 04, 2025) ##
 
 *   Add `except_on:` option for validation callbacks.

data/lib/active_model/gem_version.rb

@@ -10,7 +10,7 @@ module ActiveModel
     MAJOR = 8
     MINOR = 1
     TINY  = 0
-    PRE   = "beta1"
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_model/secure_password.rb

@@ -9,6 +9,8 @@ module ActiveModel
     # Hence need to put a restriction on password length.
     MAX_PASSWORD_LENGTH_ALLOWED = 72
 
+    DEFAULT_RESET_TOKEN_EXPIRES_IN = 15.minutes
+
     class << self
       attr_accessor :min_cost # :nodoc:
     end
@@ -39,10 +41,15 @@ module ActiveModel
       # <tt>validations: false</tt> as an argument. This allows complete
       # customizability of validation behavior.
       #
-      # Finally, a password reset token that's valid for 15 minutes after issue
-      # is automatically configured when +reset_token+ is set to true (which it is by default)
+      # A password reset token (valid for 15 minutes by default) is automatically
+      # configured when +reset_token+ is set to true (which it is by default)
       # and the object responds to +generates_token_for+ (which Active Records do).
       #
+      # Finally, the reset token expiry can be customized by passing a hash to
+      # +has_secure_password+:
+      #
+      #   has_secure_password reset_token: { expires_in: 1.hour }
+      #
       # To use +has_secure_password+, add bcrypt (~> 3.1.7) to your Gemfile:
       #
       #   gem "bcrypt", "~> 3.1.7"
@@ -160,7 +167,12 @@ module ActiveModel
 
         # Only generate tokens for records that are capable of doing so (Active Records, not vanilla Active Models)
         if reset_token && respond_to?(:generates_token_for)
-          generates_token_for :"#{attribute}_reset", expires_in: 15.minutes do
+          reset_token_expires_in = reset_token.is_a?(Hash) ? reset_token[:expires_in] : DEFAULT_RESET_TOKEN_EXPIRES_IN
+
+          silence_redefinition_of_method(:"#{attribute}_reset_token_expires_in")
+          define_method(:"#{attribute}_reset_token_expires_in") { reset_token_expires_in }
+
+          generates_token_for :"#{attribute}_reset", expires_in: reset_token_expires_in do
             public_send(:"#{attribute}_salt")&.last(10)
           end
 

data/lib/active_model/validations.rb

@@ -147,14 +147,14 @@ module ActiveModel
       #   or an array of symbols. (e.g. <tt>except: :create</tt> or
       #   <tt>except_on: :custom_validation_context</tt> or
       #   <tt>except_on: [:create, :custom_validation_context]</tt>)
-      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine
+      # * <tt>:if</tt> - Specifies a method or proc to call to determine
       #   if the validation should occur (e.g. <tt>if: :allow_validation</tt>,
-      #   or <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>). The method,
-      #   proc or string should return or evaluate to a +true+ or +false+ value.
-      # * <tt>:unless</tt> - Specifies a method, proc, or string to call to
+      #   or <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>). The method or
+      #   proc should return or evaluate to a +true+ or +false+ value.
+      # * <tt>:unless</tt> - Specifies a method or proc to call to
       #   determine if the validation should not occur (e.g. <tt>unless: :skip_validation</tt>,
       #   or <tt>unless: Proc.new { |user| user.signup_step <= 2 }</tt>). The
-      #   method, proc, or string should return or evaluate to a +true+ or +false+
+      #   method or proc should return or evaluate to a +true+ or +false+
       #   value.
       #
       # NOTE: Calling +validate+ multiple times on the same method will overwrite previous definitions.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 8.1.0.beta1
+  version: 8.1.0.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.0.beta1
+        version: 8.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.1.0.beta1
+        version: 8.1.0.rc1
 description: A toolkit for building modeling frameworks like Active Record. Rich support
   for attributes, callbacks, validations, serialization, internationalization, and
   testing.
@@ -113,10 +113,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v8.1.0.beta1/activemodel/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v8.1.0.beta1/
+  changelog_uri: https://github.com/rails/rails/blob/v8.1.0.rc1/activemodel/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v8.1.0.rc1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v8.1.0.beta1/activemodel
+  source_code_uri: https://github.com/rails/rails/tree/v8.1.0.rc1/activemodel
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: