activesupport 6.0.0.rc1 → 6.0.3.rc1

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

@@ -29,7 +29,6 @@ module DateAndTime
     end
 
     private
-
       def time_with_zone(time, zone)
         if time
           ActiveSupport::TimeWithZone.new(time.utc? ? time : time.getutc, zone)

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

@@ -96,7 +96,6 @@ class DateTime
   end
 
   private
-
     def offset_in_seconds
       (offset * 86400).to_i
     end

data/lib/active_support/core_ext/digest.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require "active_support/core_ext/digest/uuid"

data/lib/active_support/core_ext/hash/conversions.rb

@@ -73,7 +73,7 @@ class Hash
   # configure your own builder with the <tt>:builder</tt> option. The method also accepts
   # options like <tt>:dasherize</tt> and friends, they are forwarded to the builder.
   def to_xml(options = {})
-    require "active_support/builder" unless defined?(Builder)
+    require "active_support/builder" unless defined?(Builder::XmlMarkup)
 
     options = options.dup
     options[:indent]  ||= 2

data/lib/active_support/core_ext/hash/deep_transform_values.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class Hash
-  # Returns a new hash with all keys converted by the block operation.
-  # This includes the keys from the root hash and from all
+  # Returns a new hash with all values converted by the block operation.
+  # This includes the values from the root hash and from all
   # nested hashes and arrays.
   #
   #  hash = { person: { name: 'Rob', age: '28' } }

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

@@ -193,7 +193,13 @@ class Module
     method_names = methods.map do |method|
       # Attribute writer methods only accept one argument. Makes sure []=
       # methods still accept two arguments.
-      definition = /[^\]]=$/.match?(method) ? "arg" : "*args, &block"
+      definition = if /[^\]]=$/.match?(method)
+        "arg"
+      elsif RUBY_VERSION >= "2.7"
+        "..."
+      else
+        "*args, &block"
+      end
 
       # The following generated method calls the target exactly once, storing
       # the returned value in a dummy variable.
@@ -275,6 +281,11 @@ class Module
   #
   # The delegated method must be public on the target, otherwise it will
   # raise +NoMethodError+.
+  #
+  # The <tt>marshal_dump</tt> and <tt>_dump</tt> methods are exempt from
+  # delegation due to possible interference when calling
+  # <tt>Marshal.dump(object)</tt>, should the delegation target method
+  # of <tt>object</tt> add or remove instance variables.
   def delegate_missing_to(target)
     target = target.to_s
     target = "self.#{target}" if DELEGATION_RESERVED_METHOD_NAMES.include?(target)
@@ -284,6 +295,7 @@ class Module
         # It may look like an oversight, but we deliberately do not pass
         # +include_private+, because they do not get delegated.
 
+        return false if name == :marshal_dump || name == :_dump
         #{target}.respond_to?(name) || super
       end
 
@@ -302,6 +314,7 @@ class Module
           end
         end
       end
+      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
     RUBY
   end
 end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/string/filters"
 require "active_support/inflector"
 
 class Module

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

@@ -28,96 +28,6 @@ class Object
   end
 end
 
-class NilClass
-  begin
-    nil.dup
-  rescue TypeError
-
-    # +nil+ is not duplicable:
-    #
-    #   nil.duplicable? # => false
-    #   nil.dup         # => TypeError: can't dup NilClass
-    def duplicable?
-      false
-    end
-  end
-end
-
-class FalseClass
-  begin
-    false.dup
-  rescue TypeError
-
-    # +false+ is not duplicable:
-    #
-    #   false.duplicable? # => false
-    #   false.dup         # => TypeError: can't dup FalseClass
-    def duplicable?
-      false
-    end
-  end
-end
-
-class TrueClass
-  begin
-    true.dup
-  rescue TypeError
-
-    # +true+ is not duplicable:
-    #
-    #   true.duplicable? # => false
-    #   true.dup         # => TypeError: can't dup TrueClass
-    def duplicable?
-      false
-    end
-  end
-end
-
-class Symbol
-  begin
-    :symbol.dup
-
-    # Some symbols couldn't be duped in Ruby 2.4.0 only, due to a bug.
-    # This feature check catches any regression.
-    "symbol_from_string".to_sym.dup
-  rescue TypeError
-
-    # Symbols are not duplicable:
-    #
-    #   :my_symbol.duplicable? # => false
-    #   :my_symbol.dup         # => TypeError: can't dup Symbol
-    def duplicable?
-      false
-    end
-  end
-end
-
-class Numeric
-  begin
-    1.dup
-  rescue TypeError
-
-    # Numbers are not duplicable:
-    #
-    #  3.duplicable? # => false
-    #  3.dup         # => TypeError: can't dup Integer
-    def duplicable?
-      false
-    end
-  end
-end
-
-require "bigdecimal"
-class BigDecimal
-  # BigDecimals are duplicable:
-  #
-  #   BigDecimal("1.2").duplicable? # => true
-  #   BigDecimal("1.2").dup         # => #<BigDecimal:...,'0.12E1',18(18)>
-  def duplicable?
-    true
-  end
-end
-
 class Method
   # Methods are not duplicable:
   #
@@ -128,32 +38,12 @@ class Method
   end
 end
 
-class Complex
-  begin
-    Complex(1).dup
-  rescue TypeError
-
-    # Complexes are not duplicable:
-    #
-    #   Complex(1).duplicable? # => false
-    #   Complex(1).dup         # => TypeError: can't copy Complex
-    def duplicable?
-      false
-    end
-  end
-end
-
-class Rational
-  begin
-    Rational(1).dup
-  rescue TypeError
-
-    # Rationals are not duplicable:
-    #
-    #   Rational(1).duplicable? # => false
-    #   Rational(1).dup         # => TypeError: can't copy Rational
-    def duplicable?
-      false
-    end
+class UnboundMethod
+  # Unbound methods are not duplicable:
+  #
+  #  method(:puts).unbind.duplicable? # => false
+  #  method(:puts).unbind.dup         # => TypeError: allocator undefined for UnboundMethod
+  def duplicable?
+    false
   end
 end

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

@@ -15,6 +15,7 @@ module ActiveSupport
         public_send(method_name, *args, &b)
       end
     end
+    ruby2_keywords(:try) if respond_to?(:ruby2_keywords, true)
 
     def try!(method_name = nil, *args, &b)
       if method_name.nil? && block_given?
@@ -27,6 +28,7 @@ module ActiveSupport
         public_send(method_name, *args, &b)
       end
     end
+    ruby2_keywords(:try!) if respond_to?(:ruby2_keywords, true)
   end
 end
 

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

@@ -11,13 +11,15 @@ module ActiveSupport
     # The native Range#=== behavior is untouched.
     #  ('a'..'f') === ('c') # => true
     #  (5..9) === (11) # => false
+    #
+    # The given range must be fully bounded, with both start and end.
     def ===(value)
       if value.is_a?(::Range)
         # 1...10 includes 1..9 but it does not include 1..10.
         # 1..10 includes 1...11 but it does not include 1...12.
         operator = exclude_end? && !value.exclude_end? ? :< : :<=
         value_max = !exclude_end? && value.exclude_end? ? value.max : value.last
-        super(value.first) && value_max.send(operator, last)
+        super(value.first) && (self.end.nil? || value_max.send(operator, last))
       else
         super
       end
@@ -32,13 +34,15 @@ module ActiveSupport
     # The native Range#include? behavior is untouched.
     #  ('a'..'f').include?('c') # => true
     #  (5..9).include?(11) # => false
+    #
+    # The given range must be fully bounded, with both start and end.
     def include?(value)
       if value.is_a?(::Range)
         # 1...10 includes 1..9 but it does not include 1..10.
         # 1..10 includes 1...11 but it does not include 1...12.
         operator = exclude_end? && !value.exclude_end? ? :< : :<=
         value_max = !exclude_end? && value.exclude_end? ? value.max : value.last
-        super(value.first) && value_max.send(operator, last)
+        super(value.first) && (self.end.nil? || value_max.send(operator, last))
       else
         super
       end
@@ -53,13 +57,15 @@ module ActiveSupport
     # The native Range#cover? behavior is untouched.
     #  ('a'..'f').cover?('c') # => true
     #  (5..9).cover?(11) # => false
+    #
+    # The given range must be fully bounded, with both start and end.
     def cover?(value)
       if value.is_a?(::Range)
         # 1...10 covers 1..9 but it does not cover 1..10.
         # 1..10 covers 1...11 but it does not cover 1...12.
         operator = exclude_end? && !value.exclude_end? ? :< : :<=
         value_max = !exclude_end? && value.exclude_end? ? value.max : value.last
-        super(value.first) && value_max.send(operator, last)
+        super(value.first) && (self.end.nil? || value_max.send(operator, last))
       else
         super
       end

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

@@ -15,7 +15,6 @@ module ActiveSupport
     end
 
     private
-
       def ensure_iteration_allowed
         raise TypeError, "can't iterate from #{first.class}" if first.is_a?(TimeWithZone)
       end

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

@@ -9,9 +9,9 @@ module ActiveSupport
     #   (1.hour.ago..1.hour.from_now).include?(Time.current) # => true
     #
     def include?(value)
-      if first.is_a?(TimeWithZone)
+      if self.begin.is_a?(TimeWithZone)
         cover?(value)
-      elsif last.is_a?(TimeWithZone)
+      elsif self.end.is_a?(TimeWithZone)
         cover?(value)
       else
         super

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

@@ -75,7 +75,7 @@ class String
         length_with_room_for_omission
       end
 
-    "#{self[0, stop]}#{omission}"
+    +"#{self[0, stop]}#{omission}"
   end
 
   # Truncates +text+ to at most <tt>bytesize</tt> bytes in length without

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

@@ -291,13 +291,14 @@ module ActiveSupport #:nodoc:
     end
 
     private
-
       def html_escape_interpolated_argument(arg)
         (!html_safe? || arg.html_safe?) ? arg : CGI.escapeHTML(arg.to_s)
       end
 
       def set_block_back_references(block, match_data)
         block.binding.eval("proc { |m| $~ = m }").call(match_data)
+      rescue ArgumentError
+        # Can't create binding from C level Proc
       end
   end
 end

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

@@ -311,4 +311,34 @@ class Time
   end
   alias_method :eql_without_coercion, :eql?
   alias_method :eql?, :eql_with_coercion
+
+  # Returns a new time the specified number of days ago.
+  def prev_day(days = 1)
+    advance(days: -days)
+  end
+
+  # Returns a new time the specified number of days in the future.
+  def next_day(days = 1)
+    advance(days: days)
+  end
+
+  # Returns a new time the specified number of months ago.
+  def prev_month(months = 1)
+    advance(months: -months)
+  end
+
+  # Returns a new time the specified number of months in the future.
+  def next_month(months = 1)
+    advance(months: months)
+  end
+
+  # Returns a new time the specified number of years ago.
+  def prev_year(years = 1)
+    advance(years: -years)
+  end
+
+  # Returns a new time the specified number of years in the future.
+  def next_year(years = 1)
+    advance(years: years)
+  end
 end

data/lib/active_support/dependencies.rb

@@ -20,6 +20,9 @@ module ActiveSupport #:nodoc:
   module Dependencies #:nodoc:
     extend self
 
+    UNBOUND_METHOD_MODULE_NAME = Module.instance_method(:name)
+    private_constant :UNBOUND_METHOD_MODULE_NAME
+
     mattr_accessor :interlock, default: Interlock.new
 
     # :doc:
@@ -201,6 +204,11 @@ module ActiveSupport #:nodoc:
         end
       end
 
+      def self.include_into(base)
+        base.include(self)
+        append_features(base)
+      end
+
       def const_missing(const_name)
         from_mod = anonymous? ? guess_for_anonymous(const_name) : self
         Dependencies.load_missing_constant(from_mod, const_name)
@@ -230,6 +238,21 @@ module ActiveSupport #:nodoc:
         base.class_eval do
           define_method(:load, Kernel.instance_method(:load))
           private :load
+
+          define_method(:require, Kernel.instance_method(:require))
+          private :require
+        end
+      end
+
+      def self.include_into(base)
+        base.include(self)
+
+        if base.instance_method(:load).owner == base
+          base.remove_method(:load)
+        end
+
+        if base.instance_method(:require).owner == base
+          base.remove_method(:require)
         end
       end
 
@@ -290,7 +313,6 @@ module ActiveSupport #:nodoc:
       end
 
       private
-
         def load(file, wrap = false)
           result = false
           load_dependency(file) { result = super }
@@ -326,9 +348,9 @@ module ActiveSupport #:nodoc:
     end
 
     def hook!
-      Object.class_eval { include Loadable }
-      Module.class_eval { include ModuleConstMissing }
-      Exception.class_eval { include Blamable }
+      Loadable.include_into(Object)
+      ModuleConstMissing.include_into(Module)
+      Exception.include(Blamable)
     end
 
     def unhook!
@@ -639,7 +661,7 @@ module ActiveSupport #:nodoc:
 
     # Determine if the given constant has been automatically loaded.
     def autoloaded?(desc)
-      return false if desc.is_a?(Module) && desc.anonymous?
+      return false if desc.is_a?(Module) && real_mod_name(desc).nil?
       name = to_constant_name desc
       return false unless qualified_const_defined?(name)
       autoloaded_constants.include?(name)
@@ -695,7 +717,7 @@ module ActiveSupport #:nodoc:
       when String then desc.sub(/^::/, "")
       when Symbol then desc.to_s
       when Module
-        desc.name ||
+        real_mod_name(desc) ||
           raise(ArgumentError, "Anonymous modules have no name to be referenced by")
       else raise TypeError, "Not a valid constant descriptor: #{desc.inspect}"
       end
@@ -769,6 +791,13 @@ module ActiveSupport #:nodoc:
     def log(message)
       logger.debug("autoloading: #{message}") if logger && verbose
     end
+
+    private
+      # Returns the original name of a class or module even if `name` has been
+      # overridden.
+      def real_mod_name(mod)
+        UNBOUND_METHOD_MODULE_NAME.bind(mod).call
+      end
   end
 end