RubyGems - activesupport - Versions diffs - 7.2.2 → 8.0.0 - Mend

activesupport 7.2.2 → 8.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (52) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +66 -209
data/lib/active_support/backtrace_cleaner.rb +1 -1
data/lib/active_support/benchmark.rb +21 -0
data/lib/active_support/benchmarkable.rb +3 -2
data/lib/active_support/cache/file_store.rb +12 -2
data/lib/active_support/cache/memory_store.rb +6 -2
data/lib/active_support/cache/redis_cache_store.rb +5 -2
data/lib/active_support/cache.rb +16 -11
data/lib/active_support/callbacks.rb +1 -2
data/lib/active_support/class_attribute.rb +26 -0
data/lib/active_support/code_generator.rb +9 -0
data/lib/active_support/concurrency/share_lock.rb +0 -1
data/lib/active_support/configuration_file.rb +15 -6
data/lib/active_support/core_ext/benchmark.rb +6 -9
data/lib/active_support/core_ext/class/attribute.rb +10 -19
data/lib/active_support/core_ext/date/conversions.rb +2 -0
data/lib/active_support/core_ext/date_and_time/compatibility.rb +2 -2
data/lib/active_support/core_ext/enumerable.rb +8 -3
data/lib/active_support/core_ext/hash/except.rb +0 -12
data/lib/active_support/core_ext/module/attr_internal.rb +3 -4
data/lib/active_support/core_ext/object/json.rb +15 -9
data/lib/active_support/core_ext/thread/backtrace/location.rb +2 -7
data/lib/active_support/core_ext/time/calculations.rb +14 -2
data/lib/active_support/core_ext/time/compatibility.rb +9 -1
data/lib/active_support/core_ext/time/conversions.rb +2 -0
data/lib/active_support/delegation.rb +0 -2
data/lib/active_support/dependencies.rb +0 -1
data/lib/active_support/deprecation/reporting.rb +0 -19
data/lib/active_support/deprecation.rb +1 -1
data/lib/active_support/duration.rb +14 -10
data/lib/active_support/encrypted_configuration.rb +20 -2
data/lib/active_support/error_reporter.rb +25 -1
data/lib/active_support/evented_file_update_checker.rb +0 -1
data/lib/active_support/gem_version.rb +3 -3
data/lib/active_support/hash_with_indifferent_access.rb +16 -16
data/lib/active_support/i18n_railtie.rb +19 -11
data/lib/active_support/isolated_execution_state.rb +0 -2
data/lib/active_support/json/encoding.rb +2 -2
data/lib/active_support/notifications/fanout.rb +0 -1
data/lib/active_support/number_helper.rb +22 -0
data/lib/active_support/railtie.rb +4 -0
data/lib/active_support/tagged_logging.rb +5 -0
data/lib/active_support/testing/assertions.rb +79 -21
data/lib/active_support/testing/isolation.rb +0 -2
data/lib/active_support/testing/strict_warnings.rb +1 -1
data/lib/active_support/testing/time_helpers.rb +2 -1
data/lib/active_support/time_with_zone.rb +21 -12
data/lib/active_support/values/time_zone.rb +11 -9
data/lib/active_support.rb +10 -3
metadata +23 -8
data/lib/active_support/proxy_object.rb +0 -20

data/lib/active_support/configuration_file.rb CHANGED Viewed

@@ -19,11 +19,20 @@ module ActiveSupport
     end
     def parse(context: nil, **options)
-      source = render(context)
-      if YAML.respond_to?(:unsafe_load)
-        YAML.unsafe_load(source, **options) || {}
+      source = @content.include?("<%") ? render(context) : @content
+      if source == @content
+        if YAML.respond_to?(:unsafe_load)
+          YAML.unsafe_load_file(@content_path, **options) || {}
+        else
+          YAML.load_file(@content_path, **options) || {}
+        end
       else
-        YAML.load(source, **options) || {}
+        if YAML.respond_to?(:unsafe_load)
+          YAML.unsafe_load(source, **options) || {}
+        else
+          YAML.load(source, **options) || {}
+        end
       end
     rescue Psych::SyntaxError => error
       raise "YAML syntax error occurred while parsing #{@content_path}. " \
@@ -33,8 +42,7 @@ module ActiveSupport
     private
       def read(content_path)
-        require "yaml"
-        require "erb"
+        require "yaml" unless defined?(YAML)
         File.read(content_path).tap do |content|
           if content.include?("\u00A0")
@@ -44,6 +52,7 @@ module ActiveSupport
       end
       def render(context)
+        require "erb" unless defined?(ERB)
         erb = ERB.new(@content).tap { |e| e.filename = @content_path }
         context ? erb.result(context) : erb.result
       end

data/lib/active_support/core_ext/benchmark.rb CHANGED Viewed

@@ -3,14 +3,11 @@
 require "benchmark"
 class << Benchmark
-  # Benchmark realtime in milliseconds.
-  #
-  #   Benchmark.realtime { User.all }
-  #   # => 8.0e-05
-  #
-  #   Benchmark.ms { User.all }
-  #   # => 0.074
-  def ms(&block)
-    1000 * realtime(&block)
+  def ms(&block) # :nodoc
+    # NOTE: Please also remove the Active Support `benchmark` dependency when removing this
+    ActiveSupport.deprecator.warn <<~TEXT
+      `Benchmark.ms` is deprecated and will be removed in Rails 8.1 without replacement.
+    TEXT
+    ActiveSupport::Benchmark.realtime(:float_millisecond, &block)
   end
 end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require "active_support/core_ext/module/redefine_method"
+require "active_support/class_attribute"
 class Class
   # Declare a class-level attribute whose value is inheritable by subclasses.
@@ -91,24 +92,16 @@ class Class
         raise TypeError, "#{name.inspect} is not a symbol nor a string"
       end
-      class_methods << <<~RUBY # In case the method exists and is not public
-        silence_redefinition_of_method def #{name}
-        end
-      RUBY
-      methods << <<~RUBY if instance_reader
-        silence_redefinition_of_method def #{name}
-          defined?(@#{name}) ? @#{name} : self.class.#{name}
-        end
-      RUBY
+      name = name.to_sym
+      ::ActiveSupport::ClassAttribute.redefine(self, name, default)
-      class_methods << <<~RUBY
-        silence_redefinition_of_method def #{name}=(value)
-          redefine_method(:#{name}) { value } if singleton_class?
-          redefine_singleton_method(:#{name}) { value }
-          value
-        end
-      RUBY
+      unless singleton_class?
+        methods << <<~RUBY if instance_reader
+          silence_redefinition_of_method def #{name}
+            defined?(@#{name}) ? @#{name} : self.class.#{name}
+          end
+        RUBY
+      end
       methods << <<~RUBY if instance_writer
         silence_redefinition_of_method(:#{name}=)
@@ -125,7 +118,5 @@ class Class
     location = caller_locations(1, 1).first
     class_eval(["class << self", *class_methods, "end", *methods].join(";").tr("\n", ";"), location.path, location.lineno)
-    attrs.each { |name| public_send("#{name}=", default) }
   end
 end

data/lib/active_support/core_ext/date/conversions.rb CHANGED Viewed

@@ -17,6 +17,7 @@ class Date
       date.strftime("%B #{day_format}, %Y") # => "April 25th, 2007"
     },
     rfc822: "%d %b %Y",
+    rfc2822: "%d %b %Y",
     iso8601: lambda { |date| date.iso8601 }
   }
@@ -34,6 +35,7 @@ class Date
   #   date.to_fs(:long)          # => "November 10, 2007"
   #   date.to_fs(:long_ordinal)  # => "November 10th, 2007"
   #   date.to_fs(:rfc822)        # => "10 Nov 2007"
+  #   date.to_fs(:rfc2822)       # => "10 Nov 2007"
   #   date.to_fs(:iso8601)       # => "2007-11-10"
   #
   # == Adding your own date formats to to_fs

data/lib/active_support/core_ext/date_and_time/compatibility.rb CHANGED Viewed

@@ -26,8 +26,8 @@ module DateAndTime
         # Only warn once, the first time the value is used (which should
         # be the first time #to_time is called).
         ActiveSupport.deprecator.warn(
-          "to_time will always preserve the timezone offset of the receiver in Rails 8.0. " \
-          "To opt in to the new behavior, set `ActiveSupport.to_time_preserves_timezone = true`."
+          "`to_time` will always preserve the receiver timezone rather than system local time in Rails 8.1." \
+          "To opt in to the new behavior, set `config.active_support.to_time_preserves_timezone = :zone`."
         )
         @@preserve_timezone = false

data/lib/active_support/core_ext/enumerable.rb CHANGED Viewed

@@ -192,9 +192,14 @@ module Enumerable
   #   # => [ Person.find(1), Person.find(5), Person.find(3) ]
   #
   # If the +series+ include keys that have no corresponding element in the Enumerable, these are ignored.
-  # If the Enumerable has additional elements that aren't named in the +series+, these are not included in the result.
-  def in_order_of(key, series)
-    group_by(&key).values_at(*series).flatten(1).compact
+  # If the Enumerable has additional elements that aren't named in the +series+, these are not included in the result, unless
+  # the +filter+ option is set to +false+.
+  def in_order_of(key, series, filter: true)
+    if filter
+      group_by(&key).values_at(*series).flatten(1).compact
+    else
+      sort_by { |v| series.index(v.public_send(key)) || series.size }.compact
+    end
   end
   # Returns the sole item in the enumerable. If there are no items, or more

data/lib/active_support/core_ext/hash/except.rb CHANGED Viewed

@@ -1,18 +1,6 @@
 # frozen_string_literal: true
 class Hash
-  # Returns a hash that includes everything except given keys.
-  #   hash = { a: true, b: false, c: nil }
-  #   hash.except(:c)     # => { a: true, b: false }
-  #   hash.except(:a, :b) # => { c: nil }
-  #   hash                # => { a: true, b: false, c: nil }
-  #
-  # This is useful for limiting a set of parameters to everything but a few known toggles:
-  #   @person.update(params[:person].except(:admin))
-  def except(*keys)
-    slice(*self.keys - keys)
-  end unless method_defined?(:except)
   # Removes the given keys from hash and returns it.
   #   hash = { a: true, b: false, c: nil }
   #   hash.except!(:c) # => { a: true, b: false }

data/lib/active_support/core_ext/module/attr_internal.rb CHANGED Viewed

@@ -24,14 +24,13 @@ class Module
     def attr_internal_naming_format=(format)
       if format.start_with?("@")
-        ActiveSupport.deprecator.warn <<~MESSAGE
-          Setting `attr_internal_naming_format` with a `@` prefix is deprecated and will be removed in Rails 8.0.
+        raise ArgumentError, <<~MESSAGE.squish
+          Setting `attr_internal_naming_format` with a `@` prefix is not supported.
           You can simply replace #{format.inspect} by #{format.delete_prefix("@").inspect}.
         MESSAGE
-        format = format.delete_prefix("@")
       end
       @attr_internal_naming_format = format
     end
   end

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

@@ -65,11 +65,9 @@ class Object
   end
 end
-if RUBY_VERSION >= "3.2"
-  class Data # :nodoc:
-    def as_json(options = nil)
-      to_h.as_json(options)
-    end
+class Data # :nodoc:
+  def as_json(options = nil)
+    to_h.as_json(options)
   end
 end
@@ -105,7 +103,7 @@ end
 class Symbol
   def as_json(options = nil) # :nodoc:
-    to_s
+    name
   end
 end
@@ -164,7 +162,12 @@ end
 class Array
   def as_json(options = nil) # :nodoc:
-    map { |v| options ? v.as_json(options.dup) : v.as_json }
+    if options
+      options = options.dup.freeze unless options.frozen?
+      map { |v| v.as_json(options) }
+    else
+      map { |v| v.as_json }
+    end
   end
 end
@@ -184,8 +187,11 @@ class Hash
     end
     result = {}
-    subset.each do |k, v|
-      result[k.to_s] = options ? v.as_json(options.dup) : v.as_json
+    if options
+      options = options.dup.freeze unless options.frozen?
+      subset.each { |k, v| result[k.to_s] = v.as_json(options) }
+    else
+      subset.each { |k, v| result[k.to_s] = v.as_json }
     end
     result
   end

data/lib/active_support/core_ext/thread/backtrace/location.rb CHANGED Viewed

@@ -1,12 +1,7 @@
 # frozen_string_literal: true
 class Thread::Backtrace::Location # :nodoc:
-  if defined?(ErrorHighlight) && Gem::Version.new(ErrorHighlight::VERSION) >= Gem::Version.new("0.4.0")
-    def spot(ex)
-      ErrorHighlight.spot(ex, backtrace_location: self)
-    end
-  else
-    def spot(ex)
-    end
+  def spot(ex)
+    ErrorHighlight.spot(ex, backtrace_location: self)
   end
 end

data/lib/active_support/core_ext/time/calculations.rb CHANGED Viewed

@@ -147,6 +147,13 @@ class Time
     elsif zone.respond_to?(:utc_to_local)
       new_time = ::Time.new(new_year, new_month, new_day, new_hour, new_min, new_sec, zone)
+      # Some versions of Ruby have a bug where Time.new with a zone object and
+      # fractional seconds will end up with a broken utc_offset.
+      # This is fixed in Ruby 3.3.1 and 3.2.4
+      unless new_time.utc_offset.integer?
+        new_time += 0
+      end
       # When there are two occurrences of a nominal time due to DST ending,
       # `Time.new` chooses the first chronological occurrence (the one with a
       # larger UTC offset). However, for `change`, we want to choose the
@@ -217,8 +224,13 @@ class Time
   # Returns a new Time representing the time a number of seconds since the instance time
   def since(seconds)
     self + seconds
-  rescue
-    to_datetime.since(seconds)
+  rescue TypeError
+    result = to_datetime.since(seconds)
+    ActiveSupport.deprecator.warn(
+      "Passing an instance of #{seconds.class} to #{self.class}#since is deprecated. This behavior will raise " \
+      "a `TypeError` in Rails 8.1."
+    )
+    result
   end
   alias :in :since

data/lib/active_support/core_ext/time/compatibility.rb CHANGED Viewed

@@ -15,10 +15,18 @@ class Time
   end
   def preserve_timezone # :nodoc:
-    active_support_local_zone == zone || super
+    system_local_time? || super
   end
   private
+    def system_local_time?
+      if ::Time.equal?(self.class)
+        zone = self.zone
+        String === zone &&
+          (zone != "UTC" || active_support_local_zone == "UTC")
+      end
+    end
     @@active_support_local_tz = nil
     def active_support_local_zone

data/lib/active_support/core_ext/time/conversions.rb CHANGED Viewed

@@ -22,6 +22,7 @@ class Time
       offset_format = time.formatted_offset(false)
       time.strftime("%a, %d %b %Y %H:%M:%S #{offset_format}")
     },
+    rfc2822: lambda { |time| time.rfc2822 },
     iso8601: lambda { |time| time.iso8601 }
   }
@@ -40,6 +41,7 @@ class Time
   #   time.to_fs(:long)         # => "January 18, 2007 06:10"
   #   time.to_fs(:long_ordinal) # => "January 18th, 2007 06:10"
   #   time.to_fs(:rfc822)       # => "Thu, 18 Jan 2007 06:10:17 -0600"
+  #   time.to_fs(:rfc2822)       # => "Thu, 18 Jan 2007 06:10:17 -0600"
   #   time.to_fs(:iso8601)      # => "2007-01-18T06:10:17-06:00"
   #
   # == Adding your own time formats to +to_fs+

data/lib/active_support/delegation.rb CHANGED Viewed

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
-require "set"
 module ActiveSupport
   # Error generated by +delegate+ when a method is called on +nil+ and +allow_nil+
   # option is not used.

data/lib/active_support/dependencies.rb CHANGED Viewed

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
-require "set"
 require "active_support/dependencies/interlock"
 module ActiveSupport # :nodoc:

data/lib/active_support/deprecation/reporting.rb CHANGED Viewed

@@ -139,7 +139,6 @@ module ActiveSupport
         def extract_callstack(callstack)
           return [] if callstack.empty?
-          return _extract_callstack(callstack) if callstack.first.is_a? String
           offending_line = callstack.find { |frame|
             # Code generated with `eval` doesn't have an `absolute_path`, e.g. templates.
@@ -150,24 +149,6 @@ module ActiveSupport
           [offending_line.path, offending_line.lineno, offending_line.label]
         end
-        def _extract_callstack(callstack)
-          ActiveSupport.deprecator.warn(<<~MESSAGE)
-            Passing the result of `caller` to ActiveSupport::Deprecation#warn is deprecated and will be removed in Rails 8.0.
-            Please pass the result of `caller_locations` instead.
-          MESSAGE
-          offending_line = callstack.find { |line| !ignored_callstack?(line) } || callstack.first
-          if offending_line
-            if md = offending_line.match(/^(.+?):(\d+)(?::in `(.*?)')?/)
-              md.captures
-            else
-              offending_line
-            end
-          end
-        end
         RAILS_GEM_ROOT = File.expand_path("../../../..", __dir__) + "/" # :nodoc:
         LIB_DIR = RbConfig::CONFIG["libdir"] # :nodoc:

data/lib/active_support/deprecation.rb CHANGED Viewed

@@ -68,7 +68,7 @@ module ActiveSupport
     # and the second is a library name.
     #
     #   ActiveSupport::Deprecation.new('2.0', 'MyLibrary')
-    def initialize(deprecation_horizon = "8.0", gem_name = "Rails")
+    def initialize(deprecation_horizon = "8.1", gem_name = "Rails")
       self.gem_name = gem_name
       self.deprecation_horizon = deprecation_horizon
       # By default, warnings are not silenced and debugging is off.

data/lib/active_support/duration.rb CHANGED Viewed

@@ -491,17 +491,21 @@ module ActiveSupport
         if @parts.empty?
           time.since(sign * value)
         else
-          @parts.inject(time) do |t, (type, number)|
-            if type == :seconds
-              t.since(sign * number)
-            elsif type == :minutes
-              t.since(sign * number * 60)
-            elsif type == :hours
-              t.since(sign * number * 3600)
-            else
-              t.advance(type => sign * number)
-            end
+          @parts.each do |type, number|
+            t = time
+            time =
+              if type == :seconds
+                t.since(sign * number)
+              elsif type == :minutes
+                t.since(sign * number * 60)
+              elsif type == :hours
+                t.since(sign * number * 3600)
+              else
+                t.advance(type => sign * number)
+              end
           end
+          time
         end
       end

data/lib/active_support/encrypted_configuration.rb CHANGED Viewed

@@ -43,6 +43,12 @@ module ActiveSupport
       end
     end
+    class InvalidKeyError < RuntimeError
+      def initialize(content_path, key)
+        super "Key '#{key}' is invalid, it must respond to '#to_sym' from configuration in '#{content_path}'."
+      end
+    end
     delegate_missing_to :options
     def initialize(config_path:, key_path:, env_key:, raise_if_missing_key:)
@@ -61,7 +67,11 @@ module ActiveSupport
     end
     def validate! # :nodoc:
-      deserialize(read)
+      deserialize(read).each_key do |key|
+        key.to_sym
+      rescue NoMethodError
+        raise InvalidKeyError.new(content_path, key)
+      end
     end
     # Returns the decrypted content as a Hash with symbolized keys.
@@ -73,7 +83,7 @@ module ActiveSupport
     #   # => { some_secret: 123, some_namespace: { another_secret: 789 } }
     #
     def config
-      @config ||= deserialize(read).deep_symbolize_keys
+      @config ||= deep_symbolize_keys(deserialize(read))
     end
     def inspect # :nodoc:
@@ -81,6 +91,14 @@ module ActiveSupport
     end
     private
+      def deep_symbolize_keys(hash)
+        hash.deep_transform_keys do |key|
+          key.to_sym
+        rescue NoMethodError
+          raise InvalidKeyError.new(content_path, key)
+        end
+      end
       def deep_transform(hash)
         return hash unless hash.is_a?(Hash)

data/lib/active_support/error_reporter.rb CHANGED Viewed

@@ -144,9 +144,9 @@ module ActiveSupport
     #
     def unexpected(error, severity: :warning, context: {}, source: DEFAULT_SOURCE)
       error = RuntimeError.new(error) if error.is_a?(String)
-      error.set_backtrace(caller(1)) if error.backtrace.nil?
       if @debug_mode
+        ensure_backtrace(error)
         raise UnexpectedError, "#{error.class.name}: #{error.message}", error.backtrace, cause: error
       else
         report(error, handled: true, severity: severity, context: context, source: source)
@@ -209,6 +209,7 @@ module ActiveSupport
     #
     def report(error, handled: true, severity: handled ? :warning : :error, context: {}, source: DEFAULT_SOURCE)
       return if error.instance_variable_defined?(:@__rails_error_reported)
+      ensure_backtrace(error)
       unless SEVERITIES.include?(severity)
         raise ArgumentError, "severity must be one of #{SEVERITIES.map(&:inspect).join(", ")}, got: #{severity.inspect}"
@@ -237,5 +238,28 @@ module ActiveSupport
       nil
     end
+    private
+      def ensure_backtrace(error)
+        return if error.frozen? # re-raising won't add a backtrace
+        return unless error.backtrace.nil?
+        begin
+          # We could use Exception#set_backtrace, but until Ruby 3.4
+          # it only support setting `Exception#backtrace` and not
+          # `Exception#backtrace_locations`. So raising the exception
+          # is a good way to build a real backtrace.
+          raise error
+        rescue error.class => error
+        end
+        count = 0
+        while error.backtrace_locations.first&.path == __FILE__
+          count += 1
+          error.backtrace_locations.shift
+        end
+        error.backtrace.shift(count)
+      end
   end
 end

data/lib/active_support/evented_file_update_checker.rb CHANGED Viewed

@@ -3,7 +3,6 @@
 gem "listen", "~> 3.5"
 require "listen"
-require "set"
 require "pathname"
 require "concurrent/atomic/atomic_boolean"

data/lib/active_support/gem_version.rb CHANGED Viewed

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

data/lib/active_support/hash_with_indifferent_access.rb CHANGED Viewed

@@ -313,10 +313,6 @@ module ActiveSupport
     end
     alias_method :without, :except
-    def stringify_keys!; self end
-    def deep_stringify_keys!; self end
-    def stringify_keys; dup end
-    def deep_stringify_keys; dup end
     undef :symbolize_keys!
     undef :deep_symbolize_keys!
     def symbolize_keys; to_hash.symbolize_keys! end
@@ -378,13 +374,10 @@ module ActiveSupport
     # Convert to a regular hash with string keys.
     def to_hash
-      _new_hash = Hash.new
-      set_defaults(_new_hash)
-      each do |key, value|
-        _new_hash[key] = convert_value(value, conversion: :to_hash)
-      end
-      _new_hash
+      copy = Hash[self]
+      copy.transform_values! { |v| convert_value_to_hash(v) }
+      set_defaults(copy)
+      copy
     end
     def to_proc
@@ -398,11 +391,7 @@ module ActiveSupport
       def convert_value(value, conversion: nil)
         if value.is_a? Hash
-          if conversion == :to_hash
-            value.to_hash
-          else
-            value.nested_under_indifferent_access
-          end
+          value.nested_under_indifferent_access
         elsif value.is_a?(Array)
           if conversion != :assignment || value.frozen?
             value = value.dup
@@ -413,6 +402,17 @@ module ActiveSupport
         end
       end
+      def convert_value_to_hash(value)
+        if value.is_a? Hash
+          value.to_hash
+        elsif value.is_a?(Array)
+          value.map { |e| convert_value_to_hash(e) }
+        else
+          value
+        end
+      end
       def set_defaults(target)
         if default_proc
           target.default_proc = default_proc.dup