csd 0.0.15 → 0.0.16

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

@@ -0,0 +1,4 @@
+class String
+  alias_method :starts_with?, :start_with?
+  alias_method :ends_with?, :end_with?
+end

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

@@ -0,0 +1,18 @@
+begin
+  # See http://fast-xs.rubyforge.org/ by Eric Wong.
+  # Also included with hpricot.
+  require 'fast_xs'
+rescue LoadError
+  # fast_xs extension unavailable
+else
+  begin
+    require 'builder'
+  rescue LoadError
+    # builder demands the first shot at defining String#to_xs
+  end
+
+  class String
+    alias_method :original_xs, :to_xs if method_defined?(:to_xs)
+    alias_method :to_xs, :fast_xs
+  end
+end

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

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

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

@@ -0,0 +1,282 @@
+require 'active_support/duration'
+require 'active_support/core_ext/date/acts_like'
+require 'active_support/core_ext/date/calculations'
+require 'active_support/core_ext/date_time/conversions'
+
+class Time
+  COMMON_YEAR_DAYS_IN_MONTH = [nil, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+  DAYS_INTO_WEEK = { :monday => 0, :tuesday => 1, :wednesday => 2, :thursday => 3, :friday => 4, :saturday => 5, :sunday => 6 }
+
+  class << self
+    # Overriding case equality method so that it returns true for ActiveSupport::TimeWithZone instances
+    def ===(other)
+      other.is_a?(::Time)
+    end
+
+    # Return 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 = now.year)
+      return 29 if month == 2 && ::Date.gregorian_leap?(year)
+      COMMON_YEAR_DAYS_IN_MONTH[month]
+    end
+
+    # Returns a new Time if requested year can be accommodated by Ruby's Time class
+    # (i.e., if year is within either 1970..2038 or 1902..2038, depending on system architecture);
+    # otherwise returns a DateTime
+    def time_with_datetime_fallback(utc_or_local, year, month=1, day=1, hour=0, min=0, sec=0, usec=0)
+      time = ::Time.send(utc_or_local, year, month, day, hour, min, sec, usec)
+      # This check is needed because Time.utc(y) returns a time object in the 2000s for 0 <= y <= 138.
+      time.year == year ? time : ::DateTime.civil_from_format(utc_or_local, year, month, day, hour, min, sec)
+    rescue
+      ::DateTime.civil_from_format(utc_or_local, year, month, day, hour, min, sec)
+    end
+
+    # Wraps class method +time_with_datetime_fallback+ with +utc_or_local+ set to <tt>:utc</tt>.
+    def utc_time(*args)
+      time_with_datetime_fallback(:utc, *args)
+    end
+
+    # Wraps class method +time_with_datetime_fallback+ with +utc_or_local+ set to <tt>:local</tt>.
+    def local_time(*args)
+      time_with_datetime_fallback(:local, *args)
+    end
+  end
+
+  # Tells whether the Time object's time lies in the past
+  def past?
+    self < ::Time.current
+  end
+
+  # Tells whether the Time object's time is today
+  def today?
+    to_date == ::Date.current
+  end
+
+  # Tells whether the Time object's time lies in the future
+  def future?
+    self > ::Time.current
+  end
+
+  # Seconds since midnight: Time.now.seconds_since_midnight
+  def seconds_since_midnight
+    to_i - change(:hour => 0).to_i + (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(
+      utc? ? :utc_time : :local_time,
+      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[:usec]  || ((options[:hour] || options[:min] || options[:sec]) ? 0 : usec)
+    )
+  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)
+    unless options[:weeks].nil?
+      options[:weeks], partial_weeks = options[:weeks].divmod(1)
+      options[:days] = (options[:days] || 0) + 7 * partial_weeks
+    end
+    
+    unless options[:days].nil?
+      options[:days], partial_days = options[:days].divmod(1)
+      options[:hours] = (options[:hours] || 0) + 24 * partial_days
+    end
+    
+    d = to_date.advance(options)
+    time_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 ? time_advanced_by_date : time_advanced_by_date.since(seconds_to_advance)
+  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
+  rescue
+    to_datetime.since(seconds)
+  end
+  alias :in :since
+
+  # Returns a new Time representing the time a number of specified months ago
+  def months_ago(months)
+    advance(:months => -months)
+  end
+
+  # Returns a new Time representing the time a number of specified months in the future
+  def months_since(months)
+    advance(:months => months)
+  end
+
+  # Returns a new Time representing the time a number of specified years ago
+  def years_ago(years)
+    advance(:years => -years)
+  end
+
+  # Returns a new Time representing the time a number of specified years in the future
+  def years_since(years)
+    advance(:years => years)
+  end
+
+  # Short-hand for years_ago(1)
+  def prev_year
+    years_ago(1)
+  end
+
+  # Short-hand for years_since(1)
+  def next_year
+    years_since(1)
+  end
+
+  # Short-hand for months_ago(1)
+  def prev_month
+    months_ago(1)
+  end
+
+  # 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 = wday!=0 ? 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 end of this week, (end of Sunday)
+  def end_of_week
+    days_to_sunday = wday!=0 ? 7-wday : 0
+    (self + days_to_sunday.days).end_of_day
+  end
+  alias :at_end_of_week :end_of_week
+
+  # Returns a new Time representing the start of the given day in next week (default is Monday).
+  def next_week(day = :monday)
+    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 - seconds_since_midnight).change(:usec => 0)
+    change(:hour => 0, :min => 0, :sec => 0, :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 end of the day, 23:59:59.999999 (.999999999 in ruby1.9)
+  def end_of_day
+    change(:hour => 23, :min => 59, :sec => 59, :usec => 999999.999)
+  end
+
+  # 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(:day => 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 (end of the last day of the month)
+  def end_of_month
+    #self - ((self.mday-1).days + self.seconds_since_midnight)
+    last_day = ::Time.days_in_month(month, year)
+    change(:day => last_day, :hour => 23, :min => 59, :sec => 59, :usec => 999999.999)
+  end
+  alias :at_end_of_month :end_of_month
+
+  # Returns  a new Time representing the start of the quarter (1st of january, april, july, october, 0:00)
+  def beginning_of_quarter
+    beginning_of_month.change(:month => [10, 7, 4, 1].detect { |m| m <= month })
+  end
+  alias :at_beginning_of_quarter :beginning_of_quarter
+
+  # Returns a new Time representing the end of the quarter (end of the last day of march, june, september, december)
+  def end_of_quarter
+    beginning_of_month.change(:month => [3, 6, 9, 12].detect { |m| m >= month }).end_of_month
+  end
+  alias :at_end_of_quarter :end_of_quarter
+
+  # Returns  a new Time representing the start of the year (1st of january, 0:00)
+  def beginning_of_year
+    change(:month => 1, :day => 1, :hour => 0, :min => 0, :sec => 0, :usec => 0)
+  end
+  alias :at_beginning_of_year :beginning_of_year
+
+  # Returns a new Time representing the end of the year (end of the 31st of december)
+  def end_of_year
+    change(:month => 12, :day => 31, :hour => 23, :min => 59, :sec => 59, :usec => 999999.999)
+  end
+  alias :at_end_of_year :end_of_year
+
+  # Convenience method which returns a new Time representing the time 1 day ago
+  def yesterday
+    advance(:days => -1)
+  end
+
+  # Convenience method which returns a new Time representing the time 1 day since the instance time
+  def tomorrow
+    advance(:days => 1)
+  end
+
+  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
+
+  # Layers additional behavior on Time#<=> so that DateTime and ActiveSupport::TimeWithZone instances
+  # can be chronologically compared with a Time
+  def compare_with_coercion(other)
+    # if other is an ActiveSupport::TimeWithZone, coerce a Time instance from it so we can do <=> comparison
+    other = other.comparable_time if other.respond_to?(:comparable_time)
+    if other.acts_like?(:date)
+      # other is a Date/DateTime, so coerce self #to_datetime and hand off to DateTime#<=>
+      to_datetime.compare_without_coercion(other)
+    else
+      compare_without_coercion(other)
+    end
+  end
+  alias_method :compare_without_coercion, :<=>
+  alias_method :<=>, :compare_with_coercion
+end

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

@@ -0,0 +1,85 @@
+require 'active_support/inflector'
+require 'active_support/core_ext/time/publicize_conversion_methods'
+require 'active_support/values/time_zone'
+
+class Time
+  DATE_FORMATS = {
+    :db           => "%Y-%m-%d %H:%M:%S",
+    :number       => "%Y%m%d%H%M%S",
+    :time         => "%H:%M",
+    :short        => "%d %b %H:%M",
+    :long         => "%B %d, %Y %H:%M",
+    :long_ordinal => lambda { |time| time.strftime("%B #{ActiveSupport::Inflector.ordinalize(time.day)}, %Y %H:%M") },
+    :rfc822       => lambda { |time| time.strftime("%a, %d %b %Y %H:%M:%S #{time.formatted_offset(false)}") }
+  }
+
+  # Converts to a formatted string. See DATE_FORMATS for builtin formats.
+  #
+  # This method is aliased to <tt>to_s</tt>.
+  #
+  #   time = Time.now                     # => Thu Jan 18 06:10:17 CST 2007
+  #
+  #   time.to_formatted_s(:time)          # => "06:10:17"
+  #   time.to_s(:time)                    # => "06:10:17"
+  #
+  #   time.to_formatted_s(:db)            # => "2007-01-18 06:10:17"
+  #   time.to_formatted_s(:number)        # => "20070118061017"
+  #   time.to_formatted_s(:short)         # => "18 Jan 06:10"
+  #   time.to_formatted_s(:long)          # => "January 18, 2007 06:10"
+  #   time.to_formatted_s(:long_ordinal)  # => "January 18th, 2007 06:10"
+  #   time.to_formatted_s(:rfc822)        # => "Thu, 18 Jan 2007 06:10:17 -0600"
+  #
+  # == Adding your own time formats to +to_formatted_s+
+  # 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] = lambda { |time| time.strftime("%B #{time.day.ordinalize}") }
+  def to_formatted_s(format = :default)
+    if formatter = DATE_FORMATS[format]
+      formatter.respond_to?(:call) ? formatter.call(self).to_s : strftime(formatter)
+    else
+      to_default_s
+    end
+  end
+  alias_method :to_default_s, :to_s
+  alias_method :to_s, :to_formatted_s
+ 
+  # Returns the UTC offset as an +HH:MM formatted string.
+  #
+  #   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
+
+  # Converts a Time object to a Date, dropping hour, minute, and second precision.
+  #
+  #   my_time = Time.now  # => Mon Nov 12 22:59:51 -0500 2007
+  #   my_time.to_date     # => Mon, 12 Nov 2007
+  #
+  #   your_time = Time.parse("1/13/2009 1:13:03 P.M.")  # => Tue Jan 13 13:13:03 -0500 2009
+  #   your_time.to_date                                 # => Tue, 13 Jan 2009
+  def to_date
+    ::Date.new(year, month, day)
+  end unless method_defined?(:to_date)
+
+  # A method to keep Time, Date and DateTime instances interchangeable on conversions.
+  # In this case, it simply returns +self+.
+  def to_time
+    self
+  end unless method_defined?(:to_time)
+
+  # Converts a Time instance to a Ruby DateTime instance, preserving UTC offset.
+  #
+  #   my_time = Time.now    # => Mon Nov 12 23:04:21 -0500 2007
+  #   my_time.to_datetime   # => Mon, 12 Nov 2007 23:04:21 -0500
+  #
+  #   your_time = Time.parse("1/13/2009 1:13:03 P.M.")  # => Tue Jan 13 13:13:03 -0500 2009
+  #   your_time.to_datetime                             # => Tue, 13 Jan 2009 13:13:03 -0500
+  def to_datetime
+    ::DateTime.civil(year, month, day, hour, min, sec, Rational(utc_offset, 86400))
+  end unless method_defined?(:to_datetime)
+end

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

@@ -0,0 +1,56 @@
+# Pre-1.9 versions of Ruby have a bug with marshaling Time instances, where utc instances are
+# unmarshalled in the local zone, instead of utc. We're layering behavior on the _dump and _load
+# methods so that utc instances can be flagged on dump, and coerced back to utc on load.
+if !Marshal.load(Marshal.dump(Time.now.utc)).utc?
+  class Time
+    class << self
+      alias_method :_load_without_utc_flag, :_load
+      def _load(marshaled_time)
+        time = _load_without_utc_flag(marshaled_time)
+        time.instance_eval do
+          if defined?(@marshal_with_utc_coercion)
+            val = remove_instance_variable("@marshal_with_utc_coercion")
+          end
+          val ? utc : self
+        end
+      end
+    end
+
+    alias_method :_dump_without_utc_flag, :_dump
+    def _dump(*args)
+      obj = dup
+      obj.instance_variable_set('@marshal_with_utc_coercion', utc?)
+      obj._dump_without_utc_flag(*args)
+    end
+  end
+end
+
+# Ruby 1.9.2 adds utc_offset and zone to Time, but marshaling only
+# preserves utc_offset. Preserve zone also, even though it may not
+# work in some edge cases.
+if Time.local(2010).zone != Marshal.load(Marshal.dump(Time.local(2010))).zone
+  class Time
+    class << self
+      alias_method :_load_without_zone, :_load
+      def _load(marshaled_time)
+        time = _load_without_zone(marshaled_time)
+        time.instance_eval do
+          if zone = defined?(@_zone) && remove_instance_variable('@_zone')
+            ary = to_a
+            ary[-1] = zone
+            utc? ? Time.utc(*ary) : Time.local(*ary)
+          else
+            self
+          end
+        end
+      end
+    end
+
+    alias_method :_dump_without_zone, :_dump
+    def _dump(*args)
+      obj = dup
+      obj.instance_variable_set('@_zone', zone)
+      obj._dump_without_zone(*args)
+    end
+  end
+end