activesupport 7.2.0.beta1 → 7.2.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e43bd2e8809b8fdeeb3e6235678e3791be3fb235c8afbb2ff0bd6c265120931e
-  data.tar.gz: d1db0dcc3e5c4c4f9e7b6662b6d6a9cd5e107dd26a8becfb6a29617f185486f0
+  metadata.gz: ebee3f86f1ae5a137af35d239383bd331c70684d4f6ab9635d7c5801906e9f93
+  data.tar.gz: 0a455dc9c538504271019964e3172493cede9f99dd554cc2265bc73c99eccc74
 SHA512:
-  metadata.gz: fa5134053c7d9e38e4aed9f149f8c988487a0d482119070cd99edcca242f4701387d2a8370b60efb09d1d50cca85e57d8950685c49d83a6d12988f3f9d4d0c5e
-  data.tar.gz: 519b1b079064c4ffce15664002efc7b240b035569a5356dbabd5e6ca799624598ba908db03a6108043bcdade5947262e3becc243925ba64848d40e29426d0bc6
+  metadata.gz: d6c7cc205859ceaa853b4a235c242e93cfd857a1325a4a9b0e90bdf8af2490e3b3875ae77d1f3cb75bcf0ac60c1aeb159f1195b667715d1e3a940bf014cad339
+  data.tar.gz: 59da4cf50826bebca6bdfaca2a1c00f053fa3c3bcb12017ff4acb16fcfcfdc7b94afa07ef761644d1dfe56fc5bc6dd147b808ed5d40ec2ec46f9c208eda48ee2

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## Rails 7.2.0.beta3 (July 11, 2024) ##
+
+*   Add `logger` as a dependency since it is a bundled gem candidate for Ruby 3.5
+
+    *Earlopain*
+
+## Rails 7.2.0.beta2 (June 04, 2024) ##
+
+*   Define `Digest::UUID.nil_uuid`, which returns the so-called nil UUID.
+
+    *Xavier Noria*
+
 ## Rails 7.2.0.beta1 (May 29, 2024) ##
 
 *   Support `duration` type in `ActiveSupport::XmlMini`.
@@ -122,18 +134,6 @@
 
     *Sean Doyle*
 
-*   Remove deprecated support for the pre-Ruby 2.4 behavior of `to_time` returning a `Time` object with local timezone.
-
-    *Rafael Mendonça França*
-
-*   Deprecate `config.active_support.to_time_preserves_timezone`.
-
-    *Rafael Mendonça França*
-
-*   Deprecate `DateAndTime::Compatibility.preserve_timezone`.
-
-    *Rafael Mendonça França*
-
 *   Yield instance to `Object#with` block.
 
     ```ruby

data/lib/active_support/broadcast_logger.rb

@@ -229,6 +229,7 @@ module ActiveSupport
     private
       def dispatch(&block)
         @broadcasts.each { |logger| block.call(logger) }
+        true
       end
 
       def method_missing(name, ...)

data/lib/active_support/code_generator.rb

@@ -9,16 +9,19 @@ module ActiveSupport
         @cache = METHOD_CACHES[namespace]
         @sources = []
         @methods = {}
+        @canonical_methods = {}
       end
 
-      def define_cached_method(name, as: name)
-        name = name.to_sym
-        as = as.to_sym
-        @methods.fetch(name) do
-          unless @cache.method_defined?(as)
+      def define_cached_method(canonical_name, as: nil)
+        canonical_name = canonical_name.to_sym
+        as = (as || canonical_name).to_sym
+
+        @methods.fetch(as) do
+          unless @cache.method_defined?(canonical_name) || @canonical_methods[canonical_name]
             yield @sources
           end
-          @methods[name] = as
+          @canonical_methods[canonical_name] = true
+          @methods[as] = canonical_name
         end
       end
 
@@ -26,8 +29,10 @@ module ActiveSupport
         unless @sources.empty?
           @cache.module_eval("# frozen_string_literal: true\n" + @sources.join(";"), path, line)
         end
-        @methods.each do |name, as|
-          owner.define_method(name, @cache.instance_method(as))
+        @canonical_methods.clear
+
+        @methods.each do |as, canonical_name|
+          owner.define_method(as, @cache.instance_method(canonical_name))
         end
       end
     end
@@ -52,8 +57,8 @@ module ActiveSupport
       @namespaces = Hash.new { |h, k| h[k] = MethodSet.new(k) }
     end
 
-    def define_cached_method(name, namespace:, as: name, &block)
-      @namespaces[namespace].define_cached_method(name, as: as, &block)
+    def define_cached_method(canonical_name, namespace:, as: nil, &block)
+      @namespaces[namespace].define_cached_method(canonical_name, as: as, &block)
     end
 
     def execute

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

@@ -1,9 +1,45 @@
 # frozen_string_literal: true
 
 require "active_support/core_ext/module/attribute_accessors"
+require "active_support/core_ext/module/redefine_method"
 
 module DateAndTime
   module Compatibility
+    # If true, +to_time+ preserves the timezone offset of receiver.
+    #
+    # NOTE: With Ruby 2.4+ the default for +to_time+ changed from
+    # converting to the local system time, to preserving the offset
+    # of the receiver. For backwards compatibility we're overriding
+    # this behavior, but new apps will have an initializer that sets
+    # this to true, because the new behavior is preferred.
+    mattr_accessor :preserve_timezone, instance_accessor: false, default: nil
+
+    singleton_class.silence_redefinition_of_method :preserve_timezone
+
+    #--
+    # This re-implements the behaviour of the mattr_reader, instead
+    # of prepending on to it, to avoid overcomplicating a module that
+    # is in turn included in several places. This will all go away in
+    # Rails 8.0 anyway.
+    def self.preserve_timezone # :nodoc:
+      if @@preserve_timezone.nil?
+        # 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`."
+        )
+
+        @@preserve_timezone = false
+      end
+
+      @@preserve_timezone
+    end
+
+    def preserve_timezone # :nodoc:
+      Compatibility.preserve_timezone
+    end
+
     # Change the output of <tt>ActiveSupport::TimeZone.utc_to_local</tt>.
     #
     # When +true+, it returns local times with a UTC offset, with +false+ local
@@ -18,17 +54,5 @@ module DateAndTime
     #   # With `utc_to_local_returns_utc_offset_times = true`, local time is returned with UTC offset:
     #   zone.utc_to_local(Time.utc(2000, 1)) # => 1999-12-31 19:00:00 -0500
     mattr_accessor :utc_to_local_returns_utc_offset_times, instance_writer: false, default: false
-
-    def self.preserve_timezone
-      ActiveSupport.deprecator.warn(
-        "`DateAndTime::Compatibility.preserve_timezone` has been deprecated and will be removed in Rails 7.3."
-      )
-    end
-
-    def self.preserve_timezone=(value)
-      ActiveSupport.deprecator.warn(
-        "`DateAndTime::Compatibility.preserve_timezone=` has been deprecated and will be removed in Rails 7.3."
-      )
-    end
   end
 end

data/lib/active_support/core_ext/date_time/compatibility.rb

@@ -8,9 +8,11 @@ class DateTime
 
   silence_redefinition_of_method :to_time
 
-  # Return an instance of +Time+ with the same UTC offset
-  # as +self+.
+  # Either return an instance of +Time+ with the same UTC offset
+  # as +self+ or an instance of +Time+ representing the same time
+  # in the local system timezone depending on the setting of
+  # on the setting of +ActiveSupport.to_time_preserves_timezone+.
   def to_time
-    getlocal(utc_offset)
+    preserve_timezone ? getlocal(utc_offset) : getlocal
   end
 end

data/lib/active_support/core_ext/digest/uuid.rb

@@ -53,6 +53,12 @@ module Digest
       SecureRandom.uuid
     end
 
+    # Returns the nil UUID. This is a special form of UUID that is specified to
+    # have all 128 bits set to zero.
+    def self.nil_uuid
+      "00000000-0000-0000-0000-000000000000"
+    end
+
     def self.pack_uuid_namespace(namespace)
       if [DNS_NAMESPACE, OID_NAMESPACE, URL_NAMESPACE, X500_NAMESPACE].include?(namespace)
         namespace

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

@@ -25,7 +25,7 @@ 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 7.3.
+          Setting `attr_internal_naming_format` with a `@` prefix is deprecated and will be removed in Rails 8.0.
 
           You can simply replace #{format.inspect} by #{format.delete_prefix("@").inspect}.
         MESSAGE

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

@@ -319,7 +319,12 @@ class Time
     if other.class == Time
       compare_without_coercion(other)
     elsif other.is_a?(Time)
-      compare_without_coercion(other.to_time)
+      # also avoid ActiveSupport::TimeWithZone#to_time before Rails 8.0
+      if other.respond_to?(:comparable_time)
+        compare_without_coercion(other.comparable_time)
+      else
+        compare_without_coercion(other.to_time)
+      end
     else
       to_datetime <=> other
     end

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

@@ -8,8 +8,25 @@ class Time
 
   silence_redefinition_of_method :to_time
 
-  # Returns +self+.
+  # Either return +self+ or the time in the local system timezone depending
+  # on the setting of +ActiveSupport.to_time_preserves_timezone+.
   def to_time
-    self
+    preserve_timezone ? self : getlocal
   end
+
+  def preserve_timezone # :nodoc:
+    active_support_local_zone == zone || super
+  end
+
+  private
+    @@active_support_local_tz = nil
+
+    def active_support_local_zone
+      @@active_support_local_zone = nil if @@active_support_local_tz != ENV["TZ"]
+      @@active_support_local_zone ||=
+        begin
+          @@active_support_local_tz = ENV["TZ"]
+          Time.new.zone
+        end
+    end
 end

data/lib/active_support/deprecation/reporting.rb

@@ -152,7 +152,7 @@ module ActiveSupport
 
         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 7.3.
+            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

data/lib/active_support/deprecation.rb

@@ -68,7 +68,7 @@ module ActiveSupport
     # and the second is a library name.
     #
     #   ActiveSupport::Deprecation.new('2.0', 'MyLibrary')
-    def initialize(deprecation_horizon = "7.3", gem_name = "Rails")
+    def initialize(deprecation_horizon = "8.0", 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/gem_version.rb

@@ -10,7 +10,7 @@ module ActiveSupport
     MAJOR = 7
     MINOR = 2
     TINY  = 0
-    PRE   = "beta1"
+    PRE   = "beta3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_support/logger_thread_safe_level.rb

@@ -7,14 +7,6 @@ module ActiveSupport
   module LoggerThreadSafeLevel # :nodoc:
     extend ActiveSupport::Concern
 
-    Logger::Severity.constants.each do |severity|
-      class_eval(<<-EOT, __FILE__, __LINE__ + 1)
-        def #{severity.downcase}?                # def debug?
-          Logger::#{severity} >= level           #   DEBUG >= level
-        end                                      # end
-      EOT
-    end
-
     def local_level
       IsolatedExecutionState[local_level_key]
     end

data/lib/active_support/message_verifier.rb

@@ -30,6 +30,18 @@ module ActiveSupport
   #     self.current_user = User.find(id)
   #   end
   #
+  # === Signing is not encryption
+  #
+  # The signed messages are not encrypted. The payload is merely encoded (Base64 by default) and can be decoded by
+  # anyone. The signature is just assuring that the message wasn't tampered with. For example:
+  #
+  #     message = Rails.application.message_verifier('my_purpose').generate('never put secrets here')
+  #     # => "BAhJIhtuZXZlciBwdXQgc2VjcmV0cyBoZXJlBjoGRVQ=--a0c1c0827919da5e949e989c971249355735e140"
+  #     Base64.decode64(message.split("--").first) # no key needed
+  #     # => 'never put secrets here'
+  #
+  # If you also need to encrypt the contents, you must use ActiveSupport::MessageEncryptor instead.
+  #
   # === Confine messages to a specific purpose
   #
   # It's not recommended to use the same verifier for different purposes in your application.

data/lib/active_support/proxy_object.rb

@@ -12,7 +12,7 @@ module ActiveSupport
 
     def self.inherited(_subclass)
       ::ActiveSupport.deprecator.warn(<<~MSG)
-        ActiveSupport::ProxyObject is deprecated and will be removed in Rails 7.3.
+        ActiveSupport::ProxyObject is deprecated and will be removed in Rails 8.0.
         Use Ruby's built-in BasicObject instead.
       MSG
     end

data/lib/active_support/syntax_error_proxy.rb

@@ -45,7 +45,7 @@ module ActiveSupport
 
     private
       def parse_message_for_trace
-        if source_location_eval?
+        if __getobj__.to_s.start_with?("(eval")
           # If the exception is coming from a call to eval, we need to keep
           # the path of the file in which eval was called to ensure we can
           # return the right source fragment to show the location of the
@@ -56,15 +56,5 @@ module ActiveSupport
           __getobj__.to_s.split("\n")
         end
       end
-
-      if SyntaxError.method_defined?(:path) # Ruby 3.3+
-        def source_location_eval?
-          __getobj__.path.start_with?("(eval")
-        end
-      else # 3.2 and older versions of Ruby
-        def source_location_eval?
-          __getobj__.to_s.start_with?("(eval")
-        end
-      end
   end
 end

data/lib/active_support/tagged_logging.rb

@@ -2,7 +2,6 @@
 
 require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/object/blank"
-require "logger"
 require "active_support/logger"
 
 module ActiveSupport

data/lib/active_support/testing/time_helpers.rb

@@ -163,10 +163,10 @@ module ActiveSupport
           now = date_or_time.midnight.to_time
         elsif date_or_time.is_a?(String)
           now = Time.zone.parse(date_or_time)
-        elsif with_usec
-          now = date_or_time.to_time
         else
-          now = date_or_time.to_time.change(usec: 0)
+          now = date_or_time
+          now = now.to_time unless now.is_a?(Time)
+          now = now.change(usec: 0) unless with_usec
         end
 
         # +now+ must be in local system timezone, because +Time.at(now)+

data/lib/active_support/time_with_zone.rb

@@ -332,7 +332,7 @@ module ActiveSupport
     #
     def -(other)
       if other.acts_like?(:time)
-        to_time - other.to_time
+        getutc - other.getutc
       elsif duration_of_variable_length?(other)
         method_missing(:-, other)
       else
@@ -479,10 +479,15 @@ module ActiveSupport
       @to_datetime ||= utc.to_datetime.new_offset(Rational(utc_offset, 86_400))
     end
 
-    # Returns an instance of +Time+ with the same UTC offset
-    # as +self+.
+    # Returns an instance of +Time+, either with the same UTC offset
+    # as +self+ or in the local system timezone depending on the setting
+    # of +ActiveSupport.to_time_preserves_timezone+.
     def to_time
-      @to_time_with_instance_offset ||= getlocal(utc_offset)
+      if preserve_timezone
+        @to_time_with_instance_offset ||= getlocal(utc_offset)
+      else
+        @to_time_with_system_offset ||= getlocal
+      end
     end
 
     # So that +self+ <tt>acts_like?(:time)</tt>.

data/lib/active_support.rb

@@ -111,15 +111,17 @@ module ActiveSupport
   end
 
   def self.to_time_preserves_timezone
-    ActiveSupport.deprecator.warn(
-      "`config.active_support.to_time_preserves_timezone` has been deprecated and will be removed in Rails 7.3."
-    )
+    DateAndTime::Compatibility.preserve_timezone
   end
 
   def self.to_time_preserves_timezone=(value)
-    ActiveSupport.deprecator.warn(
-      "`config.active_support.to_time_preserves_timezone` has been deprecated and will be removed in Rails 7.3."
-    )
+    unless value
+      ActiveSupport.deprecator.warn(
+        "Support for the pre-Ruby 2.4 behavior of to_time has been deprecated and will be removed in Rails 8.0."
+      )
+    end
+
+    DateAndTime::Compatibility.preserve_timezone = value
   end
 
   def self.utc_to_local_returns_utc_offset_times

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 7.2.0.beta1
+  version: 7.2.0.beta3
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-29 00:00:00.000000000 Z
+date: 2024-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -140,6 +140,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.2
 description: A toolkit of support libraries and Ruby core extensions extracted from
   the Rails framework. Rich support for multibyte strings, internationalization, time
   zones, and testing.
@@ -438,10 +452,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.2.0.beta1/activesupport/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.2.0.beta1/
+  changelog_uri: https://github.com/rails/rails/blob/v7.2.0.beta3/activesupport/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.2.0.beta3/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.2.0.beta1/activesupport
+  source_code_uri: https://github.com/rails/rails/tree/v7.2.0.beta3/activesupport
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options:
@@ -460,7 +474,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: A toolkit of support libraries and Ruby core extensions extracted from the