tzinfo-data 1.2014.5 → 1.2014.6

data/lib/tzinfo/data/indexes/timezones.rb

@@ -15,9 +15,9 @@ module TZInfo
         timezone 'Africa/Algiers'
         timezone 'Africa/Asmara'
         linked_timezone 'Africa/Asmera'
-        timezone 'Africa/Bamako'
+        linked_timezone 'Africa/Bamako'
         timezone 'Africa/Bangui'
-        timezone 'Africa/Banjul'
+        linked_timezone 'Africa/Banjul'
         timezone 'Africa/Bissau'
         timezone 'Africa/Blantyre'
         timezone 'Africa/Brazzaville'
@@ -25,13 +25,13 @@ module TZInfo
         timezone 'Africa/Cairo'
         timezone 'Africa/Casablanca'
         timezone 'Africa/Ceuta'
-        timezone 'Africa/Conakry'
-        timezone 'Africa/Dakar'
+        linked_timezone 'Africa/Conakry'
+        linked_timezone 'Africa/Dakar'
         timezone 'Africa/Dar_es_Salaam'
         timezone 'Africa/Djibouti'
         timezone 'Africa/Douala'
         timezone 'Africa/El_Aaiun'
-        timezone 'Africa/Freetown'
+        linked_timezone 'Africa/Freetown'
         timezone 'Africa/Gaborone'
         timezone 'Africa/Harare'
         timezone 'Africa/Johannesburg'
@@ -42,7 +42,7 @@ module TZInfo
         timezone 'Africa/Kinshasa'
         timezone 'Africa/Lagos'
         timezone 'Africa/Libreville'
-        timezone 'Africa/Lome'
+        linked_timezone 'Africa/Lome'
         timezone 'Africa/Luanda'
         timezone 'Africa/Lubumbashi'
         timezone 'Africa/Lusaka'
@@ -55,10 +55,10 @@ module TZInfo
         timezone 'Africa/Nairobi'
         timezone 'Africa/Ndjamena'
         timezone 'Africa/Niamey'
-        timezone 'Africa/Nouakchott'
-        timezone 'Africa/Ouagadougou'
+        linked_timezone 'Africa/Nouakchott'
+        linked_timezone 'Africa/Ouagadougou'
         timezone 'Africa/Porto-Novo'
-        timezone 'Africa/Sao_Tome'
+        linked_timezone 'Africa/Sao_Tome'
         linked_timezone 'Africa/Timbuktu'
         timezone 'Africa/Tripoli'
         timezone 'Africa/Tunis'
@@ -256,8 +256,9 @@ module TZInfo
         timezone 'Asia/Bishkek'
         timezone 'Asia/Brunei'
         linked_timezone 'Asia/Calcutta'
+        timezone 'Asia/Chita'
         timezone 'Asia/Choibalsan'
-        timezone 'Asia/Chongqing'
+        linked_timezone 'Asia/Chongqing'
         linked_timezone 'Asia/Chungking'
         timezone 'Asia/Colombo'
         linked_timezone 'Asia/Dacca'
@@ -267,7 +268,7 @@ module TZInfo
         timezone 'Asia/Dubai'
         timezone 'Asia/Dushanbe'
         timezone 'Asia/Gaza'
-        timezone 'Asia/Harbin'
+        linked_timezone 'Asia/Harbin'
         timezone 'Asia/Hebron'
         timezone 'Asia/Ho_Chi_Minh'
         timezone 'Asia/Hong_Kong'
@@ -280,7 +281,7 @@ module TZInfo
         timezone 'Asia/Kabul'
         timezone 'Asia/Kamchatka'
         timezone 'Asia/Karachi'
-        timezone 'Asia/Kashgar'
+        linked_timezone 'Asia/Kashgar'
         timezone 'Asia/Kathmandu'
         linked_timezone 'Asia/Katmandu'
         timezone 'Asia/Khandyga'
@@ -313,6 +314,7 @@ module TZInfo
         timezone 'Asia/Seoul'
         timezone 'Asia/Shanghai'
         timezone 'Asia/Singapore'
+        timezone 'Asia/Srednekolymsk'
         timezone 'Asia/Taipei'
         timezone 'Asia/Tashkent'
         timezone 'Asia/Tbilisi'
@@ -341,7 +343,7 @@ module TZInfo
         timezone 'Atlantic/Madeira'
         timezone 'Atlantic/Reykjavik'
         timezone 'Atlantic/South_Georgia'
-        timezone 'Atlantic/St_Helena'
+        linked_timezone 'Atlantic/St_Helena'
         timezone 'Atlantic/Stanley'
         linked_timezone 'Australia/ACT'
         timezone 'Australia/Adelaide'

data/lib/tzinfo/data/tzdataparser.rb

@@ -8,21 +8,16 @@ module TZInfo
     #
     # @private
     module TZDataParserUtils #:nodoc:
-      
-      begin
-        Encoding
-        SUPPORTS_ENCODING = true
-      rescue NameError
-        SUPPORTS_ENCODING = false
-      end
-      
-      if SUPPORTS_ENCODING
+      # Wrapper for File.open that supports passing hash options for specifying
+      # encodings on Ruby 1.9+. The options are ignored on earlier versions of
+      # Ruby.
+      if RUBY_VERSION =~ /\A1\.[0-8]\./
         def open_file(file_name, mode, opts, &block)
-          File.open(file_name, mode, opts, &block)
+          File.open(file_name, mode, &block)
         end
       else
         def open_file(file_name, mode, opts, &block)
-          File.open(file_name, mode, &block)
+          File.open(file_name, mode, opts, &block)
         end
       end
       
@@ -283,13 +278,13 @@ module TZInfo
           end
         end
         
-        # Loads countries from iso3166.tab and zone.tab and stores the result in
-        # the countries instance variable.
+        # Loads countries from iso3166.tab and zone1970.tab and stores the
+        # result in the countries instance variable.
         def load_countries
           puts 'load_countries'
           
-          # Files are in ASCII, but may change to UTF-8 (a superset of ASCII)
-          # in the future.
+          # iso3166.tab is ASCII encoded, but is planned to change to UTF-8 (a
+          # superset of ASCII) in the future.
           open_file(File.join(@input_dir, 'iso3166.tab'), 'r', :external_encoding => 'UTF-8', :internal_encoding => 'UTF-8') do |file|
             file.each_line do |line|
           
@@ -301,21 +296,20 @@ module TZInfo
             end
           end
 
-          # Files are in ASCII, but may change to UTF-8 (a superset of ASCII)
-          # in the future.
-          open_file(File.join(@input_dir, 'zone.tab'), 'r', :external_encoding => 'UTF-8', :internal_encoding => 'UTF-8') do |file|
+          primary_zones = {}
+          secondary_zones = {}
+
+          # zone1970.tab is UTF-8 encoded.
+          open_file(File.join(@input_dir, 'zone1970.tab'), 'r', :external_encoding => 'UTF-8', :internal_encoding => 'UTF-8') do |file|
             file.each_line do |line|
                     
               line.chomp!          
 
-              if line =~ /^([A-Z]{2})\t([^\t]+)\t([^\t]+)(\t(.*))?$/
-                code = $1
+              if line =~ /^([A-Z]{2}(?:,[A-Z]{2})*)\t([^\t]+)\t([^\t]+)(\t(.*))?$/
+                codes = $1
                 location_str = $2
                 zone_name = $3
                 description = $5
-
-                country = @countries[code]
-                raise "Country not found: #{code}" if country.nil?
                 
                 location = TZDataLocation.new(location_str)
                 
@@ -324,7 +318,26 @@ module TZInfo
                 
                 description = nil if description == ''
                 
-                country.add_zone(TZDataCountryTimezone.new(zone, description, location))
+                country_timezone = TZDataCountryTimezone.new(zone, description, location)
+
+                codes = codes.split(',')
+
+                (primary_zones[codes.first] ||= []) << country_timezone
+
+                codes[1..-1].each do |code|
+                  (secondary_zones[code] ||= []) << country_timezone
+                end
+              end
+            end
+          end
+
+          [primary_zones, secondary_zones].each do |zones|
+            zones.each_pair do |code, country_timezones|
+              country = @countries[code]
+              raise "Country not found: #{code}" if country.nil?
+
+              country_timezones.each do |country_timezone|
+                country.add_zone(country_timezone)
               end
             end
           end
@@ -563,19 +576,17 @@ module TZInfo
         FileUtils.mkdir_p(dir)
         
         open_file(File.join(output_dir, 'definitions', @name_elements.join(File::SEPARATOR)) + '.rb', 'w', :external_encoding => 'UTF-8', :universal_newline => true) do |file|
+
+          file.instance_variable_set(:@tz_indent, 0)
           
           def file.indent(by)
-            if @tz_indent
-              @tz_indent += by
-            else
-              @tz_indent = by
-            end
+            @tz_indent += by
           end
           
           def file.puts(s)
-            super("#{' ' * (@tz_indent || 0)}#{s}")
+            super("#{' ' * @tz_indent}#{s}")
           end
-          
+
           file.puts('# encoding: UTF-8')
           file.puts('')
           file.puts('# This file contains data derived from the IANA Time Zone Database')
@@ -1072,7 +1083,7 @@ module TZInfo
       attr_reader :operator
       
       def initialize(spec)
-        raise "Invalid on: #{spec}" if spec !~ /^([0-9]+)|(last([A-z]+))|(([A-z]+)([<>]=)([0-9]+))$/
+        raise "Invalid on: #{spec}" if spec !~ /^([0-9]+)|(last([A-Za-z]+))|(([A-Za-z]+)([<>]=)([0-9]+))$/
         
         if $1
           @type = :absolute
@@ -1181,7 +1192,7 @@ module TZInfo
     # @private
     class TZDataFormat #:nodoc:        
       def initialize(spec)
-        if spec =~ /([A-z]+)\/([A-z]+)/
+        if spec =~ /([A-Z]+)\/([A-Z]+)/i
           @type = :alternate
           @standard_abbrev = $1
           @daylight_abbrev = $2

data/lib/tzinfo/data/version.rb

@@ -8,7 +8,7 @@ module TZInfo
       
       # The version of the {IANA Time Zone Database}[http://www.iana.org/time-zones]
       # used to generate this version of TZInfo::Data.
-      TZDATA = '2014e'
+      TZDATA = '2014f'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tzinfo-data
 version: !ruby/object:Gem::Version
-  version: 1.2014.5
+  version: 1.2014.6
 platform: ruby
 authors:
 - Philip Ross
@@ -30,7 +30,7 @@ cert_chain:
   fs7XSYlwQp0zY7PFSMwJeBpQFDBnShcweRQ+0QdUUS4FHrwfXex0QsXp9UROUX+4
   6BVw9ZDNFnDH4PQjZGbdwanB7kzm+TEi
   -----END CERTIFICATE-----
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -306,6 +306,7 @@ files:
 - lib/tzinfo/data/definitions/Asia/Bishkek.rb
 - lib/tzinfo/data/definitions/Asia/Brunei.rb
 - lib/tzinfo/data/definitions/Asia/Calcutta.rb
+- lib/tzinfo/data/definitions/Asia/Chita.rb
 - lib/tzinfo/data/definitions/Asia/Choibalsan.rb
 - lib/tzinfo/data/definitions/Asia/Chongqing.rb
 - lib/tzinfo/data/definitions/Asia/Chungking.rb
@@ -363,6 +364,7 @@ files:
 - lib/tzinfo/data/definitions/Asia/Seoul.rb
 - lib/tzinfo/data/definitions/Asia/Shanghai.rb
 - lib/tzinfo/data/definitions/Asia/Singapore.rb
+- lib/tzinfo/data/definitions/Asia/Srednekolymsk.rb
 - lib/tzinfo/data/definitions/Asia/Taipei.rb
 - lib/tzinfo/data/definitions/Asia/Tashkent.rb
 - lib/tzinfo/data/definitions/Asia/Tbilisi.rb