activesupport 2.3.18 → 3.0.0.beta

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

@@ -1,107 +1,98 @@
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module Date #:nodoc:
-      # Converting dates to formatted strings, times, and datetimes.
-      module Conversions
-        DATE_FORMATS = {
-          :short        => "%e %b",
-          :long         => "%B %e, %Y",
-          :db           => "%Y-%m-%d",
-          :number       => "%Y%m%d",
-          :long_ordinal => lambda { |date| date.strftime("%B #{date.day.ordinalize}, %Y") }, # => "April 25th, 2007"
-          :rfc822       => "%e %b %Y"
-        }
+require 'date'
+require 'active_support/inflector'
 
-        def self.included(base) #:nodoc:
-          base.instance_eval do
-            alias_method :to_default_s, :to_s
-            alias_method :to_s, :to_formatted_s
-            alias_method :default_inspect, :inspect
-            alias_method :inspect, :readable_inspect
+class Date
+  DATE_FORMATS = {
+    :short        => "%e %b",
+    :long         => "%B %e, %Y",
+    :db           => "%Y-%m-%d",
+    :number       => "%Y%m%d",
+    :long_ordinal => lambda { |date| date.strftime("%B #{ActiveSupport::Inflector.ordinalize(date.day)}, %Y") }, # => "April 25th, 2007"
+    :rfc822       => "%e %b %Y"
+  }
 
-            # Ruby 1.9 has Date#to_time which converts to localtime only.
-            remove_method :to_time if base.instance_methods.include?(:to_time)
+  # Ruby 1.9 has Date#to_time which converts to localtime only.
+  remove_method :to_time if instance_methods.include?(:to_time)
 
-            # Ruby 1.9 has Date#xmlschema which converts to a string without the time component.
-            remove_method :xmlschema if base.instance_methods.include?(:xmlschema)
-          end
-        end
+  # Ruby 1.9 has Date#xmlschema which converts to a string without the time component.
+  remove_method :xmlschema if instance_methods.include?(:xmlschema)
 
-        # Convert to a formatted string. See DATE_FORMATS for predefined formats.
-        #
-        # This method is aliased to <tt>to_s</tt>.
-        #
-        # ==== Examples
-        #   date = Date.new(2007, 11, 10)       # => Sat, 10 Nov 2007
-        #
-        #   date.to_formatted_s(:db)            # => "2007-11-10"
-        #   date.to_s(:db)                      # => "2007-11-10"
-        #
-        #   date.to_formatted_s(:short)         # => "10 Nov"
-        #   date.to_formatted_s(:long)          # => "November 10, 2007"
-        #   date.to_formatted_s(:long_ordinal)  # => "November 10th, 2007"
-        #   date.to_formatted_s(:rfc822)        # => "10 Nov 2007"
-        #
-        # == Adding your own time formats to to_formatted_s
-        # You can add your own formats to the Date::DATE_FORMATS hash.
-        # Use the format name as the hash key and either a strftime string
-        # or Proc instance that takes a date argument as the value.
-        #
-        #   # config/initializers/time_formats.rb
-        #   Date::DATE_FORMATS[:month_and_year] = "%B %Y"
-        #   Date::DATE_FORMATS[:short_ordinal] = lambda { |date| date.strftime("%B #{date.day.ordinalize}") }
-        def to_formatted_s(format = :default)
-          if formatter = DATE_FORMATS[format]
-            if formatter.respond_to?(:call)
-              formatter.call(self).to_s
-            else
-              strftime(formatter)
-            end
-          else
-            to_default_s
-          end
-        end
+  # Convert to a formatted string. See DATE_FORMATS for predefined formats.
+  #
+  # This method is aliased to <tt>to_s</tt>.
+  #
+  # ==== Examples
+  #   date = Date.new(2007, 11, 10)       # => Sat, 10 Nov 2007
+  #
+  #   date.to_formatted_s(:db)            # => "2007-11-10"
+  #   date.to_s(:db)                      # => "2007-11-10"
+  #
+  #   date.to_formatted_s(:short)         # => "10 Nov"
+  #   date.to_formatted_s(:long)          # => "November 10, 2007"
+  #   date.to_formatted_s(:long_ordinal)  # => "November 10th, 2007"
+  #   date.to_formatted_s(:rfc822)        # => "10 Nov 2007"
+  #
+  # == Adding your own time formats to to_formatted_s
+  # You can add your own formats to the Date::DATE_FORMATS hash.
+  # Use the format name as the hash key and either a strftime string
+  # or Proc instance that takes a date argument as the value.
+  #
+  #   # config/initializers/time_formats.rb
+  #   Date::DATE_FORMATS[:month_and_year] = "%B %Y"
+  #   Date::DATE_FORMATS[:short_ordinal] = lambda { |date| date.strftime("%B #{date.day.ordinalize}") }
+  def to_formatted_s(format = :default)
+    if formatter = DATE_FORMATS[format]
+      if formatter.respond_to?(:call)
+        formatter.call(self).to_s
+      else
+        strftime(formatter)
+      end
+    else
+      to_default_s
+    end
+  end
+  alias_method :to_default_s, :to_s
+  alias_method :to_s, :to_formatted_s
 
-        # Overrides the default inspect method with a human readable one, e.g., "Mon, 21 Feb 2005"
-        def readable_inspect
-          strftime("%a, %d %b %Y")
-        end
+  # Overrides the default inspect method with a human readable one, e.g., "Mon, 21 Feb 2005"
+  def readable_inspect
+    strftime("%a, %d %b %Y")
+  end
+  alias_method :default_inspect, :inspect
+  alias_method :inspect, :readable_inspect
 
-        # A method to keep Time, Date and DateTime instances interchangeable on conversions.
-        # In this case, it simply returns +self+.
-        def to_date
-          self
-        end if RUBY_VERSION < '1.9'
+  # A method to keep Time, Date and DateTime instances interchangeable on conversions.
+  # In this case, it simply returns +self+.
+  def to_date
+    self
+  end if RUBY_VERSION < '1.9'
 
-        # 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).
-        #
-        # ==== Examples
-        #   date = Date.new(2007, 11, 10)  # => Sat, 10 Nov 2007
-        #
-        #   date.to_time                   # => Sat Nov 10 00:00:00 0800 2007
-        #   date.to_time(:local)           # => Sat Nov 10 00:00:00 0800 2007
-        #
-        #   date.to_time(:utc)             # => Sat Nov 10 00:00:00 UTC 2007
-        def to_time(form = :local)
-          ::Time.send("#{form}_time", year, month, day)
-        end
+  # 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).
+  #
+  # ==== Examples
+  #   date = Date.new(2007, 11, 10)  # => Sat, 10 Nov 2007
+  #
+  #   date.to_time                   # => Sat Nov 10 00:00:00 0800 2007
+  #   date.to_time(:local)           # => Sat Nov 10 00:00:00 0800 2007
+  #
+  #   date.to_time(:utc)             # => Sat Nov 10 00:00:00 UTC 2007
+  def to_time(form = :local)
+    ::Time.send("#{form}_time", year, month, day)
+  end
 
-        # Converts a Date instance to a DateTime, where the time is set to the beginning of the day
-        # and UTC offset is set to 0.
-        #
-        # ==== Examples
-        #   date = Date.new(2007, 11, 10)  # => Sat, 10 Nov 2007
-        #
-        #   date.to_datetime               # => Sat, 10 Nov 2007 00:00:00 0000
-        def to_datetime
-          ::DateTime.civil(year, month, day, 0, 0, 0, 0)
-        end if RUBY_VERSION < '1.9'
+  # Converts a Date instance to a DateTime, where the time is set to the beginning of the day
+  # and UTC offset is set to 0.
+  #
+  # ==== Examples
+  #   date = Date.new(2007, 11, 10)  # => Sat, 10 Nov 2007
+  #
+  #   date.to_datetime               # => Sat, 10 Nov 2007 00:00:00 0000
+  def to_datetime
+    ::DateTime.civil(year, month, day, 0, 0, 0, 0)
+  end if RUBY_VERSION < '1.9'
 
-        def xmlschema
-          to_time.xmlschema
-        end
-      end
-    end
+  def xmlschema
+    to_time.xmlschema
   end
 end

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

@@ -0,0 +1,31 @@
+# Date memoizes some instance methods using metaprogramming to wrap
+# the methods with one that caches the result in an instance variable.
+#
+# If a Date is frozen but the memoized method hasn't been called, the
+# first call will result in a frozen object error since the memo
+# instance variable is uninitialized.
+#
+# Work around by eagerly memoizing before freezing.
+#
+# Ruby 1.9 uses a preinitialized instance variable so it's unaffected.
+# This hack is as close as we can get to feature detection:
+if RUBY_VERSION < '1.9'
+  require 'date'
+  begin
+    ::Date.today.freeze.jd
+  rescue => frozen_object_error
+    if frozen_object_error.message =~ /frozen/
+      class Date #:nodoc:
+        def freeze
+          self.class.private_instance_methods(false).each do |m|
+            if m.to_s =~ /\A__\d+__\Z/
+              instance_variable_set(:"@#{m}", [send(m)])
+            end
+          end
+
+          super
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+require 'active_support/core_ext/object/acts_like'
+
+class DateTime
+  # Duck-types as a Date-like class. See Object#acts_like?.
+  def acts_like_date?
+    true
+  end
+
+  # Duck-types as a Time-like class. See Object#acts_like?.
+  def acts_like_time?
+    true
+  end
+end

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

@@ -1,126 +1,113 @@
-require 'rational'
-
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module DateTime #:nodoc:
-      # Enables the use of time calculations within DateTime itself
-      module Calculations
-        def self.included(base) #:nodoc:
-          base.extend ClassMethods
-
-          base.class_eval do
-            alias_method :compare_without_coercion, :<=>
-            alias_method :<=>, :compare_with_coercion
-          end
-        end
-
-        module ClassMethods
-          # DateTimes aren't aware of DST rules, so use a consistent non-DST offset when creating a DateTime with an offset in the local zone
-          def local_offset
-            ::Time.local(2007).utc_offset.to_r / 86400
-          end
+require 'rational' unless RUBY_VERSION >= '1.9.2'
+require 'active_support/core_ext/object/acts_like'
+
+class DateTime
+  class << self
+    # DateTimes aren't aware of DST rules, so use a consistent non-DST offset when creating a DateTime with an offset in the local zone
+    def local_offset
+      ::Time.local(2007).utc_offset.to_r / 86400
+    end
 
-          def current
-            ::Time.zone_default ? ::Time.zone.now.to_datetime : ::Time.now.to_datetime
-          end
-        end
+    def current
+      ::Time.zone_default ? ::Time.zone.now.to_datetime : ::Time.now.to_datetime
+    end
+  end
 
-        # Tells whether the DateTime object's datetime lies in the past
-        def past?
-          self < ::DateTime.current
-        end
+  # Tells whether the DateTime object's datetime lies in the past
+  def past?
+    self < ::DateTime.current
+  end
 
-        # Tells whether the DateTime object's datetime lies in the future
-        def future?
-          self > ::DateTime.current
-        end
+  # Tells whether the DateTime object's datetime lies in the future
+  def future?
+    self > ::DateTime.current
+  end
 
-        # Seconds since midnight: DateTime.now.seconds_since_midnight
-        def seconds_since_midnight
-          self.sec + (self.min * 60) + (self.hour * 3600)
-        end
+  # Seconds since midnight: DateTime.now.seconds_since_midnight
+  def seconds_since_midnight
+    sec + (min * 60) + (hour * 3600)
+  end
 
-        # Returns a new DateTime where one or more of the elements have been changed according to the +options+ parameter. The time options
-        # (hour, minute, sec) reset cascadingly, so if only the hour is passed, then minute and sec is set to 0. If the hour and
-        # minute is passed, then sec is set to 0.
-        def change(options)
-          ::DateTime.civil(
-            options[:year]  || self.year,
-            options[:month] || self.month,
-            options[:day]   || self.day,
-            options[:hour]  || self.hour,
-            options[:min]   || (options[:hour] ? 0 : self.min),
-            options[:sec]   || ((options[:hour] || options[:min]) ? 0 : self.sec),
-            options[:offset]  || self.offset,
-            options[:start]  || self.start
-          )
-        end
+  # Returns a new DateTime where one or more of the elements have been changed according to the +options+ parameter. The time options
+  # (hour, minute, sec) reset cascadingly, so if only the hour is passed, then minute and sec is set to 0. If the hour and
+  # minute is passed, then sec is set to 0.
+  def change(options)
+    ::DateTime.civil(
+      options[:year]  || year,
+      options[:month] || month,
+      options[:day]   || day,
+      options[:hour]  || hour,
+      options[:min]   || (options[:hour] ? 0 : min),
+      options[:sec]   || ((options[:hour] || options[:min]) ? 0 : sec),
+      options[:offset]  || offset,
+      options[:start]  || start
+    )
+  end
 
-        # Uses Date to provide precise Time calculations for years, months, and days.
-        # 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>.
-        def advance(options)
-          d = to_date.advance(options)
-          datetime_advanced_by_date = change(:year => d.year, :month => d.month, :day => d.day)
-          seconds_to_advance = (options[:seconds] || 0) + (options[:minutes] || 0) * 60 + (options[:hours] || 0) * 3600
-          seconds_to_advance == 0 ? datetime_advanced_by_date : datetime_advanced_by_date.since(seconds_to_advance)
-        end
+  # Uses Date to provide precise Time calculations for years, months, and days.
+  # 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>.
+  def advance(options)
+    d = to_date.advance(options)
+    datetime_advanced_by_date = change(:year => d.year, :month => d.month, :day => d.day)
+    seconds_to_advance = (options[:seconds] || 0) + (options[:minutes] || 0) * 60 + (options[:hours] || 0) * 3600
+    seconds_to_advance == 0 ? datetime_advanced_by_date : datetime_advanced_by_date.since(seconds_to_advance)
+  end
 
-        # Returns a new DateTime representing the time a number of seconds ago
-        # Do not use this method in combination with x.months, use months_ago instead!
-        def ago(seconds)
-          self.since(-seconds)
-        end
+  # Returns a new DateTime representing the time a number of seconds ago
+  # Do not use this method in combination with x.months, use months_ago instead!
+  def ago(seconds)
+    since(-seconds)
+  end
 
-        # Returns a new DateTime representing the time a number of seconds since the instance time
-        # Do not use this method in combination with x.months, use months_since instead!
-        def since(seconds)
-          self + Rational(seconds.round, 86400)
-        end
-        alias :in :since
+  # Returns a new DateTime representing the time a number of seconds since the instance time
+  # Do not use this method in combination with x.months, use months_since instead!
+  def since(seconds)
+    self + Rational(seconds.round, 86400)
+  end
+  alias :in :since
 
-        # Returns a new DateTime 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 DateTime 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 DateTime representing the end of the day (23:59:59)
-        def end_of_day
-          change(:hour => 23, :min => 59, :sec => 59)
-        end
+  # Returns a new DateTime representing the end of the day (23:59:59)
+  def end_of_day
+    change(:hour => 23, :min => 59, :sec => 59)
+  end
 
-        # Adjusts DateTime to UTC by adding its offset value; offset is set to 0
-        #
-        # Example:
-        #
-        #   DateTime.civil(2005, 2, 21, 10, 11, 12, Rational(-6, 24))       # => Mon, 21 Feb 2005 10:11:12 -0600
-        #   DateTime.civil(2005, 2, 21, 10, 11, 12, Rational(-6, 24)).utc   # => Mon, 21 Feb 2005 16:11:12 +0000
-        def utc
-          new_offset(0)
-        end
-        alias_method :getutc, :utc
+  # Adjusts DateTime to UTC by adding its offset value; offset is set to 0
+  #
+  # Example:
+  #
+  #   DateTime.civil(2005, 2, 21, 10, 11, 12, Rational(-6, 24))       # => Mon, 21 Feb 2005 10:11:12 -0600
+  #   DateTime.civil(2005, 2, 21, 10, 11, 12, Rational(-6, 24)).utc   # => Mon, 21 Feb 2005 16:11:12 +0000
+  def utc
+    new_offset(0)
+  end
+  alias_method :getutc, :utc
 
-        # Returns true if offset == 0
-        def utc?
-          offset == 0
-        end
+  # Returns true if offset == 0
+  def utc?
+    offset == 0
+  end
 
-        # Returns the offset value in seconds
-        def utc_offset
-          (offset * 86400).to_i
-        end
+  # Returns the offset value in seconds
+  def utc_offset
+    (offset * 86400).to_i
+  end
 
-        # Layers additional behavior on DateTime#<=> so that Time and ActiveSupport::TimeWithZone instances can be compared with a DateTime
-        def compare_with_coercion(other)
-          other = other.comparable_time if other.respond_to?(:comparable_time)
-          other = other.to_datetime unless other.acts_like?(:date)
-          compare_without_coercion(other)
-        end
-      end
-    end
+  # Layers additional behavior on DateTime#<=> so that Time and ActiveSupport::TimeWithZone instances can be compared with a DateTime
+  def compare_with_coercion(other)
+    other = other.comparable_time if other.respond_to?(:comparable_time)
+    other = other.to_datetime unless other.acts_like?(:date)
+    compare_without_coercion(other)
   end
+  alias_method :compare_without_coercion, :<=>
+  alias_method :<=>, :compare_with_coercion
 end