activesupport 5.1.6 → 5.2.0

data/lib/active_support/core_ext/array.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/array/wrap"
 require "active_support/core_ext/array/access"
 require "active_support/core_ext/array/conversions"

data/lib/active_support/core_ext/benchmark.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "benchmark"
 
 class << Benchmark

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bigdecimal"
 require "bigdecimal/util"
 

data/lib/active_support/core_ext/big_decimal.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/big_decimal/conversions"

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

@@ -1,11 +1,23 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/kernel/singleton_class"
-require "active_support/core_ext/module/remove_method"
+require "active_support/core_ext/module/redefine_method"
 require "active_support/core_ext/array/extract_options"
 
 class Class
   # Declare a class-level attribute whose value is inheritable by subclasses.
   # Subclasses can change their own value and it will not impact parent class.
   #
+  # ==== Options
+  #
+  # * <tt>:instance_reader</tt> - Sets the instance reader method (defaults to true).
+  # * <tt>:instance_writer</tt> - Sets the instance writer method (defaults to true).
+  # * <tt>:instance_accessor</tt> - Sets both instance methods (defaults to true).
+  # * <tt>:instance_predicate</tt> - Sets a predicate method (defaults to true).
+  # * <tt>:default</tt> - Sets a default value for the attribute (defaults to nil).
+  #
+  # ==== Examples
+  #
   #   class Base
   #     class_attribute :setting
   #   end
@@ -68,32 +80,35 @@ class Class
   #   object.setting = false  # => NoMethodError
   #
   # To opt out of both instance methods, pass <tt>instance_accessor: false</tt>.
+  #
+  # To set a default value for the attribute, pass <tt>default:</tt>, like so:
+  #
+  #   class_attribute :settings, default: {}
   def class_attribute(*attrs)
     options = attrs.extract_options!
-    instance_reader = options.fetch(:instance_accessor, true) && options.fetch(:instance_reader, true)
-    instance_writer = options.fetch(:instance_accessor, true) && options.fetch(:instance_writer, true)
+    instance_reader    = options.fetch(:instance_accessor, true) && options.fetch(:instance_reader, true)
+    instance_writer    = options.fetch(:instance_accessor, true) && options.fetch(:instance_writer, true)
     instance_predicate = options.fetch(:instance_predicate, true)
+    default_value      = options.fetch(:default, nil)
 
     attrs.each do |name|
-      remove_possible_singleton_method(name)
+      singleton_class.silence_redefinition_of_method(name)
       define_singleton_method(name) { nil }
 
-      remove_possible_singleton_method("#{name}?")
+      singleton_class.silence_redefinition_of_method("#{name}?")
       define_singleton_method("#{name}?") { !!public_send(name) } if instance_predicate
 
       ivar = "@#{name}"
 
-      remove_possible_singleton_method("#{name}=")
+      singleton_class.silence_redefinition_of_method("#{name}=")
       define_singleton_method("#{name}=") do |val|
         singleton_class.class_eval do
-          remove_possible_method(name)
-          define_method(name) { val }
+          redefine_method(name) { val }
         end
 
         if singleton_class?
           class_eval do
-            remove_possible_method(name)
-            define_method(name) do
+            redefine_method(name) do
               if instance_variable_defined? ivar
                 instance_variable_get ivar
               else
@@ -106,8 +121,7 @@ class Class
       end
 
       if instance_reader
-        remove_possible_method name
-        define_method(name) do
+        redefine_method(name) do
           if instance_variable_defined?(ivar)
             instance_variable_get ivar
           else
@@ -115,13 +129,17 @@ class Class
           end
         end
 
-        remove_possible_method "#{name}?"
-        define_method("#{name}?") { !!public_send(name) } if instance_predicate
+        redefine_method("#{name}?") { !!public_send(name) } if instance_predicate
       end
 
       if instance_writer
-        remove_possible_method "#{name}="
-        attr_writer name
+        redefine_method("#{name}=") do |val|
+          instance_variable_set ivar, val
+        end
+      end
+
+      unless default_value.nil?
+        self.send("#{name}=", default_value)
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # cattr_* became mattr_* aliases in 7dfbd91b0780fbd6a1dd9bfbc176e10894871d2d,
 # but we keep this around for libraries that directly require it knowing they
 # want cattr_*. No need to deprecate.

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

@@ -1,5 +1,4 @@
-require "active_support/core_ext/module/anonymous"
-require "active_support/core_ext/module/reachable"
+# frozen_string_literal: true
 
 class Class
   begin

data/lib/active_support/core_ext/class.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/class/attribute"
 require "active_support/core_ext/class/subclasses"

data/lib/active_support/core_ext/date/acts_like.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/object/acts_like"
 
 class Date

data/lib/active_support/core_ext/date/blank.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "date"
 
 class Date #:nodoc:

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "date"
 require "active_support/duration"
 require "active_support/core_ext/object/acts_like"

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

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require "date"
 require "active_support/inflector/methods"
 require "active_support/core_ext/date/zones"
-require "active_support/core_ext/module/remove_method"
+require "active_support/core_ext/module/redefine_method"
 
 class Date
   DATE_FORMATS = {
@@ -17,14 +19,6 @@ class Date
     iso8601: lambda { |date| date.iso8601 }
   }
 
-  # Ruby 1.9 has Date#to_time which converts to localtime only.
-  remove_method :to_time
-
-  # Ruby 1.9 has Date#xmlschema which converts to a string without the time
-  # component. This removal may generate an issue on FreeBSD, that's why we
-  # need to use remove_possible_method here
-  remove_possible_method :xmlschema
-
   # Convert to a formatted string. See DATE_FORMATS for predefined formats.
   #
   # This method is aliased to <tt>to_s</tt>.
@@ -70,6 +64,8 @@ class Date
   alias_method :default_inspect, :inspect
   alias_method :inspect, :readable_inspect
 
+  silence_redefinition_of_method :to_time
+
   # Converts a Date instance to a Time, where the time is set to the beginning of the day.
   # The timezone can be either :local or :utc (default :local).
   #
@@ -79,11 +75,16 @@ class Date
   #   date.to_time(:local)           # => 2007-11-10 00:00:00 0800
   #
   #   date.to_time(:utc)             # => 2007-11-10 00:00:00 UTC
+  #
+  # NOTE: The :local timezone is Ruby's *process* timezone, i.e. ENV['TZ'].
+  #       If the *application's* timezone is needed, then use +in_time_zone+ instead.
   def to_time(form = :local)
     raise ArgumentError, "Expected :local or :utc, got #{form.inspect}." unless [:local, :utc].include?(form)
     ::Time.send(form, year, month, day)
   end
 
+  silence_redefinition_of_method :xmlschema
+
   # Returns a string which represents the time in used time zone as DateTime
   # defined by XML Schema:
   #

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "date"
 require "active_support/core_ext/date_and_time/zones"
 

data/lib/active_support/core_ext/date.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/date/acts_like"
 require "active_support/core_ext/date/blank"
 require "active_support/core_ext/date/calculations"

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/object/try"
 
 module DateAndTime
@@ -18,9 +20,9 @@ module DateAndTime
       advance(days: -1)
     end
 
-    # Returns a new date/time representing the previous day.
-    def prev_day
-      advance(days: -1)
+    # Returns a new date/time the specified number of days ago.
+    def prev_day(days = 1)
+      advance(days: -days)
     end
 
     # Returns a new date/time representing tomorrow.
@@ -28,9 +30,9 @@ module DateAndTime
       advance(days: 1)
     end
 
-    # Returns a new date/time representing the next day.
-    def next_day
-      advance(days: 1)
+    # Returns a new date/time the specified number of days in the future.
+    def next_day(days = 1)
+      advance(days: days)
     end
 
     # Returns true if the date/time is today.
@@ -186,9 +188,9 @@ module DateAndTime
       end
     end
 
-    # Short-hand for months_since(1).
-    def next_month
-      months_since(1)
+    # Returns a new date/time the specified number of months in the future.
+    def next_month(months = 1)
+      advance(months: months)
     end
 
     # Short-hand for months_since(3)
@@ -196,9 +198,9 @@ module DateAndTime
       months_since(3)
     end
 
-    # Short-hand for years_since(1).
-    def next_year
-      years_since(1)
+    # Returns a new date/time the specified number of years in the future.
+    def next_year(years = 1)
+      advance(years: years)
     end
 
     # Returns a new date/time representing the given day in the previous week.
@@ -221,11 +223,15 @@ module DateAndTime
     end
     alias_method :last_weekday, :prev_weekday
 
+    # Returns a new date/time the specified number of months ago.
+    def prev_month(months = 1)
+      advance(months: -months)
+    end
+
     # Short-hand for months_ago(1).
-    def prev_month
+    def last_month
       months_ago(1)
     end
-    alias_method :last_month, :prev_month
 
     # Short-hand for months_ago(3).
     def prev_quarter
@@ -233,11 +239,15 @@ module DateAndTime
     end
     alias_method :last_quarter, :prev_quarter
 
+    # Returns a new date/time the specified number of years ago.
+    def prev_year(years = 1)
+      advance(years: -years)
+    end
+
     # Short-hand for years_ago(1).
-    def prev_year
+    def last_year
       years_ago(1)
     end
-    alias_method :last_year, :prev_year
 
     # Returns the number of days to the start of the week on the given day.
     # Week is assumed to start on +start_day+, default is
@@ -320,6 +330,30 @@ module DateAndTime
       beginning_of_year..end_of_year
     end
 
+    # Returns a new date/time representing the next occurrence of the specified day of week.
+    #
+    #   today = Date.today               # => Thu, 14 Dec 2017
+    #   today.next_occurring(:monday)    # => Mon, 18 Dec 2017
+    #   today.next_occurring(:thursday)  # => Thu, 21 Dec 2017
+    def next_occurring(day_of_week)
+      current_day_number = wday != 0 ? wday - 1 : 6
+      from_now = DAYS_INTO_WEEK.fetch(day_of_week) - current_day_number
+      from_now += 7 unless from_now > 0
+      advance(days: from_now)
+    end
+
+    # Returns a new date/time representing the previous occurrence of the specified day of week.
+    #
+    #   today = Date.today               # => Thu, 14 Dec 2017
+    #   today.prev_occurring(:monday)    # => Mon, 11 Dec 2017
+    #   today.prev_occurring(:thursday)  # => Thu, 07 Dec 2017
+    def prev_occurring(day_of_week)
+      current_day_number = wday != 0 ? wday - 1 : 6
+      ago = current_day_number - DAYS_INTO_WEEK.fetch(day_of_week)
+      ago += 7 unless ago > 0
+      advance(days: -ago)
+    end
+
     private
       def first_hour(date_or_time)
         date_or_time.acts_like?(:time) ? date_or_time.beginning_of_day : date_or_time

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/module/attribute_accessors"
 
 module DateAndTime
@@ -9,6 +11,6 @@ module DateAndTime
     # 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_writer: false) { false }
+    mattr_accessor :preserve_timezone, instance_writer: false, default: false
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DateAndTime
   module Zones
     # Returns the simultaneous time in <tt>Time.zone</tt> if a zone is given or

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "date"
 require "active_support/core_ext/object/acts_like"
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "date"
 
 class DateTime #:nodoc:

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "date"
 
 class DateTime

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

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/date_and_time/compatibility"
-require "active_support/core_ext/module/remove_method"
+require "active_support/core_ext/module/redefine_method"
 
 class DateTime
   include DateAndTime::Compatibility
 
-  remove_possible_method :to_time
+  silence_redefinition_of_method :to_time
 
-  # Either return an instance of `Time` with the same UTC offset
-  # as +self+ or an instance of `Time` representing the same time
-  # in the the local system timezone depending on the setting of
+  # 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
     preserve_timezone ? getlocal(utc_offset) : getlocal

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "date"
 require "active_support/inflector/methods"
 require "active_support/core_ext/time/conversions"

data/lib/active_support/core_ext/date_time.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/date_time/acts_like"
 require "active_support/core_ext/date_time/blank"
 require "active_support/core_ext/date_time/calculations"

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "securerandom"
 
 module Digest
@@ -12,7 +14,7 @@ module Digest
     # Using Digest::MD5 generates version 3 UUIDs; Digest::SHA1 generates version 5 UUIDs.
     # uuid_from_hash always generates the same UUID for a given name and namespace combination.
     #
-    # See RFC 4122 for details of UUID at: http://www.ietf.org/rfc/rfc4122.txt
+    # See RFC 4122 for details of UUID at: https://www.ietf.org/rfc/rfc4122.txt
     def self.uuid_from_hash(hash_class, uuid_namespace, name)
       if hash_class == Digest::MD5
         version = 3

data/lib/active_support/core_ext/enumerable.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Enumerable
-  # Enumerable#sum was added in Ruby 2.4 but it only works with Numeric elements
+  # Enumerable#sum was added in Ruby 2.4, but it only works with Numeric elements
   # when we omit an identity.
   #
   # We tried shimming it to attempt the fast native method, rescue TypeError,

data/lib/active_support/core_ext/file/atomic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "fileutils"
 
 class File

data/lib/active_support/core_ext/file.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/file/atomic"

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Hash
   unless Hash.instance_methods(false).include?(:compact)
     # Returns a hash with non +nil+ values.

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/xml_mini"
 require "active_support/time"
 require "active_support/core_ext/object/blank"
@@ -163,7 +165,7 @@ module ActiveSupport
           Hash[params.map { |k, v| [k.to_s.tr("-", "_"), normalize_keys(v)] } ]
         when Array
           params.map { |v| normalize_keys(v) }
-          else
+        else
           params
         end
       end
@@ -176,7 +178,7 @@ module ActiveSupport
           process_array(value)
         when String
           value
-          else
+        else
           raise "can't typecast #{value.class.name} - #{value.inspect}"
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Hash
   # Returns a new hash with +self+ and +other_hash+ merged recursively.
   #
@@ -19,20 +21,14 @@ class Hash
 
   # Same as +deep_merge+, but modifies +self+.
   def deep_merge!(other_hash, &block)
-    other_hash.each_pair do |current_key, other_value|
-      this_value = self[current_key]
-
-      self[current_key] = if this_value.is_a?(Hash) && other_value.is_a?(Hash)
-        this_value.deep_merge(other_value, &block)
+    merge!(other_hash) do |key, this_val, other_val|
+      if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+        this_val.deep_merge(other_val, &block)
+      elsif block_given?
+        block.call(key, this_val, other_val)
       else
-        if block_given? && key?(current_key)
-          block.call(current_key, this_value, other_value)
-        else
-          other_value
-        end
+        other_val
       end
     end
-
-    self
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Hash
   # Returns a hash that includes everything except given keys.
   #   hash = { a: true, b: false, c: nil }

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/hash_with_indifferent_access"
 
 class Hash

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Hash
   # Returns a new hash with all keys converted using the +block+ operation.
   #

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Hash
   # Merges the caller into +other_hash+. For example,
   #
@@ -12,11 +14,12 @@ class Hash
   def reverse_merge(other_hash)
     other_hash.merge(self)
   end
+  alias_method :with_defaults, :reverse_merge
 
   # Destructive +reverse_merge+.
   def reverse_merge!(other_hash)
-    # right wins if there is no left
-    merge!(other_hash) { |key, left, right| left }
+    replace(reverse_merge(other_hash))
   end
   alias_method :reverse_update, :reverse_merge!
+  alias_method :with_defaults!, :reverse_merge!
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Hash
   # Slices a hash to include only the given keys. Returns a hash containing
   # the given keys.
@@ -19,9 +21,8 @@ class Hash
   #   valid_keys = [:mass, :velocity, :time]
   #   search(options.slice(*valid_keys))
   def slice(*keys)
-    keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
-    keys.each_with_object(self.class.new) { |k, hash| hash[k] = self[k] if has_key?(k) }
-  end
+    keys.each_with_object(Hash.new) { |k, hash| hash[k] = self[k] if has_key?(k) }
+  end unless method_defined?(:slice)
 
   # Replaces the hash with only the given keys.
   # Returns a hash containing the removed key/value pairs.
@@ -29,7 +30,6 @@ class Hash
   #   { a: 1, b: 2, c: 3, d: 4 }.slice!(:a, :b)
   #   # => {:c=>3, :d=>4}
   def slice!(*keys)
-    keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
     omit = slice(*self.keys - keys)
     hash = slice(*keys)
     hash.default      = default

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Hash
   # Returns a new hash with the results of running +block+ once for every value.
   # The keys are unchanged.

data/lib/active_support/core_ext/hash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/hash/compact"
 require "active_support/core_ext/hash/conversions"
 require "active_support/core_ext/hash/deep_merge"

data/lib/active_support/core_ext/integer/inflections.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/inflector"
 
 class Integer

data/lib/active_support/core_ext/integer/multiple.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Integer
   # Check whether the integer is evenly divisible by the argument.
   #