time_crisis 0.1.8 → 0.2.0

data/lib/time_crisis/tzinfo/definitions/Pacific/Guam.rb

@@ -0,0 +1,22 @@
+require 'time_crisis/tzinfo/timezone_definition'
+
+module TimeCrisis::TZInfo
+  module Definitions
+    module Pacific
+      module Guam
+        include TimezoneDefinition
+
+        timezone 'Pacific/Guam' do |tz|
+          tz.offset :o0, -51660, 0, :LMT
+          tz.offset :o1, 34740, 0, :LMT
+          tz.offset :o2, 36000, 0, :GST
+          tz.offset :o3, 36000, 0, :ChST
+
+          tz.transition 1844, 12, :o1, 1149567407, 480
+          tz.transition 1900, 12, :o2, 1159384847, 480
+          tz.transition 2000, 12, :o3, 977493600
+        end
+      end
+    end
+  end
+end

data/lib/time_crisis/tzinfo/definitions/Pacific/Honolulu.rb

@@ -0,0 +1,28 @@
+require 'time_crisis/tzinfo/timezone_definition'
+
+module TimeCrisis::TZInfo
+  module Definitions
+    module Pacific
+      module Honolulu
+        include TimezoneDefinition
+
+        timezone 'Pacific/Honolulu' do |tz|
+          tz.offset :o0, -37886, 0, :LMT
+          tz.offset :o1, -37800, 0, :HST
+          tz.offset :o2, -37800, 3600, :HDT
+          tz.offset :o3, -37800, 3600, :HWT
+          tz.offset :o4, -37800, 3600, :HPT
+          tz.offset :o5, -36000, 0, :HST
+
+          tz.transition 1900, 1, :o1, 104328926143, 43200
+          tz.transition 1933, 4, :o2, 116505265, 48
+          tz.transition 1933, 5, :o1, 116506271, 48
+          tz.transition 1942, 2, :o3, 116659201, 48
+          tz.transition 1945, 8, :o4, 58360379, 24
+          tz.transition 1945, 9, :o1, 116722991, 48
+          tz.transition 1947, 6, :o5, 116752561, 48
+        end
+      end
+    end
+  end
+end

data/lib/time_crisis/tzinfo/definitions/Pacific/Majuro.rb

@@ -0,0 +1,20 @@
+require 'time_crisis/tzinfo/timezone_definition'
+
+module TimeCrisis::TZInfo
+  module Definitions
+    module Pacific
+      module Majuro
+        include TimezoneDefinition
+
+        timezone 'Pacific/Majuro' do |tz|
+          tz.offset :o0, 41088, 0, :LMT
+          tz.offset :o1, 39600, 0, :MHT
+          tz.offset :o2, 43200, 0, :MHT
+
+          tz.transition 1900, 12, :o1, 1086923261, 450
+          tz.transition 1969, 9, :o2, 58571881, 24
+        end
+      end
+    end
+  end
+end

data/lib/time_crisis/tzinfo/definitions/Pacific/Midway.rb

@@ -0,0 +1,25 @@
+require 'time_crisis/tzinfo/timezone_definition'
+
+module TimeCrisis::TZInfo
+  module Definitions
+    module Pacific
+      module Midway
+        include TimezoneDefinition
+
+        timezone 'Pacific/Midway' do |tz|
+          tz.offset :o0, -42568, 0, :LMT
+          tz.offset :o1, -39600, 0, :NST
+          tz.offset :o2, -39600, 3600, :NDT
+          tz.offset :o3, -39600, 0, :BST
+          tz.offset :o4, -39600, 0, :SST
+
+          tz.transition 1901, 1, :o1, 26086168721, 10800
+          tz.transition 1956, 6, :o2, 58455071, 24
+          tz.transition 1956, 9, :o1, 29228627, 12
+          tz.transition 1967, 4, :o3, 58549967, 24
+          tz.transition 1983, 11, :o4, 439038000
+        end
+      end
+    end
+  end
+end

data/lib/time_crisis/tzinfo/definitions/Pacific/Noumea.rb

@@ -0,0 +1,25 @@
+require 'time_crisis/tzinfo/timezone_definition'
+
+module TimeCrisis::TZInfo
+  module Definitions
+    module Pacific
+      module Noumea
+        include TimezoneDefinition
+
+        timezone 'Pacific/Noumea' do |tz|
+          tz.offset :o0, 39948, 0, :LMT
+          tz.offset :o1, 39600, 0, :NCT
+          tz.offset :o2, 39600, 3600, :NCST
+
+          tz.transition 1912, 1, :o1, 17419781071, 7200
+          tz.transition 1977, 12, :o2, 250002000
+          tz.transition 1978, 2, :o1, 257342400
+          tz.transition 1978, 12, :o2, 281451600
+          tz.transition 1979, 2, :o1, 288878400
+          tz.transition 1996, 11, :o2, 849366000
+          tz.transition 1997, 3, :o1, 857228400
+        end
+      end
+    end
+  end
+end

data/lib/time_crisis/tzinfo/definitions/Pacific/Pago_Pago.rb

@@ -0,0 +1,26 @@
+require 'time_crisis/tzinfo/timezone_definition'
+
+module TimeCrisis::TZInfo
+  module Definitions
+    module Pacific
+      module Pago_Pago
+        include TimezoneDefinition
+
+        timezone 'Pacific/Pago_Pago' do |tz|
+          tz.offset :o0, 45432, 0, :LMT
+          tz.offset :o1, -40968, 0, :LMT
+          tz.offset :o2, -41400, 0, :SAMT
+          tz.offset :o3, -39600, 0, :NST
+          tz.offset :o4, -39600, 0, :BST
+          tz.offset :o5, -39600, 0, :SST
+
+          tz.transition 1879, 7, :o1, 2889041969, 1200
+          tz.transition 1911, 1, :o2, 2902845569, 1200
+          tz.transition 1950, 1, :o3, 116797583, 48
+          tz.transition 1967, 4, :o4, 58549967, 24
+          tz.transition 1983, 11, :o5, 439038000
+        end
+      end
+    end
+  end
+end

data/lib/time_crisis/tzinfo/definitions/Pacific/Port_Moresby.rb

@@ -0,0 +1,20 @@
+require 'time_crisis/tzinfo/timezone_definition'
+
+module TimeCrisis::TZInfo
+  module Definitions
+    module Pacific
+      module Port_Moresby
+        include TimezoneDefinition
+
+        timezone 'Pacific/Port_Moresby' do |tz|
+          tz.offset :o0, 35320, 0, :LMT
+          tz.offset :o1, 35312, 0, :PMMT
+          tz.offset :o2, 36000, 0, :PGT
+
+          tz.transition 1879, 12, :o1, 5200664597, 2160
+          tz.transition 1894, 12, :o2, 13031248093, 5400
+        end
+      end
+    end
+  end
+end

data/lib/time_crisis/tzinfo/definitions/Pacific/Tongatapu.rb

@@ -0,0 +1,27 @@
+require 'time_crisis/tzinfo/timezone_definition'
+
+module TimeCrisis::TZInfo
+  module Definitions
+    module Pacific
+      module Tongatapu
+        include TimezoneDefinition
+
+        timezone 'Pacific/Tongatapu' do |tz|
+          tz.offset :o0, 44360, 0, :LMT
+          tz.offset :o1, 44400, 0, :TOT
+          tz.offset :o2, 46800, 0, :TOT
+          tz.offset :o3, 46800, 3600, :TOST
+
+          tz.transition 1900, 12, :o1, 5217231571, 2160
+          tz.transition 1940, 12, :o2, 174959639, 72
+          tz.transition 1999, 10, :o3, 939214800
+          tz.transition 2000, 3, :o2, 953384400
+          tz.transition 2000, 11, :o3, 973342800
+          tz.transition 2001, 1, :o2, 980596800
+          tz.transition 2001, 11, :o3, 1004792400
+          tz.transition 2002, 1, :o2, 1012046400
+        end
+      end
+    end
+  end
+end

data/lib/time_crisis/tzinfo/info_timezone.rb

@@ -0,0 +1,32 @@
+require 'time_crisis/tzinfo/timezone'
+
+module TimeCrisis
+  module TZInfo
+
+    # A Timezone based on a TimezoneInfo.
+    class InfoTimezone < Timezone #:nodoc:
+
+      # Constructs a new InfoTimezone with a TimezoneInfo instance.
+      def self.new(info)
+        tz = super()
+        tz.send(:setup, info)
+        tz
+      end
+
+      # The identifier of the timezone, e.g. "Europe/Paris".
+      def identifier
+        @info.identifier
+      end
+
+      protected
+      # The TimezoneInfo for this Timezone.
+      def info
+        @info
+      end
+
+      def setup(info)
+        @info = info
+      end
+    end
+  end
+end

data/lib/time_crisis/tzinfo/linked_timezone.rb

@@ -0,0 +1,32 @@
+require 'time_crisis/tzinfo/info_timezone'
+
+module TimeCrisis
+  module TZInfo
+
+    class LinkedTimezone < InfoTimezone #:nodoc:
+      # Returns the TimezonePeriod for the given UTC time. utc can either be
+      # a DateTime, Time or integer timestamp (Time.to_i). Any timezone
+      # information in utc is ignored (it is treated as a UTC time).
+      #
+      # If no TimezonePeriod could be found, PeriodNotFound is raised.
+      def period_for_utc(utc)
+        @linked_timezone.period_for_utc(utc)
+      end
+
+      # Returns the set of TimezonePeriod instances that are valid for the given
+      # local time as an array. If you just want a single period, use
+      # period_for_local instead and specify how abiguities should be resolved.
+      # Raises PeriodNotFound if no periods are found for the given time.
+      def periods_for_local(local)
+        @linked_timezone.periods_for_local(local)
+      end
+
+      protected
+
+      def setup(info)
+        super(info)
+        @linked_timezone = Timezone.get(info.link_to_identifier)
+      end
+    end
+  end
+end

data/lib/time_crisis/tzinfo/linked_timezone_info.rb

@@ -0,0 +1,24 @@
+require 'time_crisis/tzinfo/timezone_info'
+
+module TimeCrisis
+  module TZInfo
+    # Represents a linked timezone defined in a data module.
+    class LinkedTimezoneInfo < TimezoneInfo #:nodoc:
+
+      # The zone that provides the data (that this zone is an alias for).
+      attr_reader :link_to_identifier
+
+      # Constructs a new TimezoneInfo with an identifier and the identifier
+      # of the zone linked to.
+      def initialize(identifier, link_to_identifier)
+        super(identifier)
+        @link_to_identifier = link_to_identifier
+      end
+
+      # Returns internal object state as a programmer-readable string.
+      def inspect
+        "#<#{self.class}: #@identifier,#@link_to_identifier>"
+      end
+    end
+  end
+end

data/lib/time_crisis/tzinfo/offset_rationals.rb

@@ -0,0 +1,79 @@
+require 'rational'
+require 'time_crisis/tzinfo/ruby_core_support'
+
+module TimeCrisis
+  module TZInfo
+
+    # Provides a method for getting Rationals for a timezone offset in seconds.
+    # Pre-reduced rationals are returned for all the half-hour intervals between
+    # -14 and +14 hours to avoid having to call gcd at runtime.
+    module OffsetRationals #:nodoc:
+      @@rational_cache = {
+              -50400 => RubyCoreSupport.rational_new!(-7, 12),
+              -48600 => RubyCoreSupport.rational_new!(-9, 16),
+              -46800 => RubyCoreSupport.rational_new!(-13, 24),
+              -45000 => RubyCoreSupport.rational_new!(-25, 48),
+              -43200 => RubyCoreSupport.rational_new!(-1, 2),
+              -41400 => RubyCoreSupport.rational_new!(-23, 48),
+              -39600 => RubyCoreSupport.rational_new!(-11, 24),
+              -37800 => RubyCoreSupport.rational_new!(-7, 16),
+              -36000 => RubyCoreSupport.rational_new!(-5, 12),
+              -34200 => RubyCoreSupport.rational_new!(-19, 48),
+              -32400 => RubyCoreSupport.rational_new!(-3, 8),
+              -30600 => RubyCoreSupport.rational_new!(-17, 48),
+              -28800 => RubyCoreSupport.rational_new!(-1, 3),
+              -27000 => RubyCoreSupport.rational_new!(-5, 16),
+              -25200 => RubyCoreSupport.rational_new!(-7, 24),
+              -23400 => RubyCoreSupport.rational_new!(-13, 48),
+              -21600 => RubyCoreSupport.rational_new!(-1, 4),
+              -19800 => RubyCoreSupport.rational_new!(-11, 48),
+              -18000 => RubyCoreSupport.rational_new!(-5, 24),
+              -16200 => RubyCoreSupport.rational_new!(-3, 16),
+              -14400 => RubyCoreSupport.rational_new!(-1, 6),
+              -12600 => RubyCoreSupport.rational_new!(-7, 48),
+              -10800 => RubyCoreSupport.rational_new!(-1, 8),
+              -9000 => RubyCoreSupport.rational_new!(-5, 48),
+              -7200 => RubyCoreSupport.rational_new!(-1, 12),
+              -5400 => RubyCoreSupport.rational_new!(-1, 16),
+              -3600 => RubyCoreSupport.rational_new!(-1, 24),
+              -1800 => RubyCoreSupport.rational_new!(-1, 48),
+              0 => RubyCoreSupport.rational_new!(0, 1),
+              1800 => RubyCoreSupport.rational_new!(1, 48),
+              3600 => RubyCoreSupport.rational_new!(1, 24),
+              5400 => RubyCoreSupport.rational_new!(1, 16),
+              7200 => RubyCoreSupport.rational_new!(1, 12),
+              9000 => RubyCoreSupport.rational_new!(5, 48),
+              10800 => RubyCoreSupport.rational_new!(1, 8),
+              12600 => RubyCoreSupport.rational_new!(7, 48),
+              14400 => RubyCoreSupport.rational_new!(1, 6),
+              16200 => RubyCoreSupport.rational_new!(3, 16),
+              18000 => RubyCoreSupport.rational_new!(5, 24),
+              19800 => RubyCoreSupport.rational_new!(11, 48),
+              21600 => RubyCoreSupport.rational_new!(1, 4),
+              23400 => RubyCoreSupport.rational_new!(13, 48),
+              25200 => RubyCoreSupport.rational_new!(7, 24),
+              27000 => RubyCoreSupport.rational_new!(5, 16),
+              28800 => RubyCoreSupport.rational_new!(1, 3),
+              30600 => RubyCoreSupport.rational_new!(17, 48),
+              32400 => RubyCoreSupport.rational_new!(3, 8),
+              34200 => RubyCoreSupport.rational_new!(19, 48),
+              36000 => RubyCoreSupport.rational_new!(5, 12),
+              37800 => RubyCoreSupport.rational_new!(7, 16),
+              39600 => RubyCoreSupport.rational_new!(11, 24),
+              41400 => RubyCoreSupport.rational_new!(23, 48),
+              43200 => RubyCoreSupport.rational_new!(1, 2),
+              45000 => RubyCoreSupport.rational_new!(25, 48),
+              46800 => RubyCoreSupport.rational_new!(13, 24),
+              48600 => RubyCoreSupport.rational_new!(9, 16),
+              50400 => RubyCoreSupport.rational_new!(7, 12)}
+
+      # Returns a Rational expressing the fraction of a day that offset in
+      # seconds represents (i.e. equivalent to Rational(offset, 86400)).
+      def rational_for_offset(offset)
+        @@rational_cache[offset] || Rational(offset, 86400)
+      end
+
+      module_function :rational_for_offset
+    end
+  end
+end

data/lib/time_crisis/tzinfo/ruby_core_support.rb

@@ -0,0 +1,33 @@
+require 'rational'
+
+module TimeCrisis
+  module TZInfo
+
+    # Methods to support different versions of Ruby.
+    module RubyCoreSupport #:nodoc:
+
+      # Use Rational.new! for performance reasons in Ruby 1.8.
+      # This has been removed from 1.9, but Rational performs better.
+      if Rational.respond_to? :new!
+        def self.rational_new!(numerator, denominator = 1)
+          Rational.new!(numerator, denominator)
+        end
+      else
+        def self.rational_new!(numerator, denominator = 1)
+          Rational(numerator, denominator)
+        end
+      end
+
+      def self.datetime_new!(ajd = 0, offset = 0, sg = nil)
+        if offset < 0
+          offset = 1 + offset
+        end
+
+        jd, fract = (ajd + offset + Rational(1, 2)).divmod(1)
+
+        ::TimeCrisis::DateTime.jd_fract(jd.to_i, fract.to_f)
+      end
+
+    end
+  end
+end

data/lib/time_crisis/tzinfo/time_or_datetime.rb

@@ -0,0 +1,309 @@
+require 'time_crisis/tzinfo/offset_rationals'
+
+module TimeCrisis
+  module TZInfo
+    # Used by TZInfo internally to represent either a Time, DateTime or integer
+    # timestamp (seconds since 1970-01-01 00:00:00).
+    class TimeOrDateTime #:nodoc:
+      include Comparable
+
+      # Constructs a new TimeOrDateTime. timeOrDateTime can be a Time, DateTime
+      # or an integer. If using a Time or DateTime, any time zone information is
+      # ignored.
+      def initialize(timeOrDateTime)
+        @time = nil
+        @datetime = nil
+        @timestamp = nil
+
+        if timeOrDateTime.is_a?(Time)
+          @time = timeOrDateTime
+          @time = Time.utc(@time.year, @time.mon, @time.mday, @time.hour, @time.min, @time.sec) unless @time.zone == 'UTC'
+          @orig = @time
+        elsif timeOrDateTime.is_a?(::TimeCrisis::DateTime)
+          @tcdatetime = timeOrDateTime
+          @tcdatetime.offset = 0
+          @orig = @tcdatetime
+        elsif timeOrDateTime.is_a?(::DateTime)
+          @datetime = timeOrDateTime
+          @datetime = @datetime.new_offset(0) unless @datetime.offset == 0
+          @orig = @datetime
+        else
+          @timestamp = timeOrDateTime.to_i
+          @orig = @timestamp
+        end
+      end
+
+      # Returns the time as a Time.
+      def to_time
+        unless @time
+          if @timestamp
+            @time = Time.at(@timestamp).utc
+          else
+            @time = Time.utc(year, mon, mday, hour, min, sec)
+          end
+        end
+
+        @time
+      end
+
+      # Returns the time as a DateTime.
+      def to_datetime
+        unless @datetime
+          @datetime = ::DateTime.civil(year, mon, mday, hour, min, sec)
+        end
+
+        @datetime
+      end
+
+      # returns the time as a TimeCrisis::DateTime
+      def to_tc_datetime
+        unless @tcdatetime
+          @tcdatetime = ::TimeCrisis::DateTime.civil(year, mon, mday, hour, min, sec)
+        end
+
+        @tcdatetime
+      end
+
+      # Returns the time as an integer timestamp.
+      def to_i
+        unless @timestamp
+          @timestamp = to_time.to_i
+        end
+
+        @timestamp
+      end
+
+      # Returns the time as the original time passed to new.
+      def to_orig
+        @orig
+      end
+
+      # Returns a string representation of the TimeOrDateTime.
+      def to_s
+        if @orig.is_a?(Time)
+          "Time: #{@orig.to_s}"
+        elsif @orig.is_a?(::TimeCrisis::DateTime)
+          "TimeCrisis::DateTime: #{@orig.to_s}"
+        elsif @orig.is_a?(::DateTime)
+          "DateTime: #{@orig.to_s}"
+        else
+          "Timestamp: #{@orig.to_s}"
+        end
+      end
+
+      # Returns internal object state as a programmer-readable string.
+      def inspect
+        "#<#{self.class}: #{@orig.inspect}>"
+      end
+
+      # Returns the year.
+      def year
+        if @time
+          @time.year
+        elsif @datetime
+          @datetime.year
+        elsif @tcdatetime
+          @tcdatetime.year
+        else
+          to_time.year
+        end
+      end
+
+      # Returns the month of the year (1..12).
+      def mon
+        if @time
+          @time.mon
+        elsif @datetime
+          @datetime.mon
+        elsif @tcdatetime
+          @tcdatetime.mon
+        else
+          to_time.mon
+        end
+      end
+
+      alias :month :mon
+
+      # Returns the day of the month (1..n).
+      def mday
+        if @time
+          @time.mday
+        elsif @datetime
+          @datetime.mday
+        elsif @tcdatetime
+          @tcdatetime.mday
+        else
+          to_time.mday
+        end
+      end
+
+      alias :day :mday
+
+      # Returns the hour of the day (0..23).
+      def hour
+        if @time
+          @time.hour
+        elsif @datetime
+          @datetime.hour
+        elsif @tcdatetime
+          @tcdatetime.hour
+        else
+          to_time.hour
+        end
+      end
+
+      # Returns the minute of the hour (0..59).
+      def min
+        if @time
+          @time.min
+        elsif @datetime
+          @datetime.min
+        elsif @tcdatetime
+          @tcdatetime.min
+        else
+          to_time.min
+        end
+      end
+
+      # Returns the second of the minute (0..60). (60 for a leap second).
+      def sec
+        if @time
+          @time.sec
+        elsif @datetime
+          @datetime.sec
+        elsif @tcdatetime
+          @tcdatetime.sec
+        else
+          to_time.sec
+        end
+      end
+
+      # Compares this TimeOrDateTime with another Time, DateTime, integer
+      # timestamp or TimeOrDateTime. Returns -1, 0 or +1 depending whether the
+      # receiver is less than, equal to, or greater than timeOrDateTime.
+      #
+      # Milliseconds and smaller units are ignored in the comparison.
+      def <=>(timeOrDateTime)
+        if timeOrDateTime.is_a?(TimeOrDateTime)
+          orig = timeOrDateTime.to_orig
+
+          if @orig.is_a?(::TimeCrisis::DateTime) || orig.is_a?(::TimeCrisis::DateTime)
+            to_tc_datetime <=> timeOrDateTime.to_tc_datetime
+          elsif @orig.is_a?(::DateTime) || orig.is_a?(::DateTime)
+            # If either is a DateTime, assume it is there for a reason
+            # (i.e. for range).
+            to_datetime <=> timeOrDateTime.to_datetime
+          elsif orig.is_a?(Time)
+            to_time <=> timeOrDateTime.to_time
+          else
+            to_i <=> timeOrDateTime.to_i
+          end
+        elsif @orig.is_a?(::TimeCrisis::DateTime) || timeOrDateTime.is_a?(::TimeCrisis::DateTime)
+          to_tc_datetime <=> TimeOrDateTime.wrap(timeOrDateTime).to_tc_datetime
+        elsif @orig.is_a?(::DateTime) || timeOrDateTime.is_a?(::DateTime)
+          # If either is a DateTime, assume it is there for a reason
+          # (i.e. for range).
+          to_datetime <=> TimeOrDateTime.wrap(timeOrDateTime).to_datetime
+        elsif timeOrDateTime.is_a?(Time)
+          to_time <=> timeOrDateTime
+        else
+          to_i <=> timeOrDateTime.to_i
+        end
+      end
+
+      # Adds a number of seconds to the TimeOrDateTime. Returns a new
+      # TimeOrDateTime, preserving what the original constructed type was.
+      # If the original type is a Time and the resulting calculation goes out of
+      # range for Times, then an exception will be raised by the Time class.
+      def +(seconds)
+        if seconds == 0
+          self
+        else
+          if @orig.is_a?(::TimeCrisis::DateTime)
+            TimeOrDateTime.new(@orig + OffsetRationals.rational_for_offset(seconds).to_f)
+          elsif @orig.is_a?(::DateTime)
+            TimeOrDateTime.new(@orig + OffsetRationals.rational_for_offset(seconds))
+          else
+            # + defined for Time and integer timestamps
+            TimeOrDateTime.new(@orig + seconds)
+          end
+        end
+      end
+
+      # Subtracts a number of seconds from the TimeOrDateTime. Returns a new
+      # TimeOrDateTime, preserving what the original constructed type was.
+      # If the original type is a Time and the resulting calculation goes out of
+      # range for Times, then an exception will be raised by the Time class.
+      def -(seconds)
+        self + (-seconds)
+      end
+
+      # Similar to the + operator, but for cases where adding would cause a
+      # timestamp or time to go out of the allowed range, converts to a DateTime
+      # based TimeOrDateTime.
+      def add_with_convert(seconds)
+        if seconds == 0
+          self
+        else
+          if @orig.is_a?(::TimeCrisis::DateTime)
+            TimeOrDateTime.new(@orig + OffsetRationals.rational_for_offset(seconds).to_f)
+          elsif @orig.is_a?(::DateTime)
+            TimeOrDateTime.new(@orig + OffsetRationals.rational_for_offset(seconds))
+          else
+            # A Time or timestamp.
+            result = to_i + seconds
+
+            if result < 0 || result > 2147483647
+              result = TimeOrDateTime.new(to_tc_datetime + OffsetRationals.rational_for_offset(seconds).to_f)
+            else
+              result = TimeOrDateTime.new(@orig + seconds)
+            end
+          end
+        end
+      end
+
+      # Returns true if todt represents the same time and was originally
+      # constructed with the same type (DateTime, Time or timestamp) as this
+      # TimeOrDateTime.
+      def eql?(todt)
+        todt.respond_to?(:to_orig) && to_orig.eql?(todt.to_orig)
+      end
+
+      # Returns a hash of this TimeOrDateTime.
+      def hash
+        @orig.hash
+      end
+
+      # If no block is given, returns a TimeOrDateTime wrapping the given
+      # timeOrDateTime. If a block is specified, a TimeOrDateTime is constructed
+      # and passed to the block. The result of the block must be a TimeOrDateTime.
+      # to_orig will be called on the result and the result of to_orig will be
+      # returned.
+      #
+      # timeOrDateTime can be a Time, DateTime, integer timestamp or TimeOrDateTime.
+      # If a TimeOrDateTime is passed in, no new TimeOrDateTime will be constructed,
+      # the passed in value will be used.
+      def self.wrap(timeOrDateTime)
+        t = timeOrDateTime.is_a?(TimeOrDateTime) ? timeOrDateTime : TimeOrDateTime.new(timeOrDateTime)
+
+        if block_given?
+          t = yield t
+
+          if timeOrDateTime.is_a?(TimeOrDateTime)
+            t
+          elsif timeOrDateTime.is_a?(Time)
+            t.to_time
+          elsif timeOrDateTime.is_a?(::TimeCrisis::DateTime)
+            t.to_tc_datetime
+          elsif timeOrDateTime.is_a?(::DateTime)
+            t.to_datetime
+          else
+            t.to_i
+          end
+        else
+          t
+        end
+      end
+    end
+  end
+end