tzinfo 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50a3eb0b5e727ec5ef5cfc93577f18fa28924512
-  data.tar.gz: 8de5a649d264b57190e65f2ba9728a123f7a5167
+  metadata.gz: 9ebc85eb68af0647a8989ba7cb104b24100ef198
+  data.tar.gz: a2fdbcd5b2c456658ef15e7cedea229a66259a03
 SHA512:
-  metadata.gz: 602840d66f927274773a40f22e1807e4280fee76b7b5098db8e739b0041b7a26af9f225f8c4e591f5b2f5baac5a3c0a597204f195edfd6805beca17e606ab4de
-  data.tar.gz: 0b53e4209bfde4cfd326e8b22ebe5750e6e293f486c4420ff517eff9015f2329340de343ad7d489d32df4c96e1eab9f988a056c3b323bcda73d3978c84d2dcc3
+  metadata.gz: 96a612b4835747ab4a3990195c1d6ff0e8fbed4905091e0380fc0b8fb64f4635a5f2cdf1a4deb4d0e3983e64a346c8afae2b063d1f53a4a5fddda4950b1eaf11
+  data.tar.gz: 59611995417725d20c591824e40b09df9325c39fb0161744228876effb6d263776cf12e9e209fa5380207e017fc38dd49a960c7f8582243c3982745ee1c3e37c

data/CHANGES.md

@@ -1,3 +1,14 @@
+Version 1.2.2 - 8-Aug-2014
+--------------------------
+
+* Fix an error with duplicates being returned by Timezone#all_country_zones
+  and Timezone#all_country_zone_identifiers when used with tzinfo-data
+  v1.2014.6 or later.
+* Use the zone1970.tab file for country timezone data if it is found in the
+  zoneinfo directory (and fallback to zone.tab if not). zone1970.tab was added
+  in tzdata 2014f. zone.tab is now deprecated.
+
+
 Version 1.2.1 - 1-Jun-2014
 --------------------------
 

data/README.md

@@ -91,8 +91,8 @@ The current local time in a `Timezone` can be obtained with the
     now = tz.now
 
 All methods in TZInfo that operate on a time can be used with either `Time` or 
-`DateTime` instances or with nteger timestamps (i.e. as returned by 
-`Time#to_i`). The type of the values returned will match the the type passed in.
+`DateTime` instances or with Integer timestamps (i.e. as returned by 
+`Time#to_i`). The type of the values returned will match the type passed in.
 
 A list of all the available timezone identifiers can be obtained using the
 `TZInfo::Timezone.all_identifiers` method. `TZInfo::Timezone.all` can be called

data/lib/tzinfo/country.rb

@@ -102,6 +102,11 @@ module TZInfo
     #
     # 1. makes some geographical sense, and
     # 2. puts the most populous zones first, where that does not contradict 1.
+    #
+    # Returned zone identifiers may refer to cities and regions outside of the
+    # country. This will occur if the zone covers multiple countries. Any zones
+    # referring to a city or region in a different country will be listed after
+    # those relating to this country.
     def zone_identifiers
       @info.zone_identifiers
     end
@@ -114,6 +119,11 @@ module TZInfo
     #
     # 1. makes some geographical sense, and
     # 2. puts the most populous zones first, where that does not contradict 1.
+    #
+    # Identifiers of the zones returned may refer to cities and regions outside
+    # of the country. This will occur if the zone covers multiple countries. Any
+    # zones referring to a city or region in a different country will be listed
+    # after those relating to this country.
     def zones
       zone_identifiers.collect {|id|
         Timezone.get_proxy(id)        
@@ -126,6 +136,11 @@ module TZInfo
     #
     # 1. makes some geographical sense, and
     # 2. puts the most populous zones first, where that does not contradict 1.
+    #
+    # Identifiers and descriptions of the zones returned may refer to cities and
+    # regions outside of the country. This will occur if the zone covers
+    # multiple countries. Any zones referring to a city or region in a different
+    # country will be listed after those relating to this country.
     def zone_info
       @info.zones
     end
@@ -166,7 +181,8 @@ module TZInfo
       def setup(info)
         @info = info        
       end
-      
+
+      # Initializes @@countries.
       def self.init_countries
         @@countries = ThreadSafe::Cache.new
       end

data/lib/tzinfo/timezone.rb

@@ -167,9 +167,9 @@ module TZInfo
     # Returns TimezoneProxy objects to avoid the overhead of loading Timezone
     # definitions until a conversion is actually required.        
     def self.all_country_zones
-      Country.all_codes.inject([]) {|zones,country|
+      Country.all_codes.inject([]) do |zones,country|
         zones += Country.get(country).zones
-      }
+      end.uniq
     end
     
     # Returns all the zone identifiers defined for all Countries. This is not the
@@ -177,9 +177,9 @@ module TZInfo
     # 'Etc/GMT'). You can obtain a Timezone instance for a given identifier
     # with the get method.
     def self.all_country_zone_identifiers
-      Country.all_codes.inject([]) {|zones,country|
+      Country.all_codes.inject([]) do |zones,country|
         zones += Country.get(country).zone_identifiers
-      }
+      end.uniq
     end
     
     # Returns all US Timezone instances. A shortcut for 
@@ -624,11 +624,12 @@ module TZInfo
         identifiers.collect {|identifier| get_proxy(identifier)}
       end
       
-      # Returns the current DataSource
+      # Returns the current DataSource.
       def self.data_source
         DataSource.get
       end
 
+      # Raises an UnknownTimezone exception.
       def raise_unknown_timezone
         raise UnknownTimezone, 'TZInfo::Timezone constructed directly'
       end

data/lib/tzinfo/zoneinfo_data_source.rb

@@ -9,14 +9,14 @@ module TZInfo
   # A ZoneinfoDirectoryNotFound exception is raised if no valid zoneinfo 
   # directory could be found when checking the paths listed in
   # ZoneinfoDataSource.search_path. A valid zoneinfo directory is one that
-  # contains index files named iso3166.tab and zone.tab as well as other 
-  # timezone files.
+  # contains timezone files, a country code index file named iso3166.tab and a
+  # timezone index file named zone1970.tab or zone.tab.
   class ZoneinfoDirectoryNotFound < StandardError
   end
   
   # A DataSource that loads data from a 'zoneinfo' directory containing
-  # compiled "TZif" version 2 (or earlier) files in addition to zones.tab 
-  # and iso3166.tab index files.
+  # compiled "TZif" version 3 (or earlier) files in addition to iso3166.tab and
+  # zone1970.tab or zone.tab index files.
   #
   # To have TZInfo load the system zoneinfo files, call TZInfo::DataSource.set 
   # as follows:
@@ -141,21 +141,22 @@ module TZInfo
     # If zoneinfo_dir is specified, it will be checked and used as the source
     # of zoneinfo files. 
     #
-    # The directory must contain iso3166.tab and zone.tab files. These may 
-    # either be included in the root of the directory or in a 'tab' 
-    # sub-directory named 'country.tab' and 'zone_sun.tab' respectively (as is
-    # the case on Solaris.
+    # The directory must contain a file named iso3166.tab and a file named
+    # either zone1970.tab or zone.tab. These may either be included in the root
+    # of the directory or in a 'tab' sub-directory and named 'country.tab' and
+    # 'zone_sun.tab' respectively (as is the case on Solaris.
     #
     # Additionally, the path to iso3166.tab can be overridden using the 
     # alternate_iso3166_tab_path parameter.
     #
-    # InvalidZoneinfoDirectory will be raised if the iso3166.tab and zone.tab
-    # files cannot be found using the zoneinfo_dir and alternate_iso3166_tab_path
-    # parameters.
+    # InvalidZoneinfoDirectory will be raised if the iso3166.tab and
+    # zone1970.tab or zone.tab files cannot be found using the zoneinfo_dir and
+    # alternate_iso3166_tab_path parameters.
     # 
     # If zoneinfo_dir is not specified or nil, the paths referenced in
     # search_path are searched in order to find a valid zoneinfo directory 
-    # (one that contains zone.tab and iso3166.tab files as above).
+    # (one that contains zone1970.tab or zone.tab and iso3166.tab files as
+    # above).
     #
     # The paths referenced in alternate_iso3166_tab_search_path are also
     # searched to find an iso3166.tab file if one of the searched zoneinfo
@@ -168,7 +169,7 @@ module TZInfo
         iso3166_tab_path, zone_tab_path = validate_zoneinfo_dir(zoneinfo_dir, alternate_iso3166_tab_path)
       
         unless iso3166_tab_path && zone_tab_path
-          raise InvalidZoneinfoDirectory, "#{zoneinfo_dir} is not a directory or doesn't contain iso3166.tab and zone.tab files." 
+          raise InvalidZoneinfoDirectory, "#{zoneinfo_dir} is not a directory or doesn't contain a iso3166.tab file and a zone1970.tab or zone.tab file." 
         end
         
         @zoneinfo_dir = zoneinfo_dir
@@ -277,7 +278,8 @@ module TZInfo
     end
     
     # Validates a zoneinfo directory and returns the paths to the iso3166.tab 
-    # and zone.tab files if valid. If the directory is not valid, returns nil.
+    # and zone1970.tab or zone.tab files if valid. If the directory is not
+    # valid, returns nil.
     #
     # The path to the iso3166.tab file may be overriden by passing in a path.
     # This is treated as either absolute or relative to the current working
@@ -287,11 +289,11 @@ module TZInfo
         if iso3166_tab_path
           return nil unless File.file?(iso3166_tab_path)
         else
-          iso3166_tab_path = resolve_tab_path(path, 'iso3166.tab', 'country.tab')
+          iso3166_tab_path = resolve_tab_path(path, ['iso3166.tab'], 'country.tab')
           return nil unless iso3166_tab_path          
         end
         
-        zone_tab_path = resolve_tab_path(path, 'zone.tab', 'zone_sun.tab')
+        zone_tab_path = resolve_tab_path(path, ['zone1970.tab', 'zone.tab'], 'zone_sun.tab')
         return nil unless zone_tab_path
       
         [iso3166_tab_path, zone_tab_path]
@@ -300,11 +302,13 @@ module TZInfo
       end
     end
     
-    # Attempts to resolve the path to a tab file given its standard name and
+    # Attempts to resolve the path to a tab file given its standard names and
     # tab sub-directory name (as used on Solaris).
-    def resolve_tab_path(zoneinfo_path, standard_name, tab_name)
-      path = File.join(zoneinfo_path, standard_name)      
-      return path if File.file?(path)
+    def resolve_tab_path(zoneinfo_path, standard_names, tab_name)
+      standard_names.each do |standard_name|
+        path = File.join(zoneinfo_path, standard_name)
+        return path if File.file?(path)
+      end
       
       path = File.join(zoneinfo_path, 'tab', tab_name)
       return path if File.file?(path)
@@ -372,8 +376,8 @@ module TZInfo
       end
     end
     
-    # Uses the iso3166.tab and zone.tab files to build an index of the 
-    # available countries and their timezones.
+    # Uses the iso3166.tab and zone1970.tab or zone.tab files to build an index
+    # of the available countries and their timezones.
     def load_country_index(iso3166_tab_path, zone_tab_path)
       
       # Handle standard 3 to 4 column zone.tab files as well as the 4 to 5 
@@ -390,6 +394,19 @@ module TZInfo
       # Since the last column is optional in both formats, testing for the 
       # Solaris format is done in two passes. The first pass identifies if there
       # are any lines using 5 columns.
+
+
+      # The first column is allowed to be a comma separated list of country
+      # codes, as used in zone1970.tab (introduced in tzdata 2014f).
+      #
+      # The first country code in the comma-separated list is the country that
+      # contains the city the zone identifer is based on. The first country
+      # code on each line is considered to be primary with the others
+      # secondary.
+      #
+      # The zones for each country are ordered primary first, then secondary.
+      # Within the primary and secondary groups, the zones are ordered by their
+      # order in the file.
       
       file_is_5_column = false
       zone_tab = []
@@ -398,8 +415,8 @@ module TZInfo
         file.each_line do |line|
           line.chomp!
           
-          if line =~ /\A([A-Z]{2})\t(?:([+\-])(\d{2})(\d{2})([+\-])(\d{3})(\d{2})|([+\-])(\d{2})(\d{2})(\d{2})([+\-])(\d{3})(\d{2})(\d{2}))\t([^\t]+)(?:\t([^\t]+))?(?:\t([^\t]+))?\z/
-            code = $1
+          if line =~ /\A([A-Z]{2}(?:,[A-Z]{2})*)\t(?:([+\-])(\d{2})(\d{2})([+\-])(\d{3})(\d{2})|([+\-])(\d{2})(\d{2})(\d{2})([+\-])(\d{3})(\d{2})(\d{2}))\t([^\t]+)(?:\t([^\t]+))?(?:\t([^\t]+))?\z/
+            codes = $1
             
             if $2
               latitude = dms_to_rational($2, $3, $4)
@@ -415,17 +432,25 @@ module TZInfo
             
             file_is_5_column = true if column5
             
-            zone_tab << [code, zone_identifier, latitude, longitude, column4, column5]
+            zone_tab << [codes.split(','), zone_identifier, latitude, longitude, column4, column5]
           end
         end
       end
       
-      zones = {}
+      primary_zones = {}
+      secondary_zones = {}
       
-      zone_tab.each do |code, zone_identifier, latitude, longitude, column4, column5|
+      zone_tab.each do |codes, zone_identifier, latitude, longitude, column4, column5|
         description = file_is_5_column ? column5 : column4
-           
-        (zones[code] ||= []) << CountryTimezone.new(zone_identifier, latitude, longitude, description)
+        country_timezone = CountryTimezone.new(zone_identifier, latitude, longitude, description)
+
+        # codes will always have at least one element
+
+        (primary_zones[codes.first] ||= []) << country_timezone
+
+        codes[1..-1].each do |code|
+          (secondary_zones[code] ||= []) << country_timezone
+        end
       end
       
       countries = {}
@@ -441,7 +466,9 @@ module TZInfo
           if line =~ /\A([A-Z]{2})(?:\t[A-Z]{3}\t[0-9]{3})?\t(.+)\z/
             code = $1
             name = $2
-            countries[code] = ZoneinfoCountryInfo.new(code, name, zones[code] || [])
+            zones = (primary_zones[code] || []) + (secondary_zones[code] || [])
+
+            countries[code] = ZoneinfoCountryInfo.new(code, name, zones)
           end
         end
       end

data/test/tc_data_source.rb

@@ -127,6 +127,20 @@ class TCDataSource < Minitest::Test
       assert_equal(dir, data_source.zoneinfo_dir)      
     end
   end
+
+  def test_set_standard_zoneinfo_search_zone1970
+    Dir.mktmpdir('tzinfo_test_dir') do |dir|
+      FileUtils.touch(File.join(dir, 'iso3166.tab'))
+      FileUtils.touch(File.join(dir, 'zone1970.tab'))
+
+      ZoneinfoDataSource.search_path = [dir]
+
+      DataSource.set(:zoneinfo)
+      data_source = DataSource.get
+      assert_kind_of(ZoneinfoDataSource, data_source)
+      assert_equal(dir, data_source.zoneinfo_dir)
+    end
+  end
   
   def test_set_standard_zoneinfo_explicit
     Dir.mktmpdir('tzinfo_test_dir') do |dir|
@@ -139,6 +153,18 @@ class TCDataSource < Minitest::Test
       assert_equal(dir, data_source.zoneinfo_dir)      
     end
   end
+
+  def test_set_standard_zoneinfo_explicit_zone1970
+    Dir.mktmpdir('tzinfo_test_dir') do |dir|
+      FileUtils.touch(File.join(dir, 'iso3166.tab'))
+      FileUtils.touch(File.join(dir, 'zone.tab'))
+
+      DataSource.set(:zoneinfo, dir)
+      data_source = DataSource.get
+      assert_kind_of(ZoneinfoDataSource, data_source)
+      assert_equal(dir, data_source.zoneinfo_dir)
+    end
+  end
   
   def test_set_standard_zoneinfo_explicit_alternate_iso3166
     Dir.mktmpdir('tzinfo_test_dir') do |dir|

data/test/tc_timezone_melbourne.rb

@@ -4,10 +4,10 @@ include TZInfo
 
 class TCTimezoneMelbourne < Minitest::Test
   def test_2004
-    #Australia/Melbourne  Sat Mar 27 15:59:59 2004 UTC = Sun Mar 28 02:59:59 2004 EST isdst=1 gmtoff=39600
-    #Australia/Melbourne  Sat Mar 27 16:00:00 2004 UTC = Sun Mar 28 02:00:00 2004 EST isdst=0 gmtoff=36000
-    #Australia/Melbourne  Sat Oct 30 15:59:59 2004 UTC = Sun Oct 31 01:59:59 2004 EST isdst=0 gmtoff=36000
-    #Australia/Melbourne  Sat Oct 30 16:00:00 2004 UTC = Sun Oct 31 03:00:00 2004 EST isdst=1 gmtoff=39600
+    #Australia/Melbourne  Sat Mar 27 15:59:59 2004 UTC = Sun Mar 28 02:59:59 2004 AEDT isdst=1 gmtoff=39600
+    #Australia/Melbourne  Sat Mar 27 16:00:00 2004 UTC = Sun Mar 28 02:00:00 2004 AEST isdst=0 gmtoff=36000
+    #Australia/Melbourne  Sat Oct 30 15:59:59 2004 UTC = Sun Oct 31 01:59:59 2004 AEST isdst=0 gmtoff=36000
+    #Australia/Melbourne  Sat Oct 30 16:00:00 2004 UTC = Sun Oct 31 03:00:00 2004 AEDT isdst=1 gmtoff=39600
     
     tz = Timezone.get('Australia/Melbourne')
     assert_equal(DateTime.new(2004,3,28,2,59,59), tz.utc_to_local(DateTime.new(2004,3,27,15,59,59)))
@@ -25,17 +25,17 @@ class TCTimezoneMelbourne < Minitest::Test
     assert_raises(PeriodNotFound) { tz.local_to_utc(DateTime.new(2004,10,31,2,0,0)) }
     assert_raises(AmbiguousTime) { tz.local_to_utc(DateTime.new(2004,3,28,2,0,0)) }
     
-    assert_equal(:EST, tz.period_for_utc(DateTime.new(2004,3,27,15,59,59)).zone_identifier)
-    assert_equal(:EST, tz.period_for_utc(DateTime.new(2004,3,27,16,0,0)).zone_identifier)
-    assert_equal(:EST, tz.period_for_utc(DateTime.new(2004,10,30,15,59,59)).zone_identifier)
-    assert_equal(:EST, tz.period_for_utc(DateTime.new(2004,10,30,16,0,0)).zone_identifier)
+    assert_equal(:AEDT, tz.period_for_utc(DateTime.new(2004,3,27,15,59,59)).zone_identifier)
+    assert_equal(:AEST, tz.period_for_utc(DateTime.new(2004,3,27,16,0,0)).zone_identifier)
+    assert_equal(:AEST, tz.period_for_utc(DateTime.new(2004,10,30,15,59,59)).zone_identifier)
+    assert_equal(:AEDT, tz.period_for_utc(DateTime.new(2004,10,30,16,0,0)).zone_identifier)
     
-    assert_equal(:EST, tz.period_for_local(DateTime.new(2004,3,28,2,59,59), true).zone_identifier)
-    assert_equal(:EST, tz.period_for_local(DateTime.new(2004,3,28,2,59,59), false).zone_identifier)
-    assert_equal(:EST, tz.period_for_local(DateTime.new(2004,3,28,2,0,0), true).zone_identifier)
-    assert_equal(:EST, tz.period_for_local(DateTime.new(2004,3,28,2,0,0), false).zone_identifier)
-    assert_equal(:EST, tz.period_for_local(DateTime.new(2004,10,31,1,59,59)).zone_identifier)
-    assert_equal(:EST, tz.period_for_local(DateTime.new(2004,10,31,3,0,0)).zone_identifier)
+    assert_equal(:AEDT, tz.period_for_local(DateTime.new(2004,3,28,2,59,59), true).zone_identifier)
+    assert_equal(:AEST, tz.period_for_local(DateTime.new(2004,3,28,2,59,59), false).zone_identifier)
+    assert_equal(:AEDT, tz.period_for_local(DateTime.new(2004,3,28,2,0,0), true).zone_identifier)
+    assert_equal(:AEST, tz.period_for_local(DateTime.new(2004,3,28,2,0,0), false).zone_identifier)
+    assert_equal(:AEST, tz.period_for_local(DateTime.new(2004,10,31,1,59,59)).zone_identifier)
+    assert_equal(:AEDT, tz.period_for_local(DateTime.new(2004,10,31,3,0,0)).zone_identifier)
     
     assert_equal(39600, tz.period_for_utc(DateTime.new(2004,3,27,15,59,59)).utc_total_offset)
     assert_equal(36000, tz.period_for_utc(DateTime.new(2004,3,27,16,0,0)).utc_total_offset)
@@ -52,14 +52,14 @@ class TCTimezoneMelbourne < Minitest::Test
     transitions = tz.transitions_up_to(DateTime.new(2005,1,1,0,0,0), DateTime.new(2004,1,1,0,0,0))
     assert_equal(2, transitions.length)
     assert_equal(TimeOrDateTime.new(DateTime.new(2004,3,27,16,0,0)), transitions[0].at)
-    assert_equal(TimezoneOffset.new(36000, 3600, :EST), transitions[0].previous_offset)
-    assert_equal(TimezoneOffset.new(36000, 0, :EST), transitions[0].offset)
+    assert_equal(TimezoneOffset.new(36000, 3600, :AEDT), transitions[0].previous_offset)
+    assert_equal(TimezoneOffset.new(36000, 0, :AEST), transitions[0].offset)
     assert_equal(TimeOrDateTime.new(DateTime.new(2004,10,30,16,0,0)), transitions[1].at)
-    assert_equal(TimezoneOffset.new(36000, 0, :EST), transitions[1].previous_offset)
-    assert_equal(TimezoneOffset.new(36000, 3600, :EST), transitions[1].offset)
+    assert_equal(TimezoneOffset.new(36000, 0, :AEST), transitions[1].previous_offset)
+    assert_equal(TimezoneOffset.new(36000, 3600, :AEDT), transitions[1].offset)
     
     offsets = tz.offsets_up_to(DateTime.new(2005,1,1,0,0,0), DateTime.new(2004,1,1,0,0,0))
-    assert_array_same_items([TimezoneOffset.new(36000, 0, :EST), TimezoneOffset.new(36000, 3600, :EST)], offsets)
+    assert_array_same_items([TimezoneOffset.new(36000, 0, :AEST), TimezoneOffset.new(36000, 3600, :AEDT)], offsets)
   end  
 
   def test_1942
@@ -68,10 +68,10 @@ class TCTimezoneMelbourne < Minitest::Test
     # because it relates to the year 1942.
     
     if !DataSource.get.kind_of?(ZoneinfoDataSource) || RubyCoreSupport.time_supports_negative
-      #Australia/Melbourne  Sat Mar 28 14:59:59 1942 UTC = Sun Mar 29 01:59:59 1942 EST isdst=1 gmtoff=39600
-      #Australia/Melbourne  Sat Mar 28 15:00:00 1942 UTC = Sun Mar 29 01:00:00 1942 EST isdst=0 gmtoff=36000
-      #Australia/Melbourne  Sat Sep 26 15:59:59 1942 UTC = Sun Sep 27 01:59:59 1942 EST isdst=0 gmtoff=36000
-      #Australia/Melbourne  Sat Sep 26 16:00:00 1942 UTC = Sun Sep 27 03:00:00 1942 EST isdst=1 gmtoff=39600
+      #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 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)))
@@ -89,17 +89,17 @@ class TCTimezoneMelbourne < Minitest::Test
       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_equal(:EST, tz.period_for_utc(DateTime.new(1942,3,28,14,59,59)).zone_identifier)
-      assert_equal(:EST, tz.period_for_utc(DateTime.new(1942,3,28,15,0,0)).zone_identifier)
-      assert_equal(:EST, tz.period_for_utc(DateTime.new(1942,9,26,15,59,59)).zone_identifier)
-      assert_equal(:EST, tz.period_for_utc(DateTime.new(1942,9,26,16,0,0)).zone_identifier)
+      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(: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(:EST, tz.period_for_local(DateTime.new(1942,3,29,1,59,59), true).zone_identifier)
-      assert_equal(:EST, tz.period_for_local(DateTime.new(1942,3,29,1,59,59), false).zone_identifier)
-      assert_equal(:EST, tz.period_for_local(DateTime.new(1942,3,29,1,0,0), true).zone_identifier)
-      assert_equal(:EST, tz.period_for_local(DateTime.new(1942,3,29,1,0,0), false).zone_identifier)
-      assert_equal(:EST, tz.period_for_local(DateTime.new(1942,9,27,1,59,59)).zone_identifier)
-      assert_equal(:EST, tz.period_for_local(DateTime.new(1942,9,27,3,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(: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)
@@ -116,20 +116,20 @@ class TCTimezoneMelbourne < Minitest::Test
       transitions = tz.transitions_up_to(DateTime.new(1943,1,1,0,0,0), DateTime.new(1942,1,1,0,0,0))
       assert_equal(2, transitions.length)
       assert_equal(TimeOrDateTime.new(DateTime.new(1942,3,28,15,0,0)), transitions[0].at)
-      assert_equal(TimezoneOffset.new(36000, 3600, :EST), transitions[0].previous_offset)
-      assert_equal(TimezoneOffset.new(36000, 0, :EST), transitions[0].offset)
+      assert_equal(TimezoneOffset.new(36000, 3600, :AEDT), transitions[0].previous_offset)
+      assert_equal(TimezoneOffset.new(36000, 0, :AEST), transitions[0].offset)
       assert_equal(TimeOrDateTime.new(DateTime.new(1942,9,26,16,0,0)), transitions[1].at)
-      assert_equal(TimezoneOffset.new(36000, 0, :EST), transitions[1].previous_offset)
-      assert_equal(TimezoneOffset.new(36000, 3600, :EST), transitions[1].offset)
+      assert_equal(TimezoneOffset.new(36000, 0, :AEST), transitions[1].previous_offset)
+      assert_equal(TimezoneOffset.new(36000, 3600, :AEDT), transitions[1].offset)
       
       offsets = tz.offsets_up_to(DateTime.new(1943,1,1,0,0,0), DateTime.new(1942,1,1,0,0,0))
-      assert_array_same_items([TimezoneOffset.new(36000, 0, :EST), TimezoneOffset.new(36000, 3600, :EST)], offsets)
+      assert_array_same_items([TimezoneOffset.new(36000, 0, :AEST), TimezoneOffset.new(36000, 3600, :AEDT)], offsets)
     end
   end
 
   def test_time_boundary
-    #Australia/Melbourne  Sat Mar 25 15:00:00 1944 UTC = Sun Mar 26 01:00:00 1944 EST isdst=0 gmtoff=36000
-    #Australia/Melbourne  Sat Oct 30 15:59:59 1971 UTC = Sun Oct 31 01:59:59 1971 EST isdst=0 gmtoff=36000
+    #Australia/Melbourne  Sat Mar 25 15:00:00 1944 UTC = Sun Mar 26 01:00:00 1944 AEST isdst=0 gmtoff=36000
+    #Australia/Melbourne  Sat Oct 30 15:59:59 1971 UTC = Sun Oct 31 01:59:59 1971 AEST isdst=0 gmtoff=36000
     
     tz = Timezone.get('Australia/Melbourne')    
     assert_equal(DateTime.new(1970,1,1,10,0,0), tz.utc_to_local(DateTime.new(1970,1,1,0,0,0)))