activesupport 6.1.4.6 → 7.0.0.alpha1

data/lib/active_support/time_with_zone.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "yaml"
+
 require "active_support/duration"
 require "active_support/values/time_zone"
 require "active_support/core_ext/object/acts_like"
@@ -40,6 +42,13 @@ module ActiveSupport
   class TimeWithZone
     # Report class name as 'Time' to thwart type checking.
     def self.name
+      ActiveSupport::Deprecation.warn(<<~EOM)
+        ActiveSupport::TimeWithZone.name has been deprecated and
+        from Rails 7.1 will use the default Ruby implementation.
+        You can set `config.active_support.remove_deprecated_time_with_zone_name = true`
+        to enable the new behavior now.
+      EOM
+
       "Time"
     end
 
@@ -172,12 +181,11 @@ module ActiveSupport
       end
     end
 
-    def init_with(coder) #:nodoc:
+    def init_with(coder) # :nodoc:
       initialize(coder["utc"], coder["zone"], coder["time"])
     end
 
-    def encode_with(coder) #:nodoc:
-      coder.tag = "!ruby/object:ActiveSupport::TimeWithZone"
+    def encode_with(coder) # :nodoc:
       coder.map = { "utc" => utc, "zone" => time_zone, "time" => time }
     end
 
@@ -440,7 +448,7 @@ module ActiveSupport
       [time.sec, time.min, time.hour, time.day, time.mon, time.year, time.wday, time.yday, dst?, zone]
     end
 
-    # Returns the object's date and time as a floating point number of seconds
+    # Returns the object's date and time as a floating-point number of seconds
     # since the Epoch (January 1, 1970 00:00 UTC).
     #
     #   Time.zone.now.to_f # => 1417709320.285418
@@ -534,7 +542,7 @@ module ActiveSupport
     def method_missing(sym, *args, &block)
       wrap_with_time_zone time.__send__(sym, *args, &block)
     rescue NoMethodError => e
-      raise e, e.message.sub(time.inspect, inspect), e.backtrace
+      raise e, e.message.sub(time.inspect, inspect).sub("Time", "ActiveSupport::TimeWithZone"), e.backtrace
     end
 
     private
@@ -568,7 +576,7 @@ module ActiveSupport
       end
 
       def duration_of_variable_length?(obj)
-        ActiveSupport::Duration === obj && obj.parts.any? { |p| [:years, :months, :weeks, :days].include?(p[0]) }
+        ActiveSupport::Duration === obj && obj.variable?
       end
 
       def wrap_with_time_zone(time)
@@ -583,3 +591,8 @@ module ActiveSupport
       end
   end
 end
+
+# These prevent Psych from calling `ActiveSupport::TimeWithZone.name`
+# and triggering the deprecation warning about the change in Rails 7.1.
+YAML.load_tags["!ruby/object:ActiveSupport::TimeWithZone"] = "ActiveSupport::TimeWithZone"
+YAML.dump_tags[ActiveSupport::TimeWithZone] = "!ruby/object:ActiveSupport::TimeWithZone"

data/lib/active_support/values/time_zone.rb

@@ -229,12 +229,16 @@ module ActiveSupport
       # Returns +nil+ if no such time zone is known to the system.
       def [](arg)
         case arg
+        when self
+          arg
         when String
           begin
             @lazy_zones_map[arg] ||= create(arg)
           rescue TZInfo::InvalidTimezoneIdentifier
             nil
           end
+        when TZInfo::Timezone
+          @lazy_zones_map[arg.name] ||= create(arg.name, nil, arg)
         when Numeric, ActiveSupport::Duration
           arg *= 3600 if arg.abs <= 13
           all.find { |z| z.utc_offset == arg.to_i }
@@ -256,7 +260,7 @@ module ActiveSupport
         @country_zones[code] ||= load_country_zones(code)
       end
 
-      def clear #:nodoc:
+      def clear # :nodoc:
         @lazy_zones_map = Concurrent::Map.new
         @country_zones  = Concurrent::Map.new
         @zones = nil
@@ -383,12 +387,21 @@ module ActiveSupport
     def iso8601(str)
       parts = Date._iso8601(str)
 
-      raise ArgumentError, "invalid date" if parts.empty?
+      year = parts.fetch(:year)
+
+      if parts.key?(:yday)
+        ordinal_date = Date.ordinal(year, parts.fetch(:yday))
+        month = ordinal_date.month
+        day = ordinal_date.day
+      else
+        month = parts.fetch(:mon)
+        day = parts.fetch(:mday)
+      end
 
       time = Time.new(
-        parts.fetch(:year),
-        parts.fetch(:mon),
-        parts.fetch(:mday),
+        year,
+        month,
+        day,
         parts.fetch(:hour, 0),
         parts.fetch(:min, 0),
         parts.fetch(:sec, 0) + parts.fetch(:sec_fraction, 0),
@@ -400,6 +413,9 @@ module ActiveSupport
       else
         TimeWithZone.new(nil, self, time)
       end
+
+    rescue Date::Error, KeyError
+      raise ArgumentError, "invalid date"
     end
 
     # Method for creating new ActiveSupport::TimeWithZone instance in time zone
@@ -512,7 +528,7 @@ module ActiveSupport
     def utc_to_local(time)
       tzinfo.utc_to_local(time).yield_self do |t|
         ActiveSupport.utc_to_local_returns_utc_offset_times ?
-          t : Time.utc(t.year, t.month, t.day, t.hour, t.min, t.sec, t.sec_fraction)
+          t : Time.utc(t.year, t.month, t.day, t.hour, t.min, t.sec, t.sec_fraction * 1_000_000)
       end
     end
 
@@ -534,15 +550,15 @@ module ActiveSupport
       tzinfo.period_for_local(time, dst) { |periods| periods.last }
     end
 
-    def periods_for_local(time) #:nodoc:
+    def periods_for_local(time) # :nodoc:
       tzinfo.periods_for_local(time)
     end
 
-    def init_with(coder) #:nodoc:
+    def init_with(coder) # :nodoc:
       initialize(coder["name"])
     end
 
-    def encode_with(coder) #:nodoc:
+    def encode_with(coder) # :nodoc:
       coder.tag = "!ruby/object:#{self.class}"
       coder.map = { "name" => tzinfo.name }
     end

data/lib/active_support/xml_mini/jdom.rb

@@ -15,7 +15,7 @@ java_import org.xml.sax.Attributes unless defined? Attributes
 java_import org.w3c.dom.Node unless defined? Node
 
 module ActiveSupport
-  module XmlMini_JDOM #:nodoc:
+  module XmlMini_JDOM # :nodoc:
     extend self
 
     CONTENT_KEY = "__content__"

data/lib/active_support/xml_mini/libxml.rb

@@ -5,7 +5,7 @@ require "active_support/core_ext/object/blank"
 require "stringio"
 
 module ActiveSupport
-  module XmlMini_LibXML #:nodoc:
+  module XmlMini_LibXML # :nodoc:
     extend self
 
     # Parse an XML Document string or IO into a simple hash using libxml.
@@ -25,15 +25,15 @@ module ActiveSupport
   end
 end
 
-module LibXML #:nodoc:
-  module Conversions #:nodoc:
-    module Document #:nodoc:
+module LibXML # :nodoc:
+  module Conversions # :nodoc:
+    module Document # :nodoc:
       def to_hash
         root.to_hash
       end
     end
 
-    module Node #:nodoc:
+    module Node # :nodoc:
       CONTENT_ROOT = "__content__"
 
       # Convert XML document to hash.

data/lib/active_support/xml_mini/libxmlsax.rb

@@ -5,7 +5,7 @@ require "active_support/core_ext/object/blank"
 require "stringio"
 
 module ActiveSupport
-  module XmlMini_LibXMLSAX #:nodoc:
+  module XmlMini_LibXMLSAX # :nodoc:
     extend self
 
     # Class that will build the hash while the XML document

data/lib/active_support/xml_mini/nokogiri.rb

@@ -10,7 +10,7 @@ require "active_support/core_ext/object/blank"
 require "stringio"
 
 module ActiveSupport
-  module XmlMini_Nokogiri #:nodoc:
+  module XmlMini_Nokogiri # :nodoc:
     extend self
 
     # Parse an XML Document string or IO into a simple hash using libxml / nokogiri.
@@ -30,14 +30,14 @@ module ActiveSupport
       end
     end
 
-    module Conversions #:nodoc:
-      module Document #:nodoc:
+    module Conversions # :nodoc:
+      module Document # :nodoc:
         def to_hash
           root.to_hash
         end
       end
 
-      module Node #:nodoc:
+      module Node # :nodoc:
         CONTENT_ROOT = "__content__"
 
         # Convert XML document to hash.

data/lib/active_support/xml_mini/nokogirisax.rb

@@ -10,7 +10,7 @@ require "active_support/core_ext/object/blank"
 require "stringio"
 
 module ActiveSupport
-  module XmlMini_NokogiriSAX #:nodoc:
+  module XmlMini_NokogiriSAX # :nodoc:
     extend self
 
     # Class that will build the hash while the XML document

data/lib/active_support/xml_mini/rexml.rb

@@ -5,7 +5,7 @@ require "active_support/core_ext/object/blank"
 require "stringio"
 
 module ActiveSupport
-  module XmlMini_REXML #:nodoc:
+  module XmlMini_REXML # :nodoc:
     extend self
 
     CONTENT_KEY = "__content__"

data/lib/active_support/xml_mini.rb

@@ -19,7 +19,7 @@ module ActiveSupport
 
     # This module decorates files deserialized using Hash.from_xml with
     # the <tt>original_filename</tt> and <tt>content_type</tt> methods.
-    module FileLike #:nodoc:
+    module FileLike # :nodoc:
       attr_writer :original_filename, :content_type
 
       def original_filename
@@ -50,6 +50,7 @@ module ActiveSupport
         "Hash"       => "hash"
       }
     end
+    TYPE_NAMES["ActiveSupport::TimeWithZone"] = TYPE_NAMES["Time"]
 
     FORMATTING = {
       "symbol"   => Proc.new { |symbol| symbol.to_s },

data/lib/active_support.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# Copyright (c) 2005-2020 David Heinemeier Hansson
+# Copyright (c) 2005-2021 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -87,6 +87,15 @@ module ActiveSupport
   end
 
   cattr_accessor :test_order # :nodoc:
+  cattr_accessor :test_parallelization_threshold, default: 50 # :nodoc:
+
+  def self.cache_format_version
+    Cache.format_version
+  end
+
+  def self.cache_format_version=(value)
+    Cache.format_version = value
+  end
 
   def self.to_time_preserves_timezone
     DateAndTime::Compatibility.preserve_timezone
@@ -103,6 +112,10 @@ module ActiveSupport
   def self.utc_to_local_returns_utc_offset_times=(value)
     DateAndTime::Compatibility.utc_to_local_returns_utc_offset_times = value
   end
+
+  def self.current_attributes_use_thread_variables=(value)
+    CurrentAttributes._use_thread_variables = value
+  end
 end
 
 autoload :I18n, "active_support/i18n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 6.1.4.6
+  version: 7.0.0.alpha1
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -64,20 +64,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
-- !ruby/object:Gem::Dependency
-  name: zeitwerk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +164,6 @@ files:
 - lib/active_support/core_ext/kernel/reporting.rb
 - lib/active_support/core_ext/kernel/singleton_class.rb
 - lib/active_support/core_ext/load_error.rb
-- lib/active_support/core_ext/marshal.rb
 - lib/active_support/core_ext/module.rb
 - lib/active_support/core_ext/module/aliasing.rb
 - lib/active_support/core_ext/module/anonymous.rb
@@ -245,7 +230,7 @@ files:
 - lib/active_support/dependencies.rb
 - lib/active_support/dependencies/autoload.rb
 - lib/active_support/dependencies/interlock.rb
-- lib/active_support/dependencies/zeitwerk_integration.rb
+- lib/active_support/dependencies/require_dependency.rb
 - lib/active_support/deprecation.rb
 - lib/active_support/deprecation/behaviors.rb
 - lib/active_support/deprecation/constant_accessor.rb
@@ -337,6 +322,7 @@ files:
 - lib/active_support/testing/parallelization.rb
 - lib/active_support/testing/parallelization/server.rb
 - lib/active_support/testing/parallelization/worker.rb
+- lib/active_support/testing/parallelize_executor.rb
 - lib/active_support/testing/setup_and_teardown.rb
 - lib/active_support/testing/stream.rb
 - lib/active_support/testing/tagged_logging.rb
@@ -357,11 +343,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.4.6/activesupport/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.4.6/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.0.alpha1/activesupport/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.0.alpha1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.4.6/activesupport
-post_install_message:
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.0.alpha1/activesupport
+post_install_message: 
 rdoc_options:
 - "--encoding"
 - UTF-8
@@ -371,15 +357,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: A toolkit of support libraries and Ruby core extensions extracted from the
   Rails framework.

data/lib/active_support/core_ext/marshal.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require "active_support/core_ext/string/inflections"
-
-module ActiveSupport
-  module MarshalWithAutoloading # :nodoc:
-    def load(source, proc = nil)
-      super(source, proc)
-    rescue ArgumentError, NameError => exc
-      if exc.message.match(%r|undefined class/module (.+?)(?:::)?\z|)
-        # try loading the class/module
-        loaded = $1.constantize
-
-        raise unless $1 == loaded.name
-
-        # if it is an IO we need to go back to read the object
-        source.rewind if source.respond_to?(:rewind)
-        retry
-      else
-        raise exc
-      end
-    end
-  end
-end
-
-Marshal.singleton_class.prepend(ActiveSupport::MarshalWithAutoloading)

data/lib/active_support/dependencies/zeitwerk_integration.rb

@@ -1,117 +0,0 @@
-# frozen_string_literal: true
-
-require "set"
-require "active_support/core_ext/string/inflections"
-
-module ActiveSupport
-  module Dependencies
-    module ZeitwerkIntegration # :nodoc: all
-      module Decorations
-        def clear
-          Dependencies.unload_interlock do
-            Rails.autoloaders.main.reload
-          rescue Zeitwerk::ReloadingDisabledError
-            raise "reloading is disabled because config.cache_classes is true"
-          end
-        end
-
-        def constantize(cpath)
-          ActiveSupport::Inflector.constantize(cpath)
-        end
-
-        def safe_constantize(cpath)
-          ActiveSupport::Inflector.safe_constantize(cpath)
-        end
-
-        def autoloaded_constants
-          Rails.autoloaders.main.unloadable_cpaths
-        end
-
-        def autoloaded?(object)
-          cpath = object.is_a?(Module) ? real_mod_name(object) : object.to_s
-          Rails.autoloaders.main.unloadable_cpath?(cpath)
-        end
-
-        def verbose=(verbose)
-          l = verbose ? logger || Rails.logger : nil
-          Rails.autoloaders.each { |autoloader| autoloader.logger = l }
-        end
-
-        def unhook!
-          :no_op
-        end
-      end
-
-      module RequireDependency
-        def require_dependency(filename)
-          filename = filename.to_path if filename.respond_to?(:to_path)
-          if abspath = ActiveSupport::Dependencies.search_for_file(filename)
-            require abspath
-          else
-            require filename
-          end
-        end
-      end
-
-      module Inflector
-        # Concurrent::Map is not needed. This is a private class, and overrides
-        # must be defined while the application boots.
-        @overrides = {}
-
-        def self.camelize(basename, _abspath)
-          @overrides[basename] || basename.camelize
-        end
-
-        def self.inflect(overrides)
-          @overrides.merge!(overrides)
-        end
-      end
-
-      class << self
-        def take_over(enable_reloading:)
-          setup_autoloaders(enable_reloading)
-          freeze_paths
-          decorate_dependencies
-        end
-
-        private
-          def setup_autoloaders(enable_reloading)
-            Dependencies.autoload_paths.each do |autoload_path|
-              # Zeitwerk only accepts existing directories in `push_dir` to
-              # prevent misconfigurations.
-              next unless File.directory?(autoload_path)
-
-              autoloader = \
-                autoload_once?(autoload_path) ? Rails.autoloaders.once : Rails.autoloaders.main
-
-              autoloader.push_dir(autoload_path)
-              autoloader.do_not_eager_load(autoload_path) unless eager_load?(autoload_path)
-            end
-
-            Rails.autoloaders.main.enable_reloading if enable_reloading
-            Rails.autoloaders.each(&:setup)
-          end
-
-          def autoload_once?(autoload_path)
-            Dependencies.autoload_once_paths.include?(autoload_path)
-          end
-
-          def eager_load?(autoload_path)
-            Dependencies._eager_load_paths.member?(autoload_path)
-          end
-
-          def freeze_paths
-            Dependencies.autoload_paths.freeze
-            Dependencies.autoload_once_paths.freeze
-            Dependencies._eager_load_paths.freeze
-          end
-
-          def decorate_dependencies
-            Dependencies.unhook!
-            Dependencies.singleton_class.prepend(Decorations)
-            Object.prepend(RequireDependency)
-          end
-      end
-    end
-  end
-end