tzinfo 1.0.1 → 1.1.0

data/test/tc_ruby_data_source.rb

@@ -78,7 +78,17 @@ class TCRubyDataSource < Test::Unit::TestCase
 
   def test_load_timezone_info_tainted
     safe_test do
-      info = @data_source.load_timezone_info('Europe/Amsterdam'.taint)
+      identifier = 'Europe/Amsterdam'.taint
+      assert(identifier.tainted?)
+      info = @data_source.load_timezone_info(identifier)
+      assert_equal('Europe/Amsterdam', info.identifier)
+      assert(identifier.tainted?)
+    end
+  end
+  
+  def test_load_timezone_info_tainted_and_frozen
+    safe_test do
+      info = @data_source.load_timezone_info('Europe/Amsterdam'.taint.freeze)
       assert_equal('Europe/Amsterdam', info.identifier)
     end
   end
@@ -132,7 +142,17 @@ class TCRubyDataSource < Test::Unit::TestCase
   
   def test_load_country_info_tainted
     safe_test do
-      info = @data_source.load_country_info('NL'.taint)
+      code = 'NL'.taint
+      assert(code.tainted?)
+      info = @data_source.load_country_info(code)
+      assert_equal('NL', info.code)
+      assert(code.tainted?)
+    end
+  end
+  
+  def test_load_country_info_tainted_and_frozen
+    safe_test do
+      info = @data_source.load_country_info('NL'.taint.freeze)
       assert_equal('NL', info.code)
     end
   end

data/test/tc_time_or_datetime.rb

@@ -36,14 +36,14 @@ class TCTimeOrDateTime < Test::Unit::TestCase
     tdt = TimeOrDateTime.new(Time.local(2006, 3, 24, 15, 32, 3))
     assert_equal(Time.utc(2006, 3, 24, 15, 32, 3), tdt.to_time)
     assert_equal(Time.utc(2006, 3, 24, 15, 32, 3), tdt.to_orig)
-    assert_equal('UTC', tdt.to_time.zone)
+    assert(tdt.to_time.utc?)
   end
   
   def test_intialize_time_local_usec
     tdt = TimeOrDateTime.new(Time.local(2006, 3, 24, 15, 32, 3, 721123))
     assert_equal(Time.utc(2006, 3, 24, 15, 32, 3, 721123), tdt.to_time)
     assert_equal(Time.utc(2006, 3, 24, 15, 32, 3, 721123), tdt.to_orig)
-    assert_equal('UTC', tdt.to_time.zone)
+    assert(tdt.to_time.utc?)
   end
   
   if Time.utc(2013, 1, 1).respond_to?(:nsec)
@@ -51,7 +51,7 @@ class TCTimeOrDateTime < Test::Unit::TestCase
       tdt = TimeOrDateTime.new(Time.local(2006, 3, 24, 15, 32, 3, 721123 + Rational(456,1000)))
       assert_equal(Time.utc(2006, 3, 24, 15, 32, 3, 721123 + Rational(456,1000)), tdt.to_time)
       assert_equal(Time.utc(2006, 3, 24, 15, 32, 3, 721123 + Rational(456,1000)), tdt.to_orig)
-      assert_equal('UTC', tdt.to_time.zone)
+      assert(tdt.to_time.utc?)
     end
   end
   

data/test/tc_timezone.rb

@@ -52,6 +52,10 @@ class TCTimezone < Test::Unit::TestCase
       @periods_for_local.clone        
     end
     
+    def transitions_up_to(utc_to, utc_from = nil)
+      raise 'transitions_up_to called'
+    end
+    
     private
       def setup(identifier, period_for_utc, periods_for_local, expected)
         @identifier = identifier
@@ -61,10 +65,112 @@ class TCTimezone < Test::Unit::TestCase
       end
   end
   
+  class OffsetsUpToTestTimezone < Timezone
+    def self.new(identifier, expected_utc_to, expected_utc_from, transitions_up_to)
+      t = super()
+      t.send(:setup, identifier, expected_utc_to, expected_utc_from, transitions_up_to)
+      t      
+    end
+    
+    def identifier
+      @identifier
+    end
+    
+    def period_for_utc(utc)
+      raise 'period_for_utc called'
+    end
+    
+    def periods_for_local(local)
+      raise 'periods_for_local called'
+    end
+    
+    def transitions_up_to(utc_to, utc_from = nil)
+      utc_to = TimeOrDateTime.wrap(utc_to)
+      raise "Unexpected utc_to #{utc_to || 'nil'} in transitions_up_to" unless @expected_utc_to.eql?(utc_to)
+      
+      utc_from = utc_from ? TimeOrDateTime.wrap(utc_from) : nil
+      raise "Unexpected utc_from #{utc_from || 'nil'} in transitions_up_to" unless @expected_utc_from.eql?(utc_from)
+      
+      if utc_from && utc_to <= utc_from
+        raise ArgumentError, 'utc_to must be greater than utc_from'
+      end
+      
+      @transitions_up_to
+    end
+    
+    private
+    
+    def setup(identifier, expected_utc_to, expected_utc_from, transitions_up_to)
+      @identifier = identifier
+      @expected_utc_to = TimeOrDateTime.wrap(expected_utc_to)
+      @expected_utc_from = expected_utc_from ? TimeOrDateTime.wrap(expected_utc_from) : nil
+      @transitions_up_to = transitions_up_to
+    end
+  end
+  
+  class OffsetsUpToNoTransitionsTestTimezone < Timezone
+    def self.new(identifier, expected_utc_to, expected_utc_from, period_for_utc)
+      t = super()
+      t.send(:setup, identifier, expected_utc_to, expected_utc_from, period_for_utc)
+      t      
+    end
+    
+    def identifier
+      @identifier
+    end
+    
+    def period_for_utc(utc)
+      utc = TimeOrDateTime.wrap(utc)
+      
+      raise "Unexpected utc #{utc} in period_for_utc (should be utc_from)" if @expected_utc_from && !@expected_utc_from.eql?(utc)
+      raise "Unexpected utc #{utc} in period_for_utc (should be < utc_to)" if !@expected_utc_from && @expected_utc_to <= utc
+      
+      @period_for_utc
+    end
+    
+    def periods_for_local(local)
+      raise 'periods_for_local called'
+    end
+    
+    def transitions_up_to(utc_to, utc_from = nil)
+      utc_to = TimeOrDateTime.wrap(utc_to)
+      raise "Unexpected utc_to #{utc_to || 'nil'} in transitions_up_to" unless @expected_utc_to.eql?(utc_to)
+      
+      utc_from = utc_from ? TimeOrDateTime.wrap(utc_from) : nil
+      raise "Unexpected utc_from #{utc_from || 'nil'} in transitions_up_to" unless @expected_utc_from.eql?(utc_from)
+      
+      if utc_from && utc_to <= utc_from
+        raise ArgumentError, 'utc_to must be greater than utc_from'
+      end
+      
+      []
+    end
+    
+    private
+    
+    def setup(identifier, expected_utc_to, expected_utc_from, period_for_utc)
+      @identifier = identifier
+      @expected_utc_to = TimeOrDateTime.wrap(expected_utc_to)
+      @expected_utc_from = expected_utc_from ? TimeOrDateTime.wrap(expected_utc_from) : nil
+      @period_for_utc = period_for_utc
+    end
+  end
+  
+  class TestTimezoneTransition < TimezoneTransition
+    def initialize(offset, previous_offset, at)
+      super(offset, previous_offset)
+      @at = TimeOrDateTime.wrap(at)
+    end
+    
+    def at
+      @at
+    end
+  end
+  
   def setup
     @orig_default_dst = Timezone.default_dst
     @orig_data_source = DataSource.get
-    Timezone.send :class_variable_set, :@@loaded_zones, {}
+    Timezone.send :init_loaded_zones
   end
   
   def teardown
@@ -159,14 +265,36 @@ class TCTimezone < Test::Unit::TestCase
     Timezone.get('Europe/Andorra')
   
     safe_test do
-      tz = Timezone.get('Europe/Andorra'.taint)
+      identifier = 'Europe/Andorra'.taint
+      assert(identifier.tainted?)
+      tz = Timezone.get(identifier)
+      assert_equal('Europe/Andorra', tz.identifier)
+      assert(identifier.tainted?)
+    end
+  end
+  
+  def test_get_tainted_and_frozen_loaded
+    Timezone.get('Europe/Andorra')
+  
+    safe_test do
+      tz = Timezone.get('Europe/Andorra'.taint.freeze)
       assert_equal('Europe/Andorra', tz.identifier)
     end
   end
   
   def test_get_tainted_not_previously_loaded
     safe_test do
-      tz = Timezone.get('Europe/Amsterdam'.taint)
+      identifier = 'Europe/Andorra'.taint
+      assert(identifier.tainted?)
+      tz = Timezone.get(identifier)
+      assert_equal('Europe/Andorra', tz.identifier)
+      assert(identifier.tainted?)
+    end
+  end
+  
+  def test_get_tainted_and_frozen_not_previously_loaded
+    safe_test do
+      tz = Timezone.get('Europe/Amsterdam'.taint.freeze)
       assert_equal('Europe/Amsterdam', tz.identifier)
     end
   end
@@ -182,7 +310,8 @@ class TCTimezone < Test::Unit::TestCase
     assert_raises(UnknownTimezone) { tz.periods_for_local(DateTime.new(2006,1,1,1,0,0)) }
     assert_raises(UnknownTimezone) { tz.period_for_local(DateTime.new(2006,1,1,1,0,0)) }
     assert_raises(UnknownTimezone) { tz.now }
-    assert_raises(UnknownTimezone) { tz.current_period_and_time } 
+    assert_raises(UnknownTimezone) { tz.current_period_and_time }
+    assert_raises(UnknownTimezone) { tz.transitions_up_to(DateTime.new(2006,1,1,1,0,0)) }
   end
   
   def test_new_nil
@@ -196,7 +325,8 @@ class TCTimezone < Test::Unit::TestCase
     assert_raises(UnknownTimezone) { tz.periods_for_local(DateTime.new(2006,1,1,1,0,0)) }
     assert_raises(UnknownTimezone) { tz.period_for_local(DateTime.new(2006,1,1,1,0,0)) }
     assert_raises(UnknownTimezone) { tz.now }
-    assert_raises(UnknownTimezone) { tz.current_period_and_time } 
+    assert_raises(UnknownTimezone) { tz.current_period_and_time }
+    assert_raises(UnknownTimezone) { tz.transitions_up_to(DateTime.new(2006,1,1,1,0,0)) }
   end
   
   def test_new_arg
@@ -342,12 +472,12 @@ class TCTimezone < Test::Unit::TestCase
     t3 = Time.utc(2005,2,18,16,24,23,789000)
     ts = t.to_i
     
-    o1 = TimezoneOffsetInfo.new(0, 0, :GMT)
-    o2 = TimezoneOffsetInfo.new(0, 3600, :BST)
+    o1 = TimezoneOffset.new(0, 0, :GMT)
+    o2 = TimezoneOffset.new(0, 3600, :BST)
         
     period = TimezonePeriod.new(
-      TimezoneTransitionInfo.new(o1, o2, 1099184400),
-      TimezoneTransitionInfo.new(o2, o1, 1111885200))
+      TestTimezoneTransition.new(o1, o2, 1099184400),
+      TestTimezoneTransition.new(o2, o1, 1111885200))
     
     dt_period = TestTimezone.new('Europe/London', nil, [period], dt).period_for_local(dt)
     dt2_period = TestTimezone.new('Europe/London', nil, [period], dt2).period_for_local(dt2)
@@ -375,12 +505,12 @@ class TCTimezone < Test::Unit::TestCase
   end
   
   def test_period_for_local_ambiguous    
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
+    o1 = TimezoneOffset.new(-18000, 0, :EST)
+    o2 = TimezoneOffset.new(-18000, 3600, :EDT)
     
-    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
-    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
+    t1 = TestTimezoneTransition.new(o2, o1, 1081062000)
+    t2 = TestTimezoneTransition.new(o1, o2, 1099202400)
+    t3 = TestTimezoneTransition.new(o2, o1, 1112511600)
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(t2, t3)
@@ -405,12 +535,12 @@ class TCTimezone < Test::Unit::TestCase
   end
   
   def test_period_for_local_not_found
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
+    o1 = TimezoneOffset.new(-18000, 0, :EST)
+    o2 = TimezoneOffset.new(-18000, 3600, :EDT)
     
-    t1 = TimezoneTransitionInfo.new(o1, o2, 1067148000)
-    t2 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t3 = TimezoneTransitionInfo.new(o1, o2, 1099202400)    
+    t1 = TestTimezoneTransition.new(o1, o2, 1067148000)
+    t2 = TestTimezoneTransition.new(o2, o1, 1081062000)
+    t3 = TestTimezoneTransition.new(o1, o2, 1099202400)
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(t2, t3)
@@ -437,12 +567,12 @@ class TCTimezone < Test::Unit::TestCase
   def test_period_for_local_default_dst_set_true
     Timezone.default_dst = true
     
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
+    o1 = TimezoneOffset.new(-18000, 0, :EST)
+    o2 = TimezoneOffset.new(-18000, 3600, :EDT)
     
-    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
-    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
+    t1 = TestTimezoneTransition.new(o2, o1, 1081062000)
+    t2 = TestTimezoneTransition.new(o1, o2, 1099202400)
+    t3 = TestTimezoneTransition.new(o2, o1, 1112511600)
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(t2, t3)
@@ -460,12 +590,12 @@ class TCTimezone < Test::Unit::TestCase
   def test_period_for_local_default_dst_set_false
     Timezone.default_dst = false
     
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
+    o1 = TimezoneOffset.new(-18000, 0, :EST)
+    o2 = TimezoneOffset.new(-18000, 3600, :EDT)
     
-    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
-    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
+    t1 = TestTimezoneTransition.new(o2, o1, 1081062000)
+    t2 = TestTimezoneTransition.new(o1, o2, 1099202400)
+    t3 = TestTimezoneTransition.new(o2, o1, 1112511600)
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(t2, t3)
@@ -481,12 +611,12 @@ class TCTimezone < Test::Unit::TestCase
   end
   
   def test_period_for_local_dst_flag_resolved
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
+    o1 = TimezoneOffset.new(-18000, 0, :EST)
+    o2 = TimezoneOffset.new(-18000, 3600, :EDT)
     
-    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
-    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
+    t1 = TestTimezoneTransition.new(o2, o1, 1081062000)
+    t2 = TestTimezoneTransition.new(o1, o2, 1099202400)
+    t3 = TestTimezoneTransition.new(o2, o1, 1112511600)
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(t2, t3)
@@ -502,12 +632,12 @@ class TCTimezone < Test::Unit::TestCase
   end
   
   def test_period_for_local_dst_block_called
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
+    o1 = TimezoneOffset.new(-18000, 0, :EST)
+    o2 = TimezoneOffset.new(-18000, 3600, :EDT)
     
-    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
-    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
+    t1 = TestTimezoneTransition.new(o2, o1, 1081062000)
+    t2 = TestTimezoneTransition.new(o1, o2, 1099202400)
+    t3 = TestTimezoneTransition.new(o2, o1, 1112511600)
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(t2, t3)
@@ -536,14 +666,14 @@ class TCTimezone < Test::Unit::TestCase
     # 24 minutes and both periods were non-DST. Hence the block should be
     # called regardless of the value of the Boolean dst parameter.
     
-    o0 = TimezoneOffsetInfo.new(5040, 0, :LMT)
-    o1 = TimezoneOffsetInfo.new(5040, 0, :WMT)
-    o2 = TimezoneOffsetInfo.new(3600, 0, :CET)
-    o3 = TimezoneOffsetInfo.new(3600, 3600, :CEST)
+    o0 = TimezoneOffset.new(5040, 0, :LMT)
+    o1 = TimezoneOffset.new(5040, 0, :WMT)
+    o2 = TimezoneOffset.new(3600, 0, :CET)
+    o3 = TimezoneOffset.new(3600, 3600, :CEST)
     
-    t1 = TimezoneTransitionInfo.new(o1, o0, 288925853, 120)
-    t2 = TimezoneTransitionInfo.new(o2, o1, 290485733, 120)
-    t3 = TimezoneTransitionInfo.new(o3, o2, 29051813, 12)
+    t1 = TestTimezoneTransition.new(o1, o0, DateTime.new(1879, 12, 31, 22, 36, 0))
+    t2 = TestTimezoneTransition.new(o2, o1, DateTime.new(1915,  8,  4, 22, 36, 0))
+    t3 = TestTimezoneTransition.new(o3, o2, DateTime.new(1916,  4, 30, 22,  0, 0))
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(t2, t3)
@@ -568,12 +698,12 @@ class TCTimezone < Test::Unit::TestCase
   end
   
   def test_period_for_local_block_ambiguous
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
+    o1 = TimezoneOffset.new(-18000, 0, :EST)
+    o2 = TimezoneOffset.new(-18000, 3600, :EDT)
     
-    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
-    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
+    t1 = TestTimezoneTransition.new(o2, o1, 1081062000)
+    t2 = TestTimezoneTransition.new(o1, o2, 1099202400)
+    t3 = TestTimezoneTransition.new(o2, o1, 1112511600)
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(t2, t3)
@@ -610,12 +740,12 @@ class TCTimezone < Test::Unit::TestCase
     tu2 = Time.local(2005,6,18,16,24,23,567000)
     ts = t.to_i
     
-    o1 = TimezoneOffsetInfo.new(0, 0, :GMT)
-    o2 = TimezoneOffsetInfo.new(0, 3600, :BST)
+    o1 = TimezoneOffset.new(0, 0, :GMT)
+    o2 = TimezoneOffset.new(0, 3600, :BST)
         
     period = TimezonePeriod.new(
-      TimezoneTransitionInfo.new(o2, o1, 1111885200),
-      TimezoneTransitionInfo.new(o1, o2, 1130634000))
+      TestTimezoneTransition.new(o2, o1, 1111885200),
+      TestTimezoneTransition.new(o1, o2, 1130634000))
         
     assert_equal(DateTime.new(2005,6,18,17,24,23), TestTimezone.new('Europe/London', period, [], dt).utc_to_local(dt))
     assert_equal(DateTime.new(2005,6,18,17,24,23), TestTimezone.new('Europe/London', period, [], dt2).utc_to_local(dt2))
@@ -638,25 +768,25 @@ class TCTimezone < Test::Unit::TestCase
     tu = Time.utc(2005,6,18,16,24,23,567000)
     tu2 = Time.local(2005,6,18,16,24,23,567000)
     
-    o1 = TimezoneOffsetInfo.new(0, 0, :GMT)
-    o2 = TimezoneOffsetInfo.new(0, 3600, :BST)
+    o1 = TimezoneOffset.new(0, 0, :GMT)
+    o2 = TimezoneOffset.new(0, 3600, :BST)
         
     period = TimezonePeriod.new(
-      TimezoneTransitionInfo.new(o2, o1, 1111885200),
-      TimezoneTransitionInfo.new(o1, o2, 1130634000))
+      TestTimezoneTransition.new(o2, o1, 1111885200),
+      TestTimezoneTransition.new(o1, o2, 1130634000))
     
     assert_equal(0, TestTimezone.new('Europe/London', period, [], dt).utc_to_local(dt).offset)
     assert_equal(0, TestTimezone.new('Europe/London', period, [], dt2).utc_to_local(dt2).offset)
     assert_equal(0, TestTimezone.new('Europe/London', period, [], dtu).utc_to_local(dtu).offset)
     assert_equal(0, TestTimezone.new('Europe/London', period, [], dtu2).utc_to_local(dtu2).offset)    
     assert_equal(0, TestTimezone.new('Europe/London', period, [], t).utc_to_local(t).utc_offset)
-    assert_equal('UTC', TestTimezone.new('Europe/London', period, [], t).utc_to_local(t).zone)
+    assert(TestTimezone.new('Europe/London', period, [], t).utc_to_local(t).utc?)
     assert_equal(0, TestTimezone.new('Europe/London', period, [], t2).utc_to_local(t2).utc_offset)
-    assert_equal('UTC', TestTimezone.new('Europe/London', period, [], t2).utc_to_local(t2).zone)
+    assert(TestTimezone.new('Europe/London', period, [], t2).utc_to_local(t2).utc?)
     assert_equal(0, TestTimezone.new('Europe/London', period, [], tu).utc_to_local(tu).utc_offset)
-    assert_equal('UTC', TestTimezone.new('Europe/London', period, [], tu).utc_to_local(tu).zone)
+    assert(TestTimezone.new('Europe/London', period, [], tu).utc_to_local(tu).utc?)
     assert_equal(0, TestTimezone.new('Europe/London', period, [], tu2).utc_to_local(tu2).utc_offset)
-    assert_equal('UTC', TestTimezone.new('Europe/London', period, [], tu2).utc_to_local(tu2).zone)
+    assert(TestTimezone.new('Europe/London', period, [], tu2).utc_to_local(tu2).utc?)
   end
   
   def test_local_to_utc
@@ -670,12 +800,12 @@ class TCTimezone < Test::Unit::TestCase
     tu2 = Time.local(2005,6,18,16,24,23,567000)
     ts = t.to_i
         
-    o1 = TimezoneOffsetInfo.new(0, 0, :GMT)
-    o2 = TimezoneOffsetInfo.new(0, 3600, :BST)
+    o1 = TimezoneOffset.new(0, 0, :GMT)
+    o2 = TimezoneOffset.new(0, 3600, :BST)
         
     period = TimezonePeriod.new(
-      TimezoneTransitionInfo.new(o2, o1, 1111885200),
-      TimezoneTransitionInfo.new(o1, o2, 1130634000))
+      TestTimezoneTransition.new(o2, o1, 1111885200),
+      TestTimezoneTransition.new(o1, o2, 1130634000))
     
     assert_equal(DateTime.new(2005,6,18,15,24,23), TestTimezone.new('Europe/London', nil, [period], dt).local_to_utc(dt))
     assert_equal(DateTime.new(2005,6,18,15,24,23), TestTimezone.new('Europe/London', nil, [period], dt2).local_to_utc(dt2))
@@ -698,25 +828,25 @@ class TCTimezone < Test::Unit::TestCase
     tu = Time.utc(2005,6,18,16,24,23,567000)
     tu2 = Time.local(2005,6,18,16,24,23,567000)
     
-    o1 = TimezoneOffsetInfo.new(0, 0, :GMT)
-    o2 = TimezoneOffsetInfo.new(0, 3600, :BST)
+    o1 = TimezoneOffset.new(0, 0, :GMT)
+    o2 = TimezoneOffset.new(0, 3600, :BST)
         
     period = TimezonePeriod.new(
-      TimezoneTransitionInfo.new(o2, o1, 1111885200),
-      TimezoneTransitionInfo.new(o1, o2, 1130634000))
+      TestTimezoneTransition.new(o2, o1, 1111885200),
+      TestTimezoneTransition.new(o1, o2, 1130634000))
     
     assert_equal(0, TestTimezone.new('Europe/London', nil, [period], dt).local_to_utc(dt).offset)
     assert_equal(0, TestTimezone.new('Europe/London', nil, [period], dt2).local_to_utc(dt2).offset)
     assert_equal(0, TestTimezone.new('Europe/London', nil, [period], dtu).local_to_utc(dtu).offset)
     assert_equal(0, TestTimezone.new('Europe/London', nil, [period], dtu2).local_to_utc(dtu2).offset)
     assert_equal(0, TestTimezone.new('Europe/London', nil, [period], t).local_to_utc(t).utc_offset)
-    assert_equal('UTC', TestTimezone.new('Europe/London', nil, [period], t).local_to_utc(t).zone)
+    assert(TestTimezone.new('Europe/London', nil, [period], t).local_to_utc(t).utc?)
     assert_equal(0, TestTimezone.new('Europe/London', nil, [period], t2).local_to_utc(t2).utc_offset)
-    assert_equal('UTC', TestTimezone.new('Europe/London', nil, [period], t2).local_to_utc(t2).zone)
+    assert(TestTimezone.new('Europe/London', nil, [period], t2).local_to_utc(t2).utc?)
     assert_equal(0, TestTimezone.new('Europe/London', nil, [period], tu).local_to_utc(tu).utc_offset)
-    assert_equal('UTC', TestTimezone.new('Europe/London', nil, [period], tu).local_to_utc(tu).zone)
+    assert(TestTimezone.new('Europe/London', nil, [period], tu).local_to_utc(tu).utc?)
     assert_equal(0, TestTimezone.new('Europe/London', nil, [period], tu2).local_to_utc(tu2).utc_offset)
-    assert_equal('UTC', TestTimezone.new('Europe/London', nil, [period], tu2).local_to_utc(tu2).zone)
+    assert(TestTimezone.new('Europe/London', nil, [period], tu2).local_to_utc(tu2).utc?)
   end
   
   def test_local_to_utc_invalid
@@ -734,12 +864,12 @@ class TCTimezone < Test::Unit::TestCase
   end
   
   def test_local_to_utc_ambiguous
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
+    o1 = TimezoneOffset.new(-18000, 0, :EST)
+    o2 = TimezoneOffset.new(-18000, 3600, :EDT)
     
-    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
-    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
+    t1 = TestTimezoneTransition.new(o2, o1, 1081062000)
+    t2 = TestTimezoneTransition.new(o1, o2, 1099202400)
+    t3 = TestTimezoneTransition.new(o2, o1, 1112511600)
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(t2, t3)
@@ -762,12 +892,12 @@ class TCTimezone < Test::Unit::TestCase
   end
   
   def test_local_to_utc_not_found
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
+    o1 = TimezoneOffset.new(-18000, 0, :EST)
+    o2 = TimezoneOffset.new(-18000, 3600, :EDT)
     
-    t1 = TimezoneTransitionInfo.new(o1, o2, 1067148000)
-    t2 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t3 = TimezoneTransitionInfo.new(o1, o2, 1099202400)    
+    t1 = TestTimezoneTransition.new(o1, o2, 1067148000)
+    t2 = TestTimezoneTransition.new(o2, o1, 1081062000)
+    t3 = TestTimezoneTransition.new(o1, o2, 1099202400)
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(t2, t3)
@@ -788,12 +918,12 @@ class TCTimezone < Test::Unit::TestCase
   def test_local_to_utc_default_dst_set_true
     Timezone.default_dst = true
   
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
+    o1 = TimezoneOffset.new(-18000, 0, :EST)
+    o2 = TimezoneOffset.new(-18000, 3600, :EDT)
     
-    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
-    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
+    t1 = TestTimezoneTransition.new(o2, o1, 1081062000)
+    t2 = TestTimezoneTransition.new(o1, o2, 1099202400)
+    t3 = TestTimezoneTransition.new(o2, o1, 1112511600)
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(t2, t3)
@@ -811,12 +941,12 @@ class TCTimezone < Test::Unit::TestCase
   def test_local_to_utc_default_dst_set_false
     Timezone.default_dst = false
   
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
+    o1 = TimezoneOffset.new(-18000, 0, :EST)
+    o2 = TimezoneOffset.new(-18000, 3600, :EDT)
     
-    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
-    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
+    t1 = TestTimezoneTransition.new(o2, o1, 1081062000)
+    t2 = TestTimezoneTransition.new(o1, o2, 1099202400)
+    t3 = TestTimezoneTransition.new(o2, o1, 1112511600)
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(t2, t3)
@@ -832,12 +962,12 @@ class TCTimezone < Test::Unit::TestCase
   end
   
   def test_local_to_utc_dst_flag_resolved
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
+    o1 = TimezoneOffset.new(-18000, 0, :EST)
+    o2 = TimezoneOffset.new(-18000, 3600, :EDT)
     
-    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
-    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
+    t1 = TestTimezoneTransition.new(o2, o1, 1081062000)
+    t2 = TestTimezoneTransition.new(o1, o2, 1099202400)
+    t3 = TestTimezoneTransition.new(o2, o1, 1112511600)
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(t2, t3)
@@ -852,12 +982,12 @@ class TCTimezone < Test::Unit::TestCase
   end
   
   def test_local_to_utc_dst_block_called
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
+    o1 = TimezoneOffset.new(-18000, 0, :EST)
+    o2 = TimezoneOffset.new(-18000, 3600, :EDT)
     
-    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
-    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
+    t1 = TestTimezoneTransition.new(o2, o1, 1081062000)
+    t2 = TestTimezoneTransition.new(o1, o2, 1099202400)
+    t3 = TestTimezoneTransition.new(o2, o1, 1112511600)
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(t2, t3)
@@ -885,14 +1015,14 @@ class TCTimezone < Test::Unit::TestCase
     # 24 minutes and both periods were non-DST. Hence the block should be
     # called regardless of the value of the Boolean dst parameter.
 
-    o0 = TimezoneOffsetInfo.new(5040, 0, :LMT)
-    o1 = TimezoneOffsetInfo.new(5040, 0, :WMT)
-    o2 = TimezoneOffsetInfo.new(3600, 0, :CET)
-    o3 = TimezoneOffsetInfo.new(3600, 3600, :CEST)
+    o0 = TimezoneOffset.new(5040, 0, :LMT)
+    o1 = TimezoneOffset.new(5040, 0, :WMT)
+    o2 = TimezoneOffset.new(3600, 0, :CET)
+    o3 = TimezoneOffset.new(3600, 3600, :CEST)
     
-    t1 = TimezoneTransitionInfo.new(o1, o0, 288925853, 120)
-    t2 = TimezoneTransitionInfo.new(o2, o1, 290485733, 120)
-    t3 = TimezoneTransitionInfo.new(o3, o2, 29051813, 12)
+    t1 = TestTimezoneTransition.new(o1, o0, DateTime.new(1879, 12, 31, 22, 36, 0))
+    t2 = TestTimezoneTransition.new(o2, o1, DateTime.new(1915,  8,  4, 22, 36, 0))
+    t3 = TestTimezoneTransition.new(o3, o2, DateTime.new(1916,  4, 30, 22,  0, 0))
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(t2, t3)
@@ -922,12 +1052,12 @@ class TCTimezone < Test::Unit::TestCase
   end
   
   def test_local_to_utc_block_ambiguous    
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
+    o1 = TimezoneOffset.new(-18000, 0, :EST)
+    o2 = TimezoneOffset.new(-18000, 3600, :EDT)
     
-    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
-    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
+    t1 = TestTimezoneTransition.new(o2, o1, 1081062000)
+    t2 = TestTimezoneTransition.new(o1, o2, 1099202400)
+    t3 = TestTimezoneTransition.new(o2, o1, 1112511600)
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(t2, t3)
@@ -944,6 +1074,123 @@ class TCTimezone < Test::Unit::TestCase
     assert_raises(AmbiguousTime) { tz.local_to_utc(dt) {|periods| raise AmbiguousTime, 'Ambiguous time'} }
   end
   
+  def test_offsets_up_to
+    o1 = TimezoneOffset.new(-17900, 0,    :TESTLMT)
+    o2 = TimezoneOffset.new(-18000, 3600, :TESTD)
+    o3 = TimezoneOffset.new(-18000, 0,    :TESTS)
+    o4 = TimezoneOffset.new(-21600, 3600, :TESTD)
+    o5 = TimezoneOffset.new(-21600, 0,    :TESTS)
+    
+    t1 = TestTimezoneTransition.new(o2, o1, Time.utc(2010, 4,1,1,0,0).to_i)
+    t2 = TestTimezoneTransition.new(o3, o2, Time.utc(2010,10,1,1,0,0).to_i)
+    t3 = TestTimezoneTransition.new(o2, o3, Time.utc(2011, 3,1,1,0,0).to_i)
+    t4 = TestTimezoneTransition.new(o4, o2, Time.utc(2011, 4,1,1,0,0).to_i)
+    t5 = TestTimezoneTransition.new(o3, o4, Time.utc(2011,10,1,1,0,0).to_i)
+    t6 = TestTimezoneTransition.new(o5, o3, Time.utc(2012, 3,1,1,0,0).to_i)
+    
+    assert_array_same_items([o1, o2, o3, o4, o5], 
+      OffsetsUpToTestTimezone.new('Test/Zone', Time.utc(2012,3,1,1,0,1), nil, [t1, t2, t3, t4, t5, t6]).
+      offsets_up_to(Time.utc(2012,3,1,1,0,1)))
+    assert_array_same_items([o2, o3, o4, o5], 
+      OffsetsUpToTestTimezone.new('Test/Zone', Time.utc(2012,3,1,1,0,1), Time.utc(2010,4,1,1,0,0), [t1, t2, t3, t4, t5, t6]).
+      offsets_up_to(Time.utc(2012,3,1,1,0,1), Time.utc(2010,4,1,1,0,0)))
+    assert_array_same_items([o1, o2, o3, o4], 
+      OffsetsUpToTestTimezone.new('Test/Zone', Time.utc(2012,3,1,1,0,0), nil, [t1, t2, t3, t4, t5]).
+      offsets_up_to(Time.utc(2012,3,1,1,0,0)))
+    assert_array_same_items([o2, o3, o4, o5], 
+      OffsetsUpToTestTimezone.new('Test/Zone', Time.utc(2012,3,1,1,0,1), Time.utc(2010,4,1,1,0,1), [t2, t3, t4, t5, t6]).
+      offsets_up_to(Time.utc(2012,3,1,1,0,1), Time.utc(2010,4,1,1,0,1)))
+    assert_array_same_items([o2, o3], 
+      OffsetsUpToTestTimezone.new('Test/Zone', Time.utc(2011,3,1,2,0,0), Time.utc(2011,3,1,0,0,0), [t3]).
+      offsets_up_to(Time.utc(2011,3,1,2,0,0), Time.utc(2011,3,1,0,0,0)))
+    assert_array_same_items([o3, o4], 
+      OffsetsUpToTestTimezone.new('Test/Zone', Time.utc(2012,3,1,1,0,0), Time.utc(2011,4,1,1,0,0), [t4, t5]).
+      offsets_up_to(Time.utc(2012,3,1,1,0,0), Time.utc(2011,4,1,1,0,0)))
+
+    assert_array_same_items([o1, o2, o3, o4, o5], 
+      OffsetsUpToTestTimezone.new('Test/Zone', Time.utc(2012,3,1,1,0,1).to_i, nil, [t1, t2, t3, t4, t5, t6]).
+      offsets_up_to(Time.utc(2012,3,1,1,0,1).to_i))
+    assert_array_same_items([o2, o3, o4, o5], 
+      OffsetsUpToTestTimezone.new('Test/Zone', Time.utc(2012,3,1,1,0,1).to_i, Time.utc(2010,4,1,1,0,0).to_i, [t1, t2, t3, t4, t5, t6]).
+      offsets_up_to(Time.utc(2012,3,1,1,0,1).to_i, Time.utc(2010,4,1,1,0,0).to_i))
+    assert_array_same_items([o1, o2, o3, o4], 
+      OffsetsUpToTestTimezone.new('Test/Zone', Time.utc(2012,3,1,1,0,0).to_i, nil, [t1, t2, t3, t4, t5]).
+      offsets_up_to(Time.utc(2012,3,1,1,0,0).to_i))
+    assert_array_same_items([o2, o3, o4, o5], 
+      OffsetsUpToTestTimezone.new('Test/Zone', Time.utc(2012,3,1,1,0,1).to_i, Time.utc(2010,4,1,1,0,1).to_i, [t2, t3, t4, t5, t6]).
+      offsets_up_to(Time.utc(2012,3,1,1,0,1).to_i, Time.utc(2010,4,1,1,0,1).to_i))
+    assert_array_same_items([o2, o3], 
+      OffsetsUpToTestTimezone.new('Test/Zone', Time.utc(2011,3,1,2,0,0).to_i, Time.utc(2011,3,1,0,0,0).to_i, [t3]).
+      offsets_up_to(Time.utc(2011,3,1,2,0,0).to_i, Time.utc(2011,3,1,0,0,0).to_i))
+    assert_array_same_items([o3, o4], 
+      OffsetsUpToTestTimezone.new('Test/Zone', Time.utc(2012,3,1,1,0,0).to_i, Time.utc(2011,4,1,1,0,0).to_i, [t4, t5]).
+      offsets_up_to(Time.utc(2012,3,1,1,0,0).to_i, Time.utc(2011,4,1,1,0,0).to_i))
+      
+    assert_array_same_items([o1, o2, o3, o4, o5], 
+      OffsetsUpToTestTimezone.new('Test/Zone', DateTime.new(2012,3,1,1,0,1), nil, [t1, t2, t3, t4, t5, t6]).
+      offsets_up_to(DateTime.new(2012,3,1,1,0,1)))
+    assert_array_same_items([o2, o3, o4, o5], 
+      OffsetsUpToTestTimezone.new('Test/Zone', DateTime.new(2012,3,1,1,0,1), DateTime.new(2010,4,1,1,0,0), [t1, t2, t3, t4, t5, t6]).
+      offsets_up_to(DateTime.new(2012,3,1,1,0,1), DateTime.new(2010,4,1,1,0,0)))
+    assert_array_same_items([o1, o2, o3, o4], 
+      OffsetsUpToTestTimezone.new('Test/Zone', DateTime.new(2012,3,1,1,0,0), nil, [t1, t2, t3, t4, t5]).
+      offsets_up_to(DateTime.new(2012,3,1,1,0,0)))
+    assert_array_same_items([o2, o3, o4, o5], 
+      OffsetsUpToTestTimezone.new('Test/Zone', DateTime.new(2012,3,1,1,0,1), DateTime.new(2010,4,1,1,0,1), [t2, t3, t4, t5, t6]).
+      offsets_up_to(DateTime.new(2012,3,1,1,0,1), DateTime.new(2010,4,1,1,0,1)))
+    assert_array_same_items([o2, o3], 
+      OffsetsUpToTestTimezone.new('Test/Zone', DateTime.new(2011,3,1,2,0,0), DateTime.new(2011,3,1,0,0,0), [t3]).
+      offsets_up_to(DateTime.new(2011,3,1,2,0,0), DateTime.new(2011,3,1,0,0,0)))
+    assert_array_same_items([o3, o4], 
+      OffsetsUpToTestTimezone.new('Test/Zone', DateTime.new(2012,3,1,1,0,0), DateTime.new(2011,4,1,1,0,0), [t4, t5]).
+      offsets_up_to(DateTime.new(2012,3,1,1,0,0), DateTime.new(2011,4,1,1,0,0)))
+  end
+  
+  def test_offsets_up_to_no_transitions
+    o = TimezoneOffset.new(600, 0, :LMT)
+    p = TimezonePeriod.new(nil, nil, o)
+        
+    assert_array_same_items([o],
+      OffsetsUpToNoTransitionsTestTimezone.new('Test/Zone', Time.utc(2000,1,1,1,0,0), nil, p).
+      offsets_up_to(Time.utc(2000,1,1,1,0,0)))
+    assert_array_same_items([o],
+      OffsetsUpToNoTransitionsTestTimezone.new('Test/Zone', Time.utc(2000,1,1,1,0,0), Time.utc(1990,1,1,1,0,0), p).
+      offsets_up_to(Time.utc(2000,1,1,1,0,0), Time.utc(1990,1,1,1,0,0)))
+      
+    assert_array_same_items([o],
+      OffsetsUpToNoTransitionsTestTimezone.new('Test/Zone', Time.utc(2000,1,1,1,0,0).to_i, nil, p).
+      offsets_up_to(Time.utc(2000,1,1,1,0,0).to_i))
+    assert_array_same_items([o],
+      OffsetsUpToNoTransitionsTestTimezone.new('Test/Zone', Time.utc(2000,1,1,1,0,0).to_i, Time.utc(1990,1,1,1,0,0).to_i, p).
+      offsets_up_to(Time.utc(2000,1,1,1,0,0).to_i, Time.utc(1990,1,1,1,0,0).to_i))
+      
+    assert_array_same_items([o],
+      OffsetsUpToNoTransitionsTestTimezone.new('Test/Zone', DateTime.new(2000,1,1,1,0,0), nil, p).
+      offsets_up_to(DateTime.new(2000,1,1,1,0,0)))
+    assert_array_same_items([o],
+      OffsetsUpToNoTransitionsTestTimezone.new('Test/Zone', DateTime.new(2000,1,1,1,0,0), DateTime.new(1990,1,1,1,0,0), p).
+      offsets_up_to(DateTime.new(2000,1,1,1,0,0), DateTime.new(1990,1,1,1,0,0)))
+  end
+  
+  def test_offsets_up_to_utc_to_not_greater_than_utc_from
+    o = TimezoneOffset.new(600, 0, :LMT)
+    
+    assert_raises(ArgumentError) do
+      OffsetsUpToTestTimezone.new('Test/Zone', Time.utc(2012,8,1,0,0,0), Time.utc(2012,8,1,0,0,0), []).
+        offsets_up_to(Time.utc(2012,8,1,0,0,0), Time.utc(2012,8,1,0,0,0))
+    end
+    
+    assert_raises(ArgumentError) do
+      OffsetsUpToTestTimezone.new('Test/Zone', Time.utc(2012,8,1,0,0,0).to_i, Time.utc(2012,8,1,0,0,0).to_i, []).
+        offsets_up_to(Time.utc(2012,8,1,0,0,0).to_i, Time.utc(2012,8,1,0,0,0).to_i)
+    end
+    
+    assert_raises(ArgumentError) do
+      OffsetsUpToTestTimezone.new('Test/Zone', DateTime.new(2012,8,1,0,0,0), DateTime.new(2012,8,1,0,0,0), []).
+        offsets_up_to(DateTime.new(2012,8,1,0,0,0), DateTime.new(2012,8,1,0,0,0))
+    end
+  end
+  
   def test_now
     assert_kind_of(Time, Timezone.get('Europe/London').now)
   end