activesupport 1.2.4 → 8.1.2

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

@@ -1,174 +1,379 @@
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module Time #:nodoc:
-      # Enables the use of time calculations within Time itself
-      module Calculations
-        def self.append_features(base) #:nodoc:
-          super
-          base.extend(ClassMethods)
-        end
+# frozen_string_literal: true
 
-        module ClassMethods
-          # Return the number of days in the given month. If a year is given,
-          # February will return the correct number of days for leap years.
-          # Otherwise, this method will always report February as having 28
-          # days.
-          def days_in_month(month, year=nil)
-            if month == 2
-              !year.nil? && (year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0)) ?  29 : 28
-            elsif month <= 7
-              month % 2 == 0 ? 30 : 31
-            else
-              month % 2 == 0 ? 31 : 30
-            end
-          end
-        end
+require "active_support/duration"
+require "active_support/core_ext/time/conversions"
+require "active_support/time_with_zone"
+require "active_support/core_ext/time/zones"
+require "active_support/core_ext/date_and_time/calculations"
+require "active_support/core_ext/date/calculations"
+require "active_support/core_ext/module/remove_method"
 
-        # Seconds since midnight: Time.now.seconds_since_midnight
-        def seconds_since_midnight
-          self.hour.hours + self.min.minutes + self.sec + (self.usec/1.0e+6)
-        end
-            
-        # Returns a new Time where one or more of the elements have been changed according to the +options+ parameter. The time options
-        # (hour, minute, sec, usec) reset cascadingly, so if only the hour is passed, then minute, sec, and usec is set to 0. If the hour and 
-        # minute is passed, then sec and usec is set to 0.
-        def change(options)
-          ::Time.send(
-            self.utc? ? :utc : :local, 
-            options[:year]  || self.year, 
-            options[:month] || self.month, 
-            options[:mday]  || self.mday, 
-            options[:hour]  || self.hour, 
-            options[:min]   || (options[:hour] ? 0 : self.min),
-            options[:sec]   || ((options[:hour] || options[:min]) ? 0 : self.sec),
-            options[:usec]  || ((options[:hour] || options[:min] || options[:sec]) ? 0 : self.usec)
-          )
-        end
+class Time
+  include DateAndTime::Calculations
 
-        # Returns a new Time representing the time a number of seconds ago, this is basically a wrapper around the Numeric extension
-        # Do not use this method in combination with x.months, use months_ago instead!
-        def ago(seconds)
-          seconds.until(self)
-        end
+  COMMON_YEAR_DAYS_IN_MONTH = [nil, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
 
-        # Returns a new Time representing the time a number of seconds since the instance time, this is basically a wrapper around 
-        #the Numeric extension. Do not use this method in combination with x.months, use months_since instead!
-        def since(seconds)
-          seconds.since(self)
-        end
-        alias :in :since
+  class << self
+    # Overriding case equality method so that it returns true for ActiveSupport::TimeWithZone instances
+    def ===(other)
+      super || (self == Time && other.is_a?(ActiveSupport::TimeWithZone))
+    end
+
+    # Returns the number of days in the given month.
+    # If no year is specified, it will use the current year.
+    def days_in_month(month, year = current.year)
+      if month == 2 && ::Date.gregorian_leap?(year)
+        29
+      else
+        COMMON_YEAR_DAYS_IN_MONTH[month]
+      end
+    end
+
+    # Returns the number of days in the given year.
+    # If no year is specified, it will use the current year.
+    def days_in_year(year = current.year)
+      days_in_month(2, year) + 337
+    end
 
-        # Returns a new Time representing the time a number of specified months ago
-        def months_ago(months)
-          months_since(-months)
+    # Returns <tt>Time.zone.now</tt> when <tt>Time.zone</tt> or <tt>config.time_zone</tt> are set, otherwise just returns <tt>Time.now</tt>.
+    def current
+      ::Time.zone ? ::Time.zone.now : ::Time.now
+    end
+
+    # Layers additional behavior on Time.at so that ActiveSupport::TimeWithZone and DateTime
+    # instances can be used when called with a single argument
+    def at_with_coercion(time_or_number, *args)
+      if args.empty?
+        if time_or_number.is_a?(ActiveSupport::TimeWithZone)
+          at_without_coercion(time_or_number.to_r).getlocal
+        elsif time_or_number.is_a?(DateTime)
+          at_without_coercion(time_or_number.to_f).getlocal
+        else
+          at_without_coercion(time_or_number)
         end
+      else
+        at_without_coercion(time_or_number, *args)
+      end
+    end
+    ruby2_keywords :at_with_coercion
+    alias_method :at_without_coercion, :at
+    alias_method :at, :at_with_coercion
 
-        def months_since(months)
-          year, month, mday = self.year, self.month, self.mday
+    # Creates a +Time+ instance from an RFC 3339 string.
+    #
+    #   Time.rfc3339('1999-12-31T14:00:00-10:00') # => 2000-01-01 00:00:00 -1000
+    #
+    # If the time or offset components are missing then an +ArgumentError+ will be raised.
+    #
+    #   Time.rfc3339('1999-12-31') # => ArgumentError: invalid date
+    def rfc3339(str)
+      parts = Date._rfc3339(str)
 
-          month += months
+      raise ArgumentError, "invalid date" if parts.empty?
 
-          # in case months is negative
-          while month < 1
-            month += 12
-            year -= 1
-          end
+      Time.new(
+        parts.fetch(:year),
+        parts.fetch(:mon),
+        parts.fetch(:mday),
+        parts.fetch(:hour),
+        parts.fetch(:min),
+        parts.fetch(:sec) + parts.fetch(:sec_fraction, 0),
+        parts.fetch(:offset)
+      )
+    end
+  end
 
-          # in case months is positive
-          while month > 12
-            month -= 12
-            year += 1
-          end
+  # Returns the number of seconds since 00:00:00.
+  #
+  #   Time.new(2012, 8, 29,  0,  0,  0).seconds_since_midnight # => 0.0
+  #   Time.new(2012, 8, 29, 12, 34, 56).seconds_since_midnight # => 45296.0
+  #   Time.new(2012, 8, 29, 23, 59, 59).seconds_since_midnight # => 86399.0
+  def seconds_since_midnight
+    to_i - change(hour: 0).to_i + (usec / 1.0e+6)
+  end
 
-          max = ::Time.days_in_month(month, year)
-          mday = max if mday > max
+  # Returns the number of seconds until 23:59:59.
+  #
+  #   Time.new(2012, 8, 29,  0,  0,  0).seconds_until_end_of_day # => 86399
+  #   Time.new(2012, 8, 29, 12, 34, 56).seconds_until_end_of_day # => 41103
+  #   Time.new(2012, 8, 29, 23, 59, 59).seconds_until_end_of_day # => 0
+  def seconds_until_end_of_day
+    end_of_day.to_i - to_i
+  end
 
-          change(:year => year, :month => month, :mday => mday)
-        end
+  # Returns the fraction of a second as a +Rational+
+  #
+  #   Time.new(2012, 8, 29, 0, 0, 0.5).sec_fraction # => (1/2)
+  def sec_fraction
+    subsec
+  end
 
-        # Returns a new Time representing the time a number of specified years ago
-        def years_ago(years)
-          change(:year => self.year - years)
-        end
-        
-        def years_since(years)
-          change(:year => self.year + years)
-        end
+  # Returns a new Time where one or more of the elements have been changed according
+  # to the +options+ parameter. The time options (<tt>:hour</tt>, <tt>:min</tt>,
+  # <tt>:sec</tt>, <tt>:usec</tt>, <tt>:nsec</tt>) reset cascadingly, so if only
+  # the hour is passed, then minute, sec, usec, and nsec is set to 0. If the hour
+  # and minute is passed, then sec, usec, and nsec is set to 0. The +options+ parameter
+  # takes a hash with any of these keys: <tt>:year</tt>, <tt>:month</tt>, <tt>:day</tt>,
+  # <tt>:hour</tt>, <tt>:min</tt>, <tt>:sec</tt>, <tt>:usec</tt>, <tt>:nsec</tt>,
+  # <tt>:offset</tt>. Pass either <tt>:usec</tt> or <tt>:nsec</tt>, not both.
+  #
+  #   Time.new(2012, 8, 29, 22, 35, 0).change(day: 1)              # => Time.new(2012, 8, 1, 22, 35, 0)
+  #   Time.new(2012, 8, 29, 22, 35, 0).change(year: 1981, day: 1)  # => Time.new(1981, 8, 1, 22, 35, 0)
+  #   Time.new(2012, 8, 29, 22, 35, 0).change(year: 1981, hour: 0) # => Time.new(1981, 8, 29, 0, 0, 0)
+  def change(options)
+    new_year   = options.fetch(:year, year)
+    new_month  = options.fetch(:month, month)
+    new_day    = options.fetch(:day, day)
+    new_hour   = options.fetch(:hour, hour)
+    new_min    = options.fetch(:min, options[:hour] ? 0 : min)
+    new_sec    = options.fetch(:sec, (options[:hour] || options[:min]) ? 0 : sec)
+    new_offset = options.fetch(:offset, nil)
 
-        # Short-hand for years_ago(1)
-        def last_year
-          years_ago(1)
-        end
-        
-        # Short-hand for years_since(1)
-        def next_year
-          years_since(1)
-        end
+    if new_nsec = options[:nsec]
+      raise ArgumentError, "Can't change both :nsec and :usec at the same time: #{options.inspect}" if options[:usec]
+      new_usec = Rational(new_nsec, 1000)
+    else
+      new_usec = options.fetch(:usec, (options[:hour] || options[:min] || options[:sec]) ? 0 : Rational(nsec, 1000))
+    end
 
+    raise ArgumentError, "argument out of range" if new_usec >= 1000000
 
-        # Short-hand for months_ago(1)
-        def last_month
-          months_ago(1)
-        end
+    new_sec += Rational(new_usec, 1000000)
 
-        # Short-hand for months_since(1)
-        def next_month
-          months_since(1)
-        end
-        
-        # Returns a new Time representing the "start" of this week (Monday, 0:00)
-        def beginning_of_week
-          days_to_monday = self.wday!=0 ? self.wday-1 : 6
-          (self - days_to_monday.days).midnight
-        end
-        alias :monday :beginning_of_week
-        alias :at_beginning_of_week :beginning_of_week
-        
-        # Returns a new Time representing the start of the given day in next week (default is Monday).
-        def next_week(day = :monday)
-          days_into_week = { :monday => 0, :tuesday => 1, :wednesday => 2, :thursday => 3, :friday => 4, :saturday => 5, :sunday => 6}
-          since(1.week).beginning_of_week.since(days_into_week[day].day).change(:hour => 0)
-        end
-        
-        # Returns a new Time representing the start of the day (0:00)
-        def beginning_of_day
-          (self - self.seconds_since_midnight).change(:usec => 0)
-        end
-        alias :midnight :beginning_of_day
-        alias :at_midnight :beginning_of_day
-        alias :at_beginning_of_day :beginning_of_day
-        
-        # Returns a new Time representing the start of the month (1st of the month, 0:00)
-        def beginning_of_month
-          #self - ((self.mday-1).days + self.seconds_since_midnight)
-          change(:mday => 1,:hour => 0, :min => 0, :sec => 0, :usec => 0)
-        end
-        alias :at_beginning_of_month :beginning_of_month
-        
-        # Returns a new Time representing the end of the month (last day of the month, 0:00)
-        def end_of_month
-          #self - ((self.mday-1).days + self.seconds_since_midnight)
-          last_day = ::Time.days_in_month( self.month, self.year )
-          change(:mday => last_day,:hour => 0, :min => 0, :sec => 0, :usec => 0)
-        end
-        alias :at_end_of_month :end_of_month
-        
-        # Returns  a new Time representing the start of the year (1st of january, 0:00)
-        def beginning_of_year
-          change(:month => 1,:mday => 1,:hour => 0, :min => 0, :sec => 0, :usec => 0)
-        end
-        alias :at_beginning_of_year :beginning_of_year
-        
-        # Convenience method which returns a new Time representing the time 1 day ago
-        def yesterday
-          self.ago(1.day)
-        end
-        
-        # Convenience method which returns a new Time representing the time 1 day since the instance time
-        def tomorrow
-          self.since(1.day)
-        end
+    if new_offset
+      ::Time.new(new_year, new_month, new_day, new_hour, new_min, new_sec, new_offset)
+    elsif utc?
+      ::Time.utc(new_year, new_month, new_day, new_hour, new_min, new_sec)
+    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
+      # occurrence that matches this time's UTC offset.
+      #
+      # If the new time's UTC offset is larger than this time's UTC offset, the
+      # new time might be a first chronological occurrence. So we add the offset
+      # difference to fast-forward the new time, and check if the result has the
+      # desired UTC offset (i.e. is the second chronological occurrence).
+      offset_difference = new_time.utc_offset - utc_offset
+      if offset_difference > 0 && (new_time_2 = new_time + offset_difference).utc_offset == utc_offset
+        new_time_2
+      else
+        new_time
+      end
+    elsif zone
+      ::Time.local(new_sec, new_min, new_hour, new_day, new_month, new_year, nil, nil, isdst, nil)
+    else
+      ::Time.new(new_year, new_month, new_day, new_hour, new_min, new_sec, utc_offset)
+    end
+  end
+
+  # Uses Date to provide precise Time calculations for years, months, and days
+  # according to the proleptic Gregorian calendar. The +options+ parameter
+  # takes a hash with any of these keys: <tt>:years</tt>, <tt>:months</tt>,
+  # <tt>:weeks</tt>, <tt>:days</tt>, <tt>:hours</tt>, <tt>:minutes</tt>,
+  # <tt>:seconds</tt>.
+  #
+  #   Time.new(2015, 8, 1, 14, 35, 0).advance(seconds: 1) # => 2015-08-01 14:35:01 -0700
+  #   Time.new(2015, 8, 1, 14, 35, 0).advance(minutes: 1) # => 2015-08-01 14:36:00 -0700
+  #   Time.new(2015, 8, 1, 14, 35, 0).advance(hours: 1)   # => 2015-08-01 15:35:00 -0700
+  #   Time.new(2015, 8, 1, 14, 35, 0).advance(days: 1)    # => 2015-08-02 14:35:00 -0700
+  #   Time.new(2015, 8, 1, 14, 35, 0).advance(weeks: 1)   # => 2015-08-08 14:35:00 -0700
+  #
+  # Just like Date#advance, increments are applied in order of time units from
+  # largest to smallest. This order can affect the result around the end of a
+  # month.
+  def advance(options)
+    unless options[:weeks].nil?
+      options[:weeks], partial_weeks = options[:weeks].divmod(1)
+      options[:days] = options.fetch(:days, 0) + 7 * partial_weeks
+    end
+
+    unless options[:days].nil?
+      options[:days], partial_days = options[:days].divmod(1)
+      options[:hours] = options.fetch(:hours, 0) + 24 * partial_days
+    end
+
+    d = to_date.gregorian.advance(options)
+    time_advanced_by_date = change(year: d.year, month: d.month, day: d.day)
+    seconds_to_advance = \
+      options.fetch(:seconds, 0) +
+      options.fetch(:minutes, 0) * 60 +
+      options.fetch(:hours, 0) * 3600
+
+    if seconds_to_advance.zero?
+      time_advanced_by_date
+    else
+      time_advanced_by_date.since(seconds_to_advance)
+    end
+  end
+
+  # Returns a new Time representing the time a number of seconds ago, this is basically a wrapper around the Numeric extension
+  def ago(seconds)
+    since(-seconds)
+  end
+
+  # Returns a new Time representing the time a number of seconds since the instance time
+  def since(seconds)
+    self + seconds
+  end
+  alias :in :since
+
+  # Returns a new Time representing the start of the day (0:00)
+  def beginning_of_day
+    change(hour: 0)
+  end
+  alias :midnight :beginning_of_day
+  alias :at_midnight :beginning_of_day
+  alias :at_beginning_of_day :beginning_of_day
+
+  # Returns a new Time representing the middle of the day (12:00)
+  def middle_of_day
+    change(hour: 12)
+  end
+  alias :midday :middle_of_day
+  alias :noon :middle_of_day
+  alias :at_midday :middle_of_day
+  alias :at_noon :middle_of_day
+  alias :at_middle_of_day :middle_of_day
+
+  # Returns a new Time representing the end of the day, 23:59:59.999999
+  def end_of_day
+    change(
+      hour: 23,
+      min: 59,
+      sec: 59,
+      usec: Rational(999999999, 1000)
+    )
+  end
+  alias :at_end_of_day :end_of_day
+
+  # Returns a new Time representing the start of the hour (x:00)
+  def beginning_of_hour
+    change(min: 0)
+  end
+  alias :at_beginning_of_hour :beginning_of_hour
+
+  # Returns a new Time representing the end of the hour, x:59:59.999999
+  def end_of_hour
+    change(
+      min: 59,
+      sec: 59,
+      usec: Rational(999999999, 1000)
+    )
+  end
+  alias :at_end_of_hour :end_of_hour
+
+  # Returns a new Time representing the start of the minute (x:xx:00)
+  def beginning_of_minute
+    change(sec: 0)
+  end
+  alias :at_beginning_of_minute :beginning_of_minute
+
+  # Returns a new Time representing the end of the minute, x:xx:59.999999
+  def end_of_minute
+    change(
+      sec: 59,
+      usec: Rational(999999999, 1000)
+    )
+  end
+  alias :at_end_of_minute :end_of_minute
+
+  def plus_with_duration(other) # :nodoc:
+    if ActiveSupport::Duration === other
+      other.since(self)
+    else
+      plus_without_duration(other)
+    end
+  end
+  alias_method :plus_without_duration, :+
+  alias_method :+, :plus_with_duration
+
+  def minus_with_duration(other) # :nodoc:
+    if ActiveSupport::Duration === other
+      other.until(self)
+    else
+      minus_without_duration(other)
+    end
+  end
+  alias_method :minus_without_duration, :-
+  alias_method :-, :minus_with_duration
+
+  # Time#- can also be used to determine the number of seconds between two Time instances.
+  # We're layering on additional behavior so that ActiveSupport::TimeWithZone instances
+  # are coerced into values that Time#- will recognize
+  def minus_with_coercion(other)
+    other = other.comparable_time if other.respond_to?(:comparable_time)
+    other.is_a?(DateTime) ? to_f - other.to_f : minus_without_coercion(other)
+  end
+  alias_method :minus_without_coercion, :-
+  alias_method :-, :minus_with_coercion # rubocop:disable Lint/DuplicateMethods
+
+  # Layers additional behavior on Time#<=> so that DateTime and ActiveSupport::TimeWithZone instances
+  # can be chronologically compared with a Time
+  def compare_with_coercion(other)
+    # we're avoiding Time#to_datetime and Time#to_time because they're expensive
+    if other.class == Time
+      compare_without_coercion(other)
+    elsif other.is_a?(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
   end
+  alias_method :compare_without_coercion, :<=>
+  alias_method :<=>, :compare_with_coercion
+
+  # Layers additional behavior on Time#eql? so that ActiveSupport::TimeWithZone instances
+  # can be eql? to an equivalent Time
+  def eql_with_coercion(other)
+    # if other is an ActiveSupport::TimeWithZone, coerce a Time instance from it so we can do eql? comparison
+    other = other.comparable_time if other.respond_to?(:comparable_time)
+    eql_without_coercion(other)
+  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/core_ext/time/compatibility.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "active_support/core_ext/date_and_time/compatibility"
+require "active_support/core_ext/module/redefine_method"
+
+class Time
+  include DateAndTime::Compatibility
+
+  silence_redefinition_of_method :to_time
+
+  # Return +self+.
+  def to_time
+    self
+  end
+end

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

@@ -1,36 +1,75 @@
-require 'date'
+# frozen_string_literal: true
 
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module Time #:nodoc:
-      # Getting times in different convenient string representations and other objects
-      module Conversions
-        DATE_FORMATS = {
-          :db     => "%Y-%m-%d %H:%M:%S",
-          :short  => "%d %b %H:%M",
-          :long   => "%B %d, %Y %H:%M",
-          :rfc822 => "%a, %d %b %Y %H:%M:%S %z"
-        }
+require "time"
+require "active_support/inflector/methods"
+require "active_support/values/time_zone"
 
-        def self.append_features(klass)
-          super
-          klass.send(:alias_method, :to_default_s, :to_s)
-          klass.send(:alias_method, :to_s, :to_formatted_s)
-        end
-        
-        def to_formatted_s(format = :default)
-          DATE_FORMATS[format] ? strftime(DATE_FORMATS[format]).strip : to_default_s          
-        end
+class Time
+  DATE_FORMATS = {
+    db: "%Y-%m-%d %H:%M:%S",
+    inspect: "%Y-%m-%d %H:%M:%S.%9N %z",
+    number: "%Y%m%d%H%M%S",
+    nsec: "%Y%m%d%H%M%S%9N",
+    usec: "%Y%m%d%H%M%S%6N",
+    time: "%H:%M",
+    short: "%d %b %H:%M",
+    long: "%B %d, %Y %H:%M",
+    long_ordinal: lambda { |time|
+      day_format = ActiveSupport::Inflector.ordinalize(time.day)
+      time.strftime("%B #{day_format}, %Y %H:%M")
+    },
+    rfc822: lambda { |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 }
+  }
 
-        def to_date
-          ::Date.new(year, month, day)
-        end
-
-        # To be able to keep Dates and Times interchangeable on conversions
-        def to_time
-          self
-        end
-      end
+  # Converts to a formatted string. See DATE_FORMATS for built-in formats.
+  #
+  # This method is aliased to <tt>to_formatted_s</tt>.
+  #
+  #   time = Time.now                    # => 2007-01-18 06:10:17 -06:00
+  #
+  #   time.to_fs(:time)                  # => "06:10"
+  #   time.to_formatted_s(:time)         # => "06:10"
+  #
+  #   time.to_fs(:db)           # => "2007-01-18 06:10:17"
+  #   time.to_fs(:number)       # => "20070118061017"
+  #   time.to_fs(:short)        # => "18 Jan 06:10"
+  #   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+
+  # You can add your own formats to the Time::DATE_FORMATS hash.
+  # Use the format name as the hash key and either a strftime string
+  # or Proc instance that takes a time argument as the value.
+  #
+  #   # config/initializers/time_formats.rb
+  #   Time::DATE_FORMATS[:month_and_year] = '%B %Y'
+  #   Time::DATE_FORMATS[:short_ordinal]  = ->(time) { time.strftime("%B #{time.day.ordinalize}") }
+  def to_fs(format = :default)
+    if formatter = DATE_FORMATS[format]
+      formatter.respond_to?(:call) ? formatter.call(self).to_s : strftime(formatter)
+    else
+      to_s
     end
   end
+  alias_method :to_formatted_s, :to_fs
+
+  # Returns a formatted string of the offset from UTC, or an alternative
+  # string if the time zone is already UTC.
+  #
+  #   Time.local(2000).formatted_offset        # => "-06:00"
+  #   Time.local(2000).formatted_offset(false) # => "-0600"
+  def formatted_offset(colon = true, alternate_utc_string = nil)
+    utc? && alternate_utc_string || ActiveSupport::TimeZone.seconds_to_utc_offset(utc_offset, colon)
+  end
+
+  # Aliased to +xmlschema+ for compatibility with +DateTime+
+  alias_method :rfc3339, :xmlschema
 end