activesupport 7.0.8.6 → 7.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd59d1b979fdef6110c5b9968fd134094f5efa954426f51c147fba4896c5b48a
-  data.tar.gz: eb7816a795348ea5a26a10fa4d181e4ad54ec4fbd1c61a9d80ef418488d36055
+  metadata.gz: 016e2913f33ba54595a5a6760dc3d228b75dba7a5ea6019bf3633ed1398c3554
+  data.tar.gz: 69361bd65952fd588551a2f2b2031cad8aa3b4834a05a08958dc25f7cdd15168
 SHA512:
-  metadata.gz: 831f69a677589ce36aeecb0905d22e95a4d6bf92900df22b090c40c00c993f55f15d94c7aa4c1fd102d756464750df48e8c3e9d067dac9b51afed1d49d8b0705
-  data.tar.gz: 831ac6a239d6145e20745e5fc0c32a4431bd9a34673c484bc03291d73a274df5d1f92b3ac1512e2b7845700436d8ab58260361fa7000bf6e4539e2ac43358e4d
+  metadata.gz: 764c23f42df81f5231a69341f5f3fae03c8da75515f653ad4aadba0766b2047883a88b2566ffb7e1cb2eb53a532eb169083a6e911907e9572a8af36ce31dcc88
+  data.tar.gz: 298e9dc61c2c1324d81d5b3a2f6fe5f7565d32fb2c7b697b9dca48cba7dad72b1351b97e0bf42463fa93b6ba234f0ce5e9dcdc6b764c84b0662b6e45b594effc

data/CHANGELOG.md

@@ -1,3 +1,69 @@
+## Rails 7.0.9 (October 28, 2025) ##
+
+*   Fix `ActiveSupport::Notifications.publish_event` to preserve units.
+
+    This solves the incorrect reporting of time spent running Active Record
+    asynchronous queries (by a factor `1000`).
+
+    *Jean Boussier*
+
+*   Fix ActiveSupport::Deprecation to handle blaming generated code
+
+    *Jean Boussier*, *fatkodima*
+
+*   Fix `#to_fs(:human_size)` to correctly work with negative numbers.
+
+    *Earlopain*
+
+*   Add `bigdecimal` as Active Support dependency that is a bundled gem candidate for Ruby 3.4.
+
+    `bigdecimal` 3.1.4 or higher version will be installed.
+    Ruby 2.7 and 3.0 users who want `bigdecimal` version 2.0.0 or 3.0.0 behavior as a default gem,
+    pin the `bigdecimal` version in your application Gemfile.
+
+    *Koichi ITO*
+
+*   Ensure `{down,up}case_first` returns non-frozen string.
+
+    *Jonathan Hefner*
+
+*   Add `drb`, `mutex_m` and `base64` that are bundled gem candidates for Ruby 3.4
+
+    *Yasuo Honda*
+
+*   Fix `delete_matched` for file cache store to work with keys longer than the
+    max filename size.
+
+    *fatkodima* and *Jonathan Hefner*
+
+*   Fix MemoryStore to prevent race conditions when incrementing or decrementing.
+
+    *Pierre Jambet*
+
+*   Fix MemoryStore to preserve entries TTL when incrementing or decrementing
+
+    This is to be more consistent with how MemCachedStore and RedisCacheStore behaves.
+
+    *Jean Boussier*
+
+*   NumberHelper: handle objects responding to_d.
+
+    *fatkodima*
+
+*   NumberHelper: handle very large numbers.
+
+    *Alex Ghiculescu*, *fatkodima*
+
+*   Fix Range#overlaps? not taking empty ranges into account on Ruby < 3.3
+
+    *Nobuyoshi Nakada*, *Shouichi Kamiya*, *Hartley McGuire*
+
+
+## Rails 7.0.8.7 (December 10, 2024) ##
+
+*   No changes.
+
+
 ## Rails 7.0.8.6 (October 23, 2024) ##
 
 *   No changes.

data/lib/active_support/cache/file_store.rb

@@ -152,7 +152,7 @@ module ActiveSupport
 
         # Translate a file path into a key.
         def file_path_key(path)
-          fname = path[cache_path.to_s.size..-1].split(File::SEPARATOR, 4).last
+          fname = path[cache_path.to_s.size..-1].split(File::SEPARATOR, 4).last.delete(File::SEPARATOR)
           URI.decode_www_form_component(fname, Encoding::UTF_8)
         end
 

data/lib/active_support/cache/memory_store.rb

@@ -190,10 +190,12 @@ module ActiveSupport
 
         def modify_value(name, amount, options)
           options = merged_options(options)
+
           synchronize do
-            if num = read(name, options)
-              num = num.to_i + amount
-              write(name, num, options)
+            if entry = read_entry(name, **options)
+              num = entry.value.to_i + amount
+              entry = Entry.new(num, expires_at: entry.expires_at, version: entry.version)
+              write_entry(name, entry)
               num
             end
           end

data/lib/active_support/core_ext/class/attribute.rb

@@ -84,7 +84,6 @@ class Class
   #   class_attribute :settings, default: {}
   def class_attribute(*attrs, instance_accessor: true,
     instance_reader: instance_accessor, instance_writer: instance_accessor, instance_predicate: true, default: nil)
-
     class_methods, methods = [], []
     attrs.each do |name|
       unless name.is_a?(Symbol) || name.is_a?(String)

data/lib/active_support/core_ext/module/concerning.rb

@@ -3,7 +3,7 @@
 require "active_support/concern"
 
 class Module
-  # = Bite-sized separation of concerns
+  # == Bite-sized separation of concerns
   #
   # We often find ourselves with a medium-sized chunk of behavior that we'd
   # like to extract, but only mix in to a single class.
@@ -18,9 +18,9 @@ class Module
   # with a comment, as a least-bad alternative. Using modules in separate files
   # means tedious sifting to get a big-picture view.
   #
-  # = Dissatisfying ways to separate small concerns
+  # == Dissatisfying ways to separate small concerns
   #
-  # == Using comments:
+  # === Using comments:
   #
   #   class Todo < ApplicationRecord
   #     # Other todo implementation
@@ -37,7 +37,7 @@ class Module
   #       end
   #   end
   #
-  # == With an inline module:
+  # === With an inline module:
   #
   # Noisy syntax.
   #
@@ -61,7 +61,7 @@ class Module
   #     include EventTracking
   #   end
   #
-  # == Mix-in noise exiled to its own file:
+  # === Mix-in noise exiled to its own file:
   #
   # Once our chunk of behavior starts pushing the scroll-to-understand-it
   # boundary, we give in and move it to a separate file. At this size, the
@@ -75,7 +75,7 @@ class Module
   #     include TodoEventTracking
   #   end
   #
-  # = Introducing Module#concerning
+  # == Introducing Module#concerning
   #
   # By quieting the mix-in noise, we arrive at a natural, low-ceremony way to
   # separate bite-sized concerns.

data/lib/active_support/core_ext/object/json.rb

@@ -29,7 +29,7 @@ require "active_support/core_ext/date/conversions"
 # It should be noted that when using ::JSON.{generate,dump} directly, ActiveSupport's encoder is
 # bypassed completely. This means that as_json won't be invoked and the JSON gem will simply
 # ignore any options it does not natively understand. This also means that ::JSON.{generate,dump}
-# should give exactly the same results with or without active support.
+# should give exactly the same results with or without Active Support.
 
 module ActiveSupport
   module ToJsonWithActiveSupportEncoder # :nodoc:
@@ -225,9 +225,11 @@ class Pathname # :nodoc:
   end
 end
 
-class IPAddr # :nodoc:
-  def as_json(options = nil)
-    to_s
+unless IPAddr.method_defined?(:as_json, false)
+  class IPAddr # :nodoc:
+    def as_json(options = nil)
+      to_s
+    end
   end
 end
 

data/lib/active_support/core_ext/object/with_options.rb

@@ -68,7 +68,7 @@ class Object
   # You can access these methods using the class name instead:
   #
   #   class Phone < ActiveRecord::Base
-  #     enum phone_number_type: { home: 0, office: 1, mobile: 2 }
+  #     enum :phone_number_type, { home: 0, office: 1, mobile: 2 }
   #
   #     with_options presence: true do
   #       validates :phone_number_type, inclusion: { in: Phone.phone_number_types.keys }

data/lib/active_support/core_ext/range/overlaps.rb

@@ -5,6 +5,32 @@ class Range
   #  (1..5).overlaps?(4..6) # => true
   #  (1..5).overlaps?(7..9) # => false
   def overlaps?(other)
-    other.begin == self.begin || cover?(other.begin) || other.cover?(self.begin)
+    raise TypeError unless other.is_a? Range
+
+    self_begin = self.begin
+    other_end = other.end
+    other_excl = other.exclude_end?
+
+    return false if _empty_range?(self_begin, other_end, other_excl)
+
+    other_begin = other.begin
+    self_end = self.end
+    self_excl = self.exclude_end?
+
+    return false if _empty_range?(other_begin, self_end, self_excl)
+    return true if self_begin == other_begin
+
+    return false if _empty_range?(self_begin, self_end, self_excl)
+    return false if _empty_range?(other_begin, other_end, other_excl)
+
+    true
   end
+
+  private
+    def _empty_range?(b, e, excl)
+      return false if b.nil? || e.nil?
+
+      comp = b <=> e
+      comp.nil? || comp > 0 || (comp == 0 && excl)
+    end
 end

data/lib/active_support/core_ext/string/indent.rb

@@ -24,7 +24,7 @@ class String
   #
   # The second argument, +indent_string+, specifies which indent string to
   # use. The default is +nil+, which tells the method to make a guess by
-  # peeking at the first indented line, and fallback to a space if there is
+  # peeking at the first indented line, and fall back to a space if there is
   # none.
   #
   #   "  foo".indent(2)        # => "    foo"

data/lib/active_support/deprecation/behaviors.rb

@@ -53,7 +53,7 @@ module ActiveSupport
     # [+raise+]   Raise <tt>ActiveSupport::DeprecationException</tt>.
     # [+stderr+]  Log all deprecation warnings to <tt>$stderr</tt>.
     # [+log+]     Log all deprecation warnings to +Rails.logger+.
-    # [+notify+]  Use +ActiveSupport::Notifications+ to notify +deprecation.rails+.
+    # [+notify+]  Use ActiveSupport::Notifications to notify +deprecation.rails+.
     # [+silence+] Do nothing. On Rails, set <tt>config.active_support.report_deprecations = false</tt> to disable all behaviors.
     #
     # Setting behaviors only affects deprecations that happen after boot time.
@@ -80,7 +80,7 @@ module ActiveSupport
       # [+raise+]   Raise <tt>ActiveSupport::DeprecationException</tt>.
       # [+stderr+]  Log all deprecation warnings to <tt>$stderr</tt>.
       # [+log+]     Log all deprecation warnings to +Rails.logger+.
-      # [+notify+]  Use +ActiveSupport::Notifications+ to notify +deprecation.rails+.
+      # [+notify+]  Use ActiveSupport::Notifications to notify +deprecation.rails+.
       # [+silence+] Do nothing.
       #
       # Setting behaviors only affects deprecations that happen after boot time.

data/lib/active_support/deprecation/reporting.rb

@@ -128,7 +128,9 @@ module ActiveSupport
           return _extract_callstack(callstack) if callstack.first.is_a? String
 
           offending_line = callstack.find { |frame|
-            frame.absolute_path && !ignored_callstack(frame.absolute_path)
+            # Code generated with `eval` doesn't have an `absolute_path`, e.g. templates.
+            path = frame.absolute_path || frame.path
+            path && !ignored_callstack?(path)
           } || callstack.first
 
           [offending_line.path, offending_line.lineno, offending_line.label]
@@ -136,7 +138,7 @@ module ActiveSupport
 
         def _extract_callstack(callstack)
           warn "Please pass `caller_locations` to the deprecation API" if $VERBOSE
-          offending_line = callstack.find { |line| !ignored_callstack(line) } || callstack.first
+          offending_line = callstack.find { |line| !ignored_callstack?(line) } || callstack.first
 
           if offending_line
             if md = offending_line.match(/^(.+?):(\d+)(?::in `(.*?)')?/)
@@ -147,10 +149,11 @@ module ActiveSupport
           end
         end
 
-        RAILS_GEM_ROOT = File.expand_path("../../../..", __dir__) + "/"
+        RAILS_GEM_ROOT = File.expand_path("../../../..", __dir__) + "/" # :nodoc:
+        LIB_DIR = RbConfig::CONFIG["libdir"] # :nodoc:
 
-        def ignored_callstack(path)
-          path.start_with?(RAILS_GEM_ROOT) || path.start_with?(RbConfig::CONFIG["rubylibdir"])
+        def ignored_callstack?(path)
+          path.start_with?(RAILS_GEM_ROOT, LIB_DIR)
         end
     end
   end

data/lib/active_support/gem_version.rb

@@ -9,8 +9,8 @@ module ActiveSupport
   module VERSION
     MAJOR = 7
     MINOR = 0
-    TINY  = 8
-    PRE   = "6"
+    TINY  = 9
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_support/inflector/methods.rb

@@ -161,7 +161,7 @@ module ActiveSupport
     #   upcase_first('w')                 # => "W"
     #   upcase_first('')                  # => ""
     def upcase_first(string)
-      string.length > 0 ? string[0].upcase.concat(string[1..-1]) : ""
+      string.length > 0 ? string[0].upcase.concat(string[1..-1]) : +""
     end
 
     # Capitalizes all the words and replaces some characters in the string to

data/lib/active_support/logger_thread_safe_level.rb

@@ -4,6 +4,7 @@ require "active_support/concern"
 require "active_support/core_ext/module/attribute_accessors"
 require "concurrent"
 require "fiber"
+require "logger"
 
 module ActiveSupport
   module LoggerThreadSafeLevel # :nodoc:

data/lib/active_support/notifications/instrumenter.rb

@@ -56,7 +56,7 @@ module ActiveSupport
     end
 
     class Event
-      attr_reader :name, :time, :end, :transaction_id, :children
+      attr_reader :name, :transaction_id, :children
       attr_accessor :payload
 
       def initialize(name, start, ending, transaction_id, payload)
@@ -72,7 +72,15 @@ module ActiveSupport
         @allocation_count_finish = 0
       end
 
-      def record
+      def time
+        @time / 1000.0 if @time
+      end
+
+      def end
+        @end / 1000.0 if @end
+      end
+
+      def record # :nodoc:
         start!
         begin
           yield payload if block_given?
@@ -99,20 +107,20 @@ module ActiveSupport
         @allocation_count_finish = now_allocations
       end
 
-      # Returns the CPU time (in milliseconds) passed since the call to
-      # +start!+ and the call to +finish!+
+      # Returns the CPU time (in milliseconds) passed between the call to
+      # #start! and the call to #finish!.
       def cpu_time
         @cpu_time_finish - @cpu_time_start
       end
 
-      # Returns the idle time time (in milliseconds) passed since the call to
-      # +start!+ and the call to +finish!+
+      # Returns the idle time time (in milliseconds) passed between the call to
+      # #start! and the call to #finish!.
       def idle_time
         duration - cpu_time
       end
 
-      # Returns the number of allocations made since the call to +start!+ and
-      # the call to +finish!+
+      # Returns the number of allocations made between the call to #start! and
+      # the call to #finish!.
       def allocations
         @allocation_count_finish - @allocation_count_start
       end
@@ -130,7 +138,7 @@ module ActiveSupport
       #
       #   @event.duration # => 1000.138
       def duration
-        self.end - time
+        @end - @time
       end
 
       def <<(event)

data/lib/active_support/number_helper/number_converter.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "bigdecimal"
+require "bigdecimal/util"
 require "active_support/core_ext/big_decimal/conversions"
 require "active_support/core_ext/object/blank"
 require "active_support/core_ext/hash/keys"
@@ -128,7 +130,7 @@ module ActiveSupport
       def execute
         if !number
           nil
-        elsif validate_float? && !valid_float?
+        elsif validate_float? && !valid_bigdecimal
           number
         else
           convert
@@ -173,8 +175,15 @@ module ActiveSupport
           key.split(".").reduce(DEFAULTS) { |defaults, k| defaults[k.to_sym] }
         end
 
-        def valid_float?
-          Float(number, exception: false)
+        def valid_bigdecimal
+          case number
+          when Float, Rational
+            number.to_d(0)
+          when String
+            BigDecimal(number, exception: false)
+          else
+            number.to_d rescue nil
+          end
         end
     end
   end

data/lib/active_support/number_helper/number_to_currency_converter.rb

@@ -10,13 +10,13 @@ module ActiveSupport
       def convert
         format = options[:format]
 
-        number_f = valid_float?
-        if number_f
-          if number_f.negative?
-            number_f = number_f.abs
-            format = options[:negative_format] if (number_f * 10**options[:precision]) >= 0.5
+        number_d = valid_bigdecimal
+        if number_d
+          if number_d.negative?
+            number_d = number_d.abs
+            format = options[:negative_format] if (number_d * 10**options[:precision]) >= 0.5
           end
-          number_s = NumberToRoundedConverter.convert(number_f, options)
+          number_s = NumberToRoundedConverter.convert(number_d, options)
         else
           number_s = number.to_s.strip
           format = options[:negative_format] if number_s.sub!(/^-/, "")

data/lib/active_support/number_helper/number_to_human_size_converter.rb

@@ -43,13 +43,13 @@ module ActiveSupport
 
         def exponent
           max = STORAGE_UNITS.size - 1
-          exp = (Math.log(number) / Math.log(base)).to_i
+          exp = (Math.log(number.abs) / Math.log(base)).to_i
           exp = max if exp > max # avoid overflow for the highest unit
           exp
         end
 
         def smaller_than_base?
-          number.to_i < base
+          number.to_i.abs < base
         end
 
         def base