tzinfo 0.3.55 → 0.3.60

data/lib/tzinfo/definitions/Pacific/Kosrae.rb

@@ -7,13 +7,22 @@ module TZInfo
         include TimezoneDefinition
         
         timezone 'Pacific/Kosrae' do |tz|
-          tz.offset :o0, 39116, 0, :LMT
-          tz.offset :o1, 39600, 0, :'+11'
-          tz.offset :o2, 43200, 0, :'+12'
+          tz.offset :o0, -47284, 0, :LMT
+          tz.offset :o1, 39116, 0, :LMT
+          tz.offset :o2, 39600, 0, :'+11'
+          tz.offset :o3, 32400, 0, :'+09'
+          tz.offset :o4, 36000, 0, :'+10'
+          tz.offset :o5, 43200, 0, :'+12'
           
-          tz.transition 1900, 12, :o1, 52172317021, 21600
-          tz.transition 1969, 9, :o2, 58571881, 24
-          tz.transition 1998, 12, :o1, 915105600
+          tz.transition 1844, 12, :o1, 51730532221, 21600
+          tz.transition 1900, 12, :o2, 52172317021, 21600
+          tz.transition 1914, 9, :o3, 58089745, 24
+          tz.transition 1919, 1, :o2, 19375921, 8
+          tz.transition 1936, 12, :o4, 58284817, 24
+          tz.transition 1941, 3, :o3, 29161021, 12
+          tz.transition 1945, 7, :o2, 19453345, 8
+          tz.transition 1969, 9, :o5, 58571881, 24
+          tz.transition 1998, 12, :o2, 915105600
         end
       end
     end

data/lib/tzinfo/definitions/Pacific/Kwajalein.rb

@@ -9,12 +9,17 @@ module TZInfo
         timezone 'Pacific/Kwajalein' do |tz|
           tz.offset :o0, 40160, 0, :LMT
           tz.offset :o1, 39600, 0, :'+11'
-          tz.offset :o2, -43200, 0, :'-12'
-          tz.offset :o3, 43200, 0, :'+12'
+          tz.offset :o2, 36000, 0, :'+10'
+          tz.offset :o3, 32400, 0, :'+09'
+          tz.offset :o4, -43200, 0, :'-12'
+          tz.offset :o5, 43200, 0, :'+12'
           
           tz.transition 1900, 12, :o1, 1304307919, 540
-          tz.transition 1969, 9, :o2, 58571881, 24
-          tz.transition 1993, 8, :o3, 745848000
+          tz.transition 1936, 12, :o2, 58284817, 24
+          tz.transition 1941, 3, :o3, 29161021, 12
+          tz.transition 1944, 2, :o1, 19449009, 8
+          tz.transition 1969, 9, :o4, 58571881, 24
+          tz.transition 1993, 8, :o5, 745934400
         end
       end
     end

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

@@ -9,10 +9,17 @@ module TZInfo
         timezone 'Pacific/Majuro' do |tz|
           tz.offset :o0, 41088, 0, :LMT
           tz.offset :o1, 39600, 0, :'+11'
-          tz.offset :o2, 43200, 0, :'+12'
+          tz.offset :o2, 32400, 0, :'+09'
+          tz.offset :o3, 36000, 0, :'+10'
+          tz.offset :o4, 43200, 0, :'+12'
           
           tz.transition 1900, 12, :o1, 1086923261, 450
-          tz.transition 1969, 9, :o2, 58571881, 24
+          tz.transition 1914, 9, :o2, 58089745, 24
+          tz.transition 1919, 1, :o1, 19375921, 8
+          tz.transition 1936, 12, :o3, 58284817, 24
+          tz.transition 1941, 3, :o2, 29161021, 12
+          tz.transition 1944, 1, :o1, 19448953, 8
+          tz.transition 1969, 9, :o4, 58571881, 24
         end
       end
     end

data/lib/tzinfo/definitions/Pacific/Nauru.rb

@@ -13,9 +13,9 @@ module TZInfo
           tz.offset :o3, 43200, 0, :'+12'
           
           tz.transition 1921, 1, :o1, 10466081437, 4320
-          tz.transition 1942, 3, :o2, 116660785, 48
-          tz.transition 1944, 8, :o1, 19450537, 8
-          tz.transition 1979, 4, :o3, 294323400
+          tz.transition 1942, 8, :o2, 116668801, 48
+          tz.transition 1945, 9, :o1, 19453649, 8
+          tz.transition 1979, 2, :o3, 287418600
         end
       end
     end

data/lib/tzinfo/definitions/Pacific/Norfolk.rb

@@ -12,12 +12,75 @@ module TZInfo
           tz.offset :o2, 41400, 0, :'+1130'
           tz.offset :o3, 41400, 3600, :'+1230'
           tz.offset :o4, 39600, 0, :'+11'
+          tz.offset :o5, 39600, 3600, :'+12'
           
           tz.transition 1900, 12, :o1, 26086158361, 10800
           tz.transition 1950, 12, :o2, 73009411, 30
           tz.transition 1974, 10, :o3, 152029800
-          tz.transition 1975, 3, :o2, 162912600
+          tz.transition 1975, 3, :o2, 162916200
           tz.transition 2015, 10, :o4, 1443882600
+          tz.transition 2019, 10, :o5, 1570287600
+          tz.transition 2020, 4, :o4, 1586012400
+          tz.transition 2020, 10, :o5, 1601737200
+          tz.transition 2021, 4, :o4, 1617462000
+          tz.transition 2021, 10, :o5, 1633186800
+          tz.transition 2022, 4, :o4, 1648911600
+          tz.transition 2022, 10, :o5, 1664636400
+          tz.transition 2023, 4, :o4, 1680361200
+          tz.transition 2023, 9, :o5, 1696086000
+          tz.transition 2024, 4, :o4, 1712415600
+          tz.transition 2024, 10, :o5, 1728140400
+          tz.transition 2025, 4, :o4, 1743865200
+          tz.transition 2025, 10, :o5, 1759590000
+          tz.transition 2026, 4, :o4, 1775314800
+          tz.transition 2026, 10, :o5, 1791039600
+          tz.transition 2027, 4, :o4, 1806764400
+          tz.transition 2027, 10, :o5, 1822489200
+          tz.transition 2028, 4, :o4, 1838214000
+          tz.transition 2028, 9, :o5, 1853938800
+          tz.transition 2029, 3, :o4, 1869663600
+          tz.transition 2029, 10, :o5, 1885993200
+          tz.transition 2030, 4, :o4, 1901718000
+          tz.transition 2030, 10, :o5, 1917442800
+          tz.transition 2031, 4, :o4, 1933167600
+          tz.transition 2031, 10, :o5, 1948892400
+          tz.transition 2032, 4, :o4, 1964617200
+          tz.transition 2032, 10, :o5, 1980342000
+          tz.transition 2033, 4, :o4, 1996066800
+          tz.transition 2033, 10, :o5, 2011791600
+          tz.transition 2034, 4, :o4, 2027516400
+          tz.transition 2034, 9, :o5, 2043241200
+          tz.transition 2035, 3, :o4, 2058966000
+          tz.transition 2035, 10, :o5, 2075295600
+          tz.transition 2036, 4, :o4, 2091020400
+          tz.transition 2036, 10, :o5, 2106745200
+          tz.transition 2037, 4, :o4, 2122470000
+          tz.transition 2037, 10, :o5, 2138194800
+          tz.transition 2038, 4, :o4, 19724137, 8
+          tz.transition 2038, 10, :o5, 19725593, 8
+          tz.transition 2039, 4, :o4, 19727049, 8
+          tz.transition 2039, 10, :o5, 19728505, 8
+          tz.transition 2040, 3, :o4, 19729961, 8
+          tz.transition 2040, 10, :o5, 19731473, 8
+          tz.transition 2041, 4, :o4, 19732929, 8
+          tz.transition 2041, 10, :o5, 19734385, 8
+          tz.transition 2042, 4, :o4, 19735841, 8
+          tz.transition 2042, 10, :o5, 19737297, 8
+          tz.transition 2043, 4, :o4, 19738753, 8
+          tz.transition 2043, 10, :o5, 19740209, 8
+          tz.transition 2044, 4, :o4, 19741665, 8
+          tz.transition 2044, 10, :o5, 19743121, 8
+          tz.transition 2045, 4, :o4, 19744577, 8
+          tz.transition 2045, 9, :o5, 19746033, 8
+          tz.transition 2046, 3, :o4, 19747489, 8
+          tz.transition 2046, 10, :o5, 19749001, 8
+          tz.transition 2047, 4, :o4, 19750457, 8
+          tz.transition 2047, 10, :o5, 19751913, 8
+          tz.transition 2048, 4, :o4, 19753369, 8
+          tz.transition 2048, 10, :o5, 19754825, 8
+          tz.transition 2049, 4, :o4, 19756281, 8
+          tz.transition 2049, 10, :o5, 19757737, 8
+          tz.transition 2050, 4, :o4, 19759193, 8
         end
       end
     end

data/lib/tzinfo/definitions/Pacific/Palau.rb

@@ -7,10 +7,12 @@ module TZInfo
         include TimezoneDefinition
         
         timezone 'Pacific/Palau' do |tz|
-          tz.offset :o0, 32276, 0, :LMT
-          tz.offset :o1, 32400, 0, :'+09'
+          tz.offset :o0, -54124, 0, :LMT
+          tz.offset :o1, 32276, 0, :LMT
+          tz.offset :o2, 32400, 0, :'+09'
           
-          tz.transition 1900, 12, :o1, 52172318731, 21600
+          tz.transition 1844, 12, :o1, 51730533931, 21600
+          tz.transition 1900, 12, :o2, 52172318731, 21600
         end
       end
     end

data/lib/tzinfo/definitions/Pacific/Pohnpei.rb

@@ -7,10 +7,19 @@ module TZInfo
         include TimezoneDefinition
         
         timezone 'Pacific/Pohnpei' do |tz|
-          tz.offset :o0, 37972, 0, :LMT
-          tz.offset :o1, 39600, 0, :'+11'
+          tz.offset :o0, -48428, 0, :LMT
+          tz.offset :o1, 37972, 0, :LMT
+          tz.offset :o2, 39600, 0, :'+11'
+          tz.offset :o3, 32400, 0, :'+09'
+          tz.offset :o4, 36000, 0, :'+10'
           
-          tz.transition 1900, 12, :o1, 52172317307, 21600
+          tz.transition 1844, 12, :o1, 51730532507, 21600
+          tz.transition 1900, 12, :o2, 52172317307, 21600
+          tz.transition 1914, 9, :o3, 58089745, 24
+          tz.transition 1919, 1, :o2, 19375921, 8
+          tz.transition 1936, 12, :o4, 58284817, 24
+          tz.transition 1941, 3, :o3, 29161021, 12
+          tz.transition 1945, 7, :o2, 19453345, 8
         end
       end
     end

data/lib/tzinfo/definitions/UCT.rb

@@ -5,7 +5,7 @@ module TZInfo
     module UCT
       include TimezoneDefinition
       
-      linked_timezone 'UCT', 'Etc/UCT'
+      linked_timezone 'UCT', 'Etc/UTC'
     end
   end
 end

data/lib/tzinfo/indexes/countries.rb

@@ -64,8 +64,7 @@ module TZInfo
       country 'AU', 'Australia' do |c|
         c.timezone 'Australia/Lord_Howe', -631, 20, 1909, 12, 'Lord Howe Island'
         c.timezone 'Antarctica/Macquarie', -109, 2, 3179, 20, 'Macquarie Island'
-        c.timezone 'Australia/Hobart', -2573, 60, 8839, 60, 'Tasmania (most areas)'
-        c.timezone 'Australia/Currie', -599, 15, 2158, 15, 'Tasmania (King Island)'
+        c.timezone 'Australia/Hobart', -2573, 60, 8839, 60, 'Tasmania'
         c.timezone 'Australia/Melbourne', -2269, 60, 4349, 30, 'Victoria'
         c.timezone 'Australia/Sydney', -508, 15, 9073, 60, 'New South Wales (most areas)'
         c.timezone 'Australia/Broken_Hill', -639, 20, 2829, 20, 'New South Wales (Yancowinna)'
@@ -187,9 +186,9 @@ module TZInfo
         c.timezone 'America/Creston', 491, 10, -6991, 60, 'MST - BC (Creston)'
         c.timezone 'America/Dawson_Creek', 1793, 30, -3607, 30, 'MST - BC (Dawson Cr, Ft St John)'
         c.timezone 'America/Fort_Nelson', 294, 5, -1227, 10, 'MST - BC (Ft Nelson)'
+        c.timezone 'America/Whitehorse', 3643, 60, -2701, 20, 'MST - Yukon (east)'
+        c.timezone 'America/Dawson', 961, 15, -1673, 12, 'MST - Yukon (west)'
         c.timezone 'America/Vancouver', 739, 15, -7387, 60, 'Pacific - BC (most areas)'
-        c.timezone 'America/Whitehorse', 3643, 60, -2701, 20, 'Pacific - Yukon (south)'
-        c.timezone 'America/Dawson', 961, 15, -1673, 12, 'Pacific - Yukon (north)'
       end
       country 'CC', 'Cocos (Keeling) Islands' do |c|
         c.timezone 'Indian/Cocos', -73, 6, 1163, 12
@@ -338,7 +337,7 @@ module TZInfo
         c.timezone 'Europe/Gibraltar', 542, 15, -107, 20
       end
       country 'GL', 'Greenland' do |c|
-        c.timezone 'America/Godthab', 3851, 60, -776, 15, 'Greenland (most areas)'
+        c.timezone 'America/Nuuk', 3851, 60, -776, 15, 'Greenland (most areas)'
         c.timezone 'America/Danmarkshavn', 2303, 30, -56, 3, 'National Park (east coast)'
         c.timezone 'America/Scoresbysund', 4229, 60, -659, 30, 'Scoresbysund/Ittoqqortoormiit'
         c.timezone 'America/Thule', 2297, 30, -4127, 60, 'Thule/Pituffik'
@@ -469,6 +468,7 @@ module TZInfo
       country 'KZ', 'Kazakhstan' do |c|
         c.timezone 'Asia/Almaty', 173, 4, 1539, 20, 'Kazakhstan (most areas)'
         c.timezone 'Asia/Qyzylorda', 224, 5, 982, 15, 'Qyzylorda/Kyzylorda/Kzyl-Orda'
+        c.timezone 'Asia/Qostanay', 266, 5, 3817, 60, 'Qostanay/Kostanay/Kustanay'
         c.timezone 'Asia/Aqtobe', 3017, 60, 343, 6, 'Aqtobe/Aktobe'
         c.timezone 'Asia/Aqtau', 2671, 60, 754, 15, 'Mangghystau/Mankistau'
         c.timezone 'Asia/Atyrau', 2827, 60, 779, 15, 'Atyrau/Atirau/Gur\'yev'
@@ -529,7 +529,7 @@ module TZInfo
         c.timezone 'Pacific/Majuro', 143, 20, 856, 5, 'Marshall Islands (most areas)'
         c.timezone 'Pacific/Kwajalein', 109, 12, 502, 3, 'Kwajalein'
       end
-      country 'MK', 'Macedonia' do |c|
+      country 'MK', 'North Macedonia' do |c|
         c.timezone 'Europe/Skopje', 2519, 60, 643, 30
       end
       country 'ML', 'Mali' do |c|
@@ -693,9 +693,8 @@ module TZInfo
       country 'RU', 'Russia' do |c|
         c.timezone 'Europe/Kaliningrad', 3283, 60, 41, 2, 'MSK-01 - Kaliningrad'
         c.timezone 'Europe/Moscow', 66907, 1200, 8464, 225, 'MSK+00 - Moscow area'
-        c.timezone 'Europe/Simferopol', 899, 20, 341, 10, 'MSK+00 - Crimea'
-        c.timezone 'Europe/Volgograd', 731, 15, 533, 12, 'MSK+00 - Volgograd'
         c.timezone 'Europe/Kirov', 293, 5, 993, 20, 'MSK+00 - Kirov'
+        c.timezone 'Europe/Volgograd', 731, 15, 533, 12, 'MSK+00 - Volgograd'
         c.timezone 'Europe/Astrakhan', 927, 20, 961, 20, 'MSK+01 - Astrakhan'
         c.timezone 'Europe/Saratov', 1547, 30, 1381, 30, 'MSK+01 - Saratov'
         c.timezone 'Europe/Ulyanovsk', 163, 3, 242, 5, 'MSK+01 - Ulyanovsk'
@@ -782,7 +781,7 @@ module TZInfo
       country 'SY', 'Syria' do |c|
         c.timezone 'Asia/Damascus', 67, 2, 363, 10
       end
-      country 'SZ', 'Swaziland' do |c|
+      country 'SZ', 'Eswatini (Swaziland)' do |c|
         c.timezone 'Africa/Mbabane', -263, 10, 311, 10
       end
       country 'TC', 'Turks & Caicos Is' do |c|
@@ -834,9 +833,10 @@ module TZInfo
         c.timezone 'Africa/Dar_es_Salaam', -34, 5, 2357, 60
       end
       country 'UA', 'Ukraine' do |c|
+        c.timezone 'Europe/Simferopol', 899, 20, 341, 10, 'Crimea'
         c.timezone 'Europe/Kiev', 1513, 30, 1831, 60, 'Ukraine (most areas)'
-        c.timezone 'Europe/Uzhgorod', 2917, 60, 223, 10, 'Ruthenia'
-        c.timezone 'Europe/Zaporozhye', 287, 6, 211, 6, 'Zaporozh\'ye/Zaporizhia; Lugansk/Luhansk (east)'
+        c.timezone 'Europe/Uzhgorod', 2917, 60, 223, 10, 'Transcarpathia'
+        c.timezone 'Europe/Zaporozhye', 287, 6, 211, 6, 'Zaporozhye and east Lugansk'
       end
       country 'UG', 'Uganda' do |c|
         c.timezone 'Africa/Kampala', 19, 60, 389, 12

data/lib/tzinfo/indexes/timezones.rb

@@ -120,7 +120,7 @@ module TZInfo
       linked_timezone 'America/Fort_Wayne'
       timezone 'America/Fortaleza'
       timezone 'America/Glace_Bay'
-      timezone 'America/Godthab'
+      linked_timezone 'America/Godthab'
       timezone 'America/Goose_Bay'
       timezone 'America/Grand_Turk'
       linked_timezone 'America/Grenada'
@@ -180,6 +180,7 @@ module TZInfo
       timezone 'America/North_Dakota/Beulah'
       timezone 'America/North_Dakota/Center'
       timezone 'America/North_Dakota/New_Salem'
+      timezone 'America/Nuuk'
       timezone 'America/Ojinaga'
       timezone 'America/Panama'
       timezone 'America/Pangnirtung'
@@ -306,6 +307,7 @@ module TZInfo
       timezone 'Asia/Pontianak'
       timezone 'Asia/Pyongyang'
       timezone 'Asia/Qatar'
+      timezone 'Asia/Qostanay'
       timezone 'Asia/Qyzylorda'
       linked_timezone 'Asia/Rangoon'
       timezone 'Asia/Riyadh'
@@ -353,7 +355,7 @@ module TZInfo
       timezone 'Australia/Brisbane'
       timezone 'Australia/Broken_Hill'
       linked_timezone 'Australia/Canberra'
-      timezone 'Australia/Currie'
+      linked_timezone 'Australia/Currie'
       timezone 'Australia/Darwin'
       timezone 'Australia/Eucla'
       timezone 'Australia/Hobart'
@@ -424,7 +426,7 @@ module TZInfo
       timezone 'Etc/GMT-9'
       linked_timezone 'Etc/GMT0'
       linked_timezone 'Etc/Greenwich'
-      timezone 'Etc/UCT'
+      linked_timezone 'Etc/UCT'
       timezone 'Etc/UTC'
       linked_timezone 'Etc/Universal'
       linked_timezone 'Etc/Zulu'
@@ -591,7 +593,6 @@ module TZInfo
       linked_timezone 'US/Michigan'
       linked_timezone 'US/Mountain'
       linked_timezone 'US/Pacific'
-      linked_timezone 'US/Pacific-New'
       linked_timezone 'US/Samoa'
       linked_timezone 'UTC'
       linked_timezone 'Universal'

data/lib/tzinfo/tzdataparser.rb

@@ -483,8 +483,9 @@ module TZInfo
     end
     
     def at_utc_time(year, utc_offset, std_offset)
+      absolute = @on_day.to_absolute(year, @in_month)
       @at_time.to_utc(utc_offset, std_offset,
-        year, @in_month, @on_day.to_absolute(year, @in_month))
+        absolute.year, absolute.month, absolute.day)
     end
     
     private
@@ -1036,7 +1037,8 @@ module TZInfo
   end
     
   # A tz data day of the month reference. Can either be an absolute day,
-  # a last week day or a week day >= or <= than a specific day of month.
+  # a last week day or a week day >= or <= than a specific day of month. Can
+  # result in a day in the neighbouring month.
   #
   # @private
   class TZDataDayOfMonth #:nodoc:
@@ -1062,30 +1064,23 @@ module TZInfo
       end
     end
     
-    # Returns the absolute day of month for the given year and month.
+    # Returns the absolute date for the given year and month.
     def to_absolute(year, month)
       case @type
         when :last
           last_day_in_month = (Date.new(year, month, 1) >> 1) - 1          
           offset = last_day_in_month.wday - @day_of_week
           offset = offset + 7 if offset < 0
-          (last_day_in_month - offset).day
+          last_day_in_month - offset
         when :comparison
           pivot = Date.new(year, month, @day_of_month)         
           offset = @day_of_week - pivot.wday
           offset = -offset if @operator == :less_equal
           offset = offset + 7 if offset < 0
           offset = -offset if @operator == :less_equal          
-          result = pivot + offset
-          if result.month != pivot.month
-            puts self.inspect
-            puts year
-            puts month
-          end
-          raise 'No suitable date found' if result.month != pivot.month
-          result.day          
+          pivot + offset
         else #absolute
-          @day_of_month
+          Date.new(year, month, @day_of_month)
       end
     end
     
@@ -1143,7 +1138,8 @@ module TZInfo
     
     # Converts the reference to a UTC DateTime.
     def to_utc(utc_offset, std_offset)
-      @time.to_utc(utc_offset, std_offset, @year, @month, @day.to_absolute(@year, @month))            
+      absolute = @day.to_absolute(@year, @month)
+      @time.to_utc(utc_offset, std_offset, absolute.year, absolute.month, absolute.day)
     end
   end
   

data/test/tc_timezone_melbourne.rb

@@ -53,48 +53,48 @@ class TCTimezoneMelbourne < Test::Unit::TestCase
   end  
 
   def test_1942
-    #Australia/Melbourne  Sat Mar 28 14:59:59 1942 UTC = Sun Mar 29 01:59:59 1942 AEDT isdst=1 gmtoff=39600
-    #Australia/Melbourne  Sat Mar 28 15:00:00 1942 UTC = Sun Mar 29 01:00:00 1942 AEST isdst=0 gmtoff=36000
+    #Australia/Melbourne  Sat Mar 28 15:59:59 1942 UTC = Sun Mar 29 02:59:59 1942 AEDT isdst=1 gmtoff=39600
+    #Australia/Melbourne  Sat Mar 28 16:00:00 1942 UTC = Sun Mar 29 02:00:00 1942 AEST isdst=0 gmtoff=36000
     #Australia/Melbourne  Sat Sep 26 15:59:59 1942 UTC = Sun Sep 27 01:59:59 1942 AEST isdst=0 gmtoff=36000
     #Australia/Melbourne  Sat Sep 26 16:00:00 1942 UTC = Sun Sep 27 03:00:00 1942 AEDT isdst=1 gmtoff=39600
     
     tz = Timezone.get('Australia/Melbourne')
-    assert_equal(DateTime.new(1942,3,29,1,59,59), tz.utc_to_local(DateTime.new(1942,3,28,14,59,59)))
-    assert_equal(DateTime.new(1942,3,29,1,0,0), tz.utc_to_local(DateTime.new(1942,3,28,15,0,0)))    
+    assert_equal(DateTime.new(1942,3,29,2,59,59), tz.utc_to_local(DateTime.new(1942,3,28,15,59,59)))
+    assert_equal(DateTime.new(1942,3,29,2,0,0), tz.utc_to_local(DateTime.new(1942,3,28,16,0,0)))
     assert_equal(DateTime.new(1942,9,27,1,59,59), tz.utc_to_local(DateTime.new(1942,9,26,15,59,59)))
     assert_equal(DateTime.new(1942,9,27,3,0,0), tz.utc_to_local(DateTime.new(1942,9,26,16,0,0)))
     
-    assert_equal(DateTime.new(1942,3,28,14,59,59), tz.local_to_utc(DateTime.new(1942,3,29,1,59,59), true))
-    assert_equal(DateTime.new(1942,3,28,15,59,59), tz.local_to_utc(DateTime.new(1942,3,29,1,59,59), false))
-    assert_equal(DateTime.new(1942,3,28,14,0,0), tz.local_to_utc(DateTime.new(1942,3,29,1,0,0), true))
-    assert_equal(DateTime.new(1942,3,28,15,0,0), tz.local_to_utc(DateTime.new(1942,3,29,1,0,0), false))   
+    assert_equal(DateTime.new(1942,3,28,15,59,59), tz.local_to_utc(DateTime.new(1942,3,29,2,59,59), true))
+    assert_equal(DateTime.new(1942,3,28,16,59,59), tz.local_to_utc(DateTime.new(1942,3,29,2,59,59), false))
+    assert_equal(DateTime.new(1942,3,28,15,0,0), tz.local_to_utc(DateTime.new(1942,3,29,2,0,0), true))
+    assert_equal(DateTime.new(1942,3,28,16,0,0), tz.local_to_utc(DateTime.new(1942,3,29,2,0,0), false))
     assert_equal(DateTime.new(1942,9,26,15,59,59), tz.local_to_utc(DateTime.new(1942,9,27,1,59,59)))
     assert_equal(DateTime.new(1942,9,26,16,0,0), tz.local_to_utc(DateTime.new(1942,9,27,3,0,0)))
     
     assert_raises(PeriodNotFound) { tz.local_to_utc(DateTime.new(1942,9,27,2,0,0)) }
-    assert_raises(AmbiguousTime) { tz.local_to_utc(DateTime.new(1942,3,29,1,0,0)) }
+    assert_raises(AmbiguousTime) { tz.local_to_utc(DateTime.new(1942,3,29,2,0,0)) }
     
-    assert_equal(:AEDT, tz.period_for_utc(DateTime.new(1942,3,28,14,59,59)).zone_identifier)
-    assert_equal(:AEST, tz.period_for_utc(DateTime.new(1942,3,28,15,0,0)).zone_identifier)
+    assert_equal(:AEDT, tz.period_for_utc(DateTime.new(1942,3,28,15,59,59)).zone_identifier)
+    assert_equal(:AEST, tz.period_for_utc(DateTime.new(1942,3,28,16,0,0)).zone_identifier)
     assert_equal(:AEST, tz.period_for_utc(DateTime.new(1942,9,26,15,59,59)).zone_identifier)
     assert_equal(:AEDT, tz.period_for_utc(DateTime.new(1942,9,26,16,0,0)).zone_identifier)
     
-    assert_equal(:AEDT, tz.period_for_local(DateTime.new(1942,3,29,1,59,59), true).zone_identifier)
-    assert_equal(:AEST, tz.period_for_local(DateTime.new(1942,3,29,1,59,59), false).zone_identifier)
-    assert_equal(:AEDT, tz.period_for_local(DateTime.new(1942,3,29,1,0,0), true).zone_identifier)
-    assert_equal(:AEST, tz.period_for_local(DateTime.new(1942,3,29,1,0,0), false).zone_identifier)
+    assert_equal(:AEDT, tz.period_for_local(DateTime.new(1942,3,29,2,59,59), true).zone_identifier)
+    assert_equal(:AEST, tz.period_for_local(DateTime.new(1942,3,29,2,59,59), false).zone_identifier)
+    assert_equal(:AEDT, tz.period_for_local(DateTime.new(1942,3,29,2,0,0), true).zone_identifier)
+    assert_equal(:AEST, tz.period_for_local(DateTime.new(1942,3,29,2,0,0), false).zone_identifier)
     assert_equal(:AEST, tz.period_for_local(DateTime.new(1942,9,27,1,59,59)).zone_identifier)
     assert_equal(:AEDT, tz.period_for_local(DateTime.new(1942,9,27,3,0,0)).zone_identifier)
     
-    assert_equal(39600, tz.period_for_utc(DateTime.new(1942,3,28,14,59,59)).utc_total_offset)
-    assert_equal(36000, tz.period_for_utc(DateTime.new(1942,3,28,15,0,0)).utc_total_offset)
+    assert_equal(39600, tz.period_for_utc(DateTime.new(1942,3,28,15,59,59)).utc_total_offset)
+    assert_equal(36000, tz.period_for_utc(DateTime.new(1942,3,28,16,0,0)).utc_total_offset)
     assert_equal(36000, tz.period_for_utc(DateTime.new(1942,9,26,15,59,59)).utc_total_offset)
     assert_equal(39600, tz.period_for_utc(DateTime.new(1942,9,26,16,0,0)).utc_total_offset)
     
-    assert_equal(39600, tz.period_for_local(DateTime.new(1942,3,29,1,59,59), true).utc_total_offset)
-    assert_equal(36000, tz.period_for_local(DateTime.new(1942,3,29,1,59,59), false).utc_total_offset)
-    assert_equal(39600, tz.period_for_local(DateTime.new(1942,3,29,1,0,0), true).utc_total_offset)
-    assert_equal(36000, tz.period_for_local(DateTime.new(1942,3,29,1,0,0), false).utc_total_offset)
+    assert_equal(39600, tz.period_for_local(DateTime.new(1942,3,29,2,59,59), true).utc_total_offset)
+    assert_equal(36000, tz.period_for_local(DateTime.new(1942,3,29,2,59,59), false).utc_total_offset)
+    assert_equal(39600, tz.period_for_local(DateTime.new(1942,3,29,2,0,0), true).utc_total_offset)
+    assert_equal(36000, tz.period_for_local(DateTime.new(1942,3,29,2,0,0), false).utc_total_offset)
     assert_equal(36000, tz.period_for_local(DateTime.new(1942,9,27,1,59,59)).utc_total_offset)
     assert_equal(39600, tz.period_for_local(DateTime.new(1942,9,27,3,0,0)).utc_total_offset)
   end