tzinfo 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e48380a40bf9c0b26cf7b925cbe0eef6d198130c
-  data.tar.gz: d2fbd737fd05d0e56d8835ab85f1de51338971a6
+  metadata.gz: 50a3eb0b5e727ec5ef5cfc93577f18fa28924512
+  data.tar.gz: 8de5a649d264b57190e65f2ba9728a123f7a5167
 SHA512:
-  metadata.gz: 2a631f6a845f0547389417def1880190f16d7d761d75dcbf940c9c15cc96b884f3f30f5afce7ac76ac64361ae020158615096fa7e48897e2b635e5249827be8a
-  data.tar.gz: e06467b2b159ce423db5d2ef55c5eab9f2ee3c7f912b58268ea160d1047da576af46613378aa6a2b7d579ca6a4365edb036597f7fa9e85a5261e4768578862c5
+  metadata.gz: 602840d66f927274773a40f22e1807e4280fee76b7b5098db8e739b0041b7a26af9f225f8c4e591f5b2f5baac5a3c0a597204f195edfd6805beca17e606ab4de
+  data.tar.gz: 0b53e4209bfde4cfd326e8b22ebe5750e6e293f486c4420ff517eff9015f2329340de343ad7d489d32df4c96e1eab9f988a056c3b323bcda73d3978c84d2dcc3

data/CHANGES.md

@@ -1,3 +1,13 @@
+Version 1.2.1 - 1-Jun-2014
+--------------------------
+
+* Support zoneinfo files generated with zic version 2014c and later.
+* On platforms that only support positive 32-bit timestamps, ensure that
+  conversions are accurate from the epoch instead of just from the first
+  transition after the epoch.
+* Minor documentation improvements.
+
+
 Version 1.2.0 - 26-May-2014
 ---------------------------
 

data/lib/tzinfo/country_info.rb

@@ -22,7 +22,7 @@ module TZInfo
     # Returns a frozen array of all the zone identifiers for the country.
     # The identifiers are ordered by importance according to the DataSource.
     def zone_identifiers
-      raise NotImplementedError, 'Subclasses must override zone_identifiers'
+      raise_not_implemented('zone_identifiers')
     end
     
     # Returns a frozen array of all the timezones for the for the country as
@@ -30,7 +30,13 @@ module TZInfo
     #
     # The timezones are ordered by importance according to the DataSource.
     def zones
-      raise NotImplementedError, 'Subclasses must override zone_identifiers'
+      raise_not_implemented('zones')
+    end
+
+    private
+
+    def raise_not_implemented(method_name)
+      raise NotImplementedError, "Subclasses must override #{method_name}"
     end
   end
 end

data/lib/tzinfo/data_source.rb

@@ -118,37 +118,37 @@ module TZInfo
     # Raises InvalidTimezoneIdentifier if the timezone is not found or the 
     # identifier is invalid.
     def load_timezone_info(identifier)
-      raise InvalidDataSource, 'load_timezone_info not defined'
+      raise_invalid_data_source('load_timezone_info')
     end
     
     # Returns an array of all the available timezone identifiers.
     def timezone_identifiers
-      raise InvalidDataSource, 'timezone_identifiers not defined'
+      raise_invalid_data_source('timezone_identifiers')
     end
     
     # Returns an array of all the available timezone identifiers for
     # data timezones (i.e. those that actually contain definitions).
     def data_timezone_identifiers
-      raise InvalidDataSource, 'data_timezone_identifiers not defined'
+      raise_invalid_data_source('data_timezone_identifiers')
     end
     
     # Returns an array of all the available timezone identifiers that
     # are links to other timezones.
     def linked_timezone_identifiers
-      raise InvalidDataSource, 'linked_timezone_identifiers not defined'
+      raise_invalid_data_source('linked_timezone_identifiers')
     end
     
     # Returns a CountryInfo instance for the given ISO 3166-1 alpha-2
     # country code. Raises InvalidCountryCode if the country could not be found
     # or the code is invalid.
     def load_country_info(code)
-      raise InvalidDataSource, 'load_country_info not defined'
+      raise_invalid_data_source('load_country_info')
     end
     
     # Returns an array of all the available ISO 3166-1 alpha-2
     # country codes.
     def country_codes
-      raise InvalidDataSource, 'country_codes not defined'
+      raise_invalid_data_source('country_codes')
     end
     
     # Returns the name of this DataSource.
@@ -182,5 +182,9 @@ module TZInfo
         raise DataSourceNotFound, "No source of timezone data could be found.\nPlease refer to http://tzinfo.github.io/datasourcenotfound for help resolving this error."
       end
     end
+
+    def raise_invalid_data_source(method_name)
+      raise InvalidDataSource, "#{method_name} not defined"
+    end
   end
 end

data/lib/tzinfo/data_timezone_info.rb

@@ -4,14 +4,14 @@ module TZInfo
   
     # Returns the TimezonePeriod for the given UTC time.
     def period_for_utc(utc)
-      raise NotImplementedError, 'Subclasses must override period_for_utc'
+      raise_not_implemented('period_for_utc')
     end
     
     # Returns the set of TimezonePeriods for the given local time as an array.    
     # Results returned are ordered by increasing UTC start date.
     # Returns an empty array if no periods are found for the given time.
     def periods_for_local(local)
-      raise NotImplementedError, 'Subclasses must override periods_for_local'
+      raise_not_implemented('periods_for_local')
     end
     
     # Returns an Array of TimezoneTransition instances representing the times
@@ -37,7 +37,7 @@ module TZInfo
     # If utc_from is specified and utc_to is not greater than utc_from, then
     # transitions_up_to raises an ArgumentError exception.
     def transitions_up_to(utc_to, utc_from = nil)
-      raise NotImplementedError, 'Subclasses must override transitions_up_to'
+      raise_not_implemented('transitions_up_to')
     end
     
     # Constructs a Timezone instance for the timezone represented by this
@@ -45,5 +45,11 @@ module TZInfo
     def create_timezone
       DataTimezone.new(self)
     end
+
+    private
+
+    def raise_not_implemented(method_name)
+      raise NotImplementedError, "Subclasses must override #{method_name}"
+    end
   end
 end

data/lib/tzinfo/ruby_data_source.rb

@@ -69,7 +69,7 @@ module TZInfo
     def load_country_info(code)
       load_country_index
       info = Data::Indexes::Countries.countries[code]
-      raise InvalidCountryCode.new, 'Invalid country code' unless info
+      raise InvalidCountryCode, 'Invalid country code' unless info
       info
     end
     

data/lib/tzinfo/timezone.rb

@@ -199,7 +199,7 @@ module TZInfo
     
     # The identifier of the timezone, e.g. "Europe/Paris".
     def identifier
-      raise UnknownTimezone, 'TZInfo::Timezone constructed directly'
+      raise_unknown_timezone
     end
     
     # An alias for identifier.
@@ -268,7 +268,7 @@ module TZInfo
     # a DateTime, Time or integer timestamp (Time.to_i). Any timezone 
     # information in utc is ignored (it is treated as a UTC time).        
     def period_for_utc(utc)            
-      raise UnknownTimezone, 'TZInfo::Timezone constructed directly'      
+      raise_unknown_timezone
     end
     
     # Returns the set of TimezonePeriod instances that are valid for the given
@@ -276,7 +276,7 @@ module TZInfo
     # period_for_local instead and specify how ambiguities should be resolved.
     # Returns an empty array if no periods are found for the given time.
     def periods_for_local(local)
-      raise UnknownTimezone, 'TZInfo::Timezone constructed directly'
+      raise_unknown_timezone
     end
     
     # Returns an Array of TimezoneTransition instances representing the times
@@ -302,7 +302,7 @@ module TZInfo
     # If utc_from is specified and utc_to is not greater than utc_from, then
     # transitions_up_to raises an ArgumentError exception.
     def transitions_up_to(utc_to, utc_from = nil)
-      raise UnknownTimezone, 'TZInfo::Timezone constructed directly'
+      raise_unknown_timezone
     end
     
     # Returns the canonical Timezone instance for this Timezone.
@@ -341,7 +341,7 @@ module TZInfo
     # The TZInfo::DataSource.get method can be used to check which DataSource 
     # implementation is being used.
     def canonical_zone
-      raise UnknownTimezone, 'TZInfo::Timezone constructed directly'
+      raise_unknown_timezone
     end
     
     # Returns the TimezonePeriod for the given local time. local can either be
@@ -628,5 +628,9 @@ module TZInfo
       def self.data_source
         DataSource.get
       end
+
+      def raise_unknown_timezone
+        raise UnknownTimezone, 'TZInfo::Timezone constructed directly'
+      end
   end        
 end

data/lib/tzinfo/timezone_info.rb

@@ -18,7 +18,13 @@ module TZInfo
     # Constructs a Timezone instance for the timezone represented by this
     # TimezoneInfo.
     def create_timezone
-      raise NotImplementedError, 'Subclasses must override create_timezone'
+      raise_not_implemented('create_timezone')
+    end
+
+    private
+
+    def raise_not_implemented(method_name)
+      raise NotImplementedError, "Subclasses must override #{method_name}"
     end
   end
 end

data/lib/tzinfo/timezone_transition.rb

@@ -21,7 +21,7 @@ module TZInfo
     # A TimeOrDateTime instance representing the UTC time when this transition
     # occurs.
     def at
-      raise NotImplementedError, 'Subclasses must override at'
+      raise_not_implemented('at')
     end
     
     # The UTC time when this transition occurs, returned as a DateTime instance.
@@ -110,5 +110,11 @@ module TZInfo
     def inspect
       "#<#{self.class}: #{at.inspect},#{@offset.inspect}>"      
     end
+
+    private
+
+    def raise_not_implemented(method_name)
+      raise NotImplementedError, "Subclasses must override #{method_name}"
+    end
   end
 end

data/lib/tzinfo/zoneinfo_data_source.rb

@@ -240,7 +240,7 @@ module TZInfo
     # or the code is invalid.
     def load_country_info(code)
       info = @country_index[code]
-      raise InvalidCountryCode.new, 'Invalid country code' unless info
+      raise InvalidCountryCode, 'Invalid country code' unless info
       info
     end
     

data/lib/tzinfo/zoneinfo_timezone_info.rb

@@ -4,11 +4,21 @@ module TZInfo
   class InvalidZoneinfoFile < StandardError
   end
 
-  # Represents a timezone defined by a compiled zoneinfo TZif (\0 or 2) file.
+  # Represents a timezone defined by a compiled zoneinfo TZif (\0, 2 or 3) file.
   #
   # @private
   class ZoneinfoTimezoneInfo < TransitionDataTimezoneInfo #:nodoc:
     
+    # Minimum supported timestamp (inclusive).
+    #
+    # Time.utc(1700, 1, 1).to_i
+    MIN_TIMESTAMP = -8520336000
+
+    # Maximum supported timestamp (exclusive).
+    #
+    # Time.utc(2500, 1, 1).to_i
+    MAX_TIMESTAMP = 16725225600
+
     # Constructs the new ZoneinfoTimezoneInfo with an identifier and path
     # to the file.
     def initialize(identifier, file_path)
@@ -30,7 +40,7 @@ module TZInfo
       # (most significant first). Translate to signed 64-bit
       def make_signed_int64(high, low)
         unsigned = (high << 32) | low
-        unsigned > 0x8000000000000000 ? unsigned - 0x10000000000000000 : unsigned
+        unsigned >= 0x8000000000000000 ? unsigned - 0x10000000000000000 : unsigned
       end
       
       # Read bytes from file and check that the correct number of bytes could
@@ -92,7 +102,7 @@ module TZInfo
 
         if (version == '2' || version == '3') && RubyCoreSupport.time_supports_64bit
           # Skip the first 32-bit section and read the header of the second 64-bit section
-          check_read(file, timecnt * 5 + typecnt * 6 + charcnt + leapcnt * 8 + ttisgmtcnt + ttisstdcnt)
+          file.seek(timecnt * 5 + typecnt * 6 + charcnt + leapcnt * 8 + ttisgmtcnt + ttisstdcnt, IO::SEEK_CUR)
           
           prev_version = version
           
@@ -194,15 +204,38 @@ module TZInfo
           offset first, offsets[first][:utc_offset], offsets[first][:std_offset], offsets[first][:abbr].untaint.to_sym
         end
         
-        
-        
         offsets.each_with_index do |o, i|
           offset i, o[:utc_offset], o[:std_offset], o[:abbr].untaint.to_sym unless i == first
         end
+
+        if !using_64bit && !RubyCoreSupport.time_supports_negative
+          # Filter out transitions that are not supported by Time on this
+          # platform.
+
+          # Move the last transition before the epoch up to the epoch. This
+          # allows for accurate conversions for all supported timestamps on the
+          # platform.
+
+          before_epoch, after_epoch = transitions.partition {|t| t[:at] < 0}
+
+          if before_epoch.length > 0 && after_epoch.length > 0 && after_epoch.first[:at] != 0
+            last_before = before_epoch.last
+            last_before[:at] = 0
+            transitions = [last_before] + after_epoch
+          else
+            transitions = after_epoch
+          end
+        end
         
+        # Ignore transitions that occur outside of a defined window. The
+        # transition index cannot handle a large range of transition times.
+        #
+        # This is primarily intended to ignore the far in the past transition
+        # added in zic 2014c (at timestamp -2**63 in zic 2014c and at the
+        # approximate time of the big bang from zic 2014d).
         transitions.each do |t|
           at = t[:at]
-          if using_64bit || at > 0 || RubyCoreSupport.time_supports_negative
+          if at >= MIN_TIMESTAMP && at < MAX_TIMESTAMP
             time = Time.at(at).utc
             transition time.year, time.mon, t[:offset], at
           end

data/test/tc_timezone_london.rb

@@ -129,22 +129,15 @@ class TCTimezoneLondon < Minitest::Test
   end 
   
   def test_time_boundary
-    # This test cannot be run when using ZoneinfoDataSource on platforms
-    # that don't support Times before the epoch (i.e. Ruby < 1.9 on Windows) 
-    # because it relates to the period following the transition prior to the
-    # epoch.
+    #Europe/London  Sat Oct 26 23:00:00 1968 UTC = Sun Oct 27 00:00:00 1968 GMT isdst=0 gmtoff=3600
+    #Europe/London  Sun Oct 31 01:59:59 1971 UTC = Sun Oct 31 02:59:59 1971 GMT isdst=0 gmtoff=3600
     
-    if !DataSource.get.kind_of?(ZoneinfoDataSource) || RubyCoreSupport.time_supports_negative
-      #Europe/London  Sat Oct 26 23:00:00 1968 UTC = Sun Oct 27 00:00:00 1968 GMT isdst=0 gmtoff=3600
-      #Europe/London  Sun Oct 31 01:59:59 1971 UTC = Sun Oct 31 02:59:59 1971 GMT isdst=0 gmtoff=3600
-      
-      tz = Timezone.get('Europe/London')    
-      assert_equal(DateTime.new(1970,1,1,1,0,0), tz.utc_to_local(DateTime.new(1970,1,1,0,0,0)))
-      assert_equal(DateTime.new(1970,1,1,0,0,0), tz.local_to_utc(DateTime.new(1970,1,1,1,0,0)))
-      assert_equal(Time.utc(1970,1,1,1,0,0), tz.utc_to_local(Time.utc(1970,1,1,0,0,0)))
-      assert_equal(Time.utc(1970,1,1,0,0,0), tz.local_to_utc(Time.utc(1970,1,1,1,0,0)))
-      assert_equal(3600, tz.utc_to_local(0))
-      assert_equal(0, tz.local_to_utc(3600))
-    end
+    tz = Timezone.get('Europe/London')
+    assert_equal(DateTime.new(1970,1,1,1,0,0), tz.utc_to_local(DateTime.new(1970,1,1,0,0,0)))
+    assert_equal(DateTime.new(1970,1,1,0,0,0), tz.local_to_utc(DateTime.new(1970,1,1,1,0,0)))
+    assert_equal(Time.utc(1970,1,1,1,0,0), tz.utc_to_local(Time.utc(1970,1,1,0,0,0)))
+    assert_equal(Time.utc(1970,1,1,0,0,0), tz.local_to_utc(Time.utc(1970,1,1,1,0,0)))
+    assert_equal(3600, tz.utc_to_local(0))
+    assert_equal(0, tz.local_to_utc(3600))
   end
 end

data/test/tc_zoneinfo_timezone_info.rb

@@ -15,11 +15,19 @@ class TCZoneinfoTimezoneInfo < Minitest::Test
     SUPPORTS_64BIT = false
   end
 
+  begin
+    Time.at(-1)
+    Time.at(-2147483648)
+    SUPPORTS_NEGATIVE = true
+  rescue ArgumentError
+    SUPPORTS_NEGATIVE = false
+  end
+
   def assert_period(abbreviation, utc_offset, std_offset, dst, start_at, end_at, info)    
     if start_at
       period = info.period_for_utc(start_at)
     elsif end_at
-      period = info.period_for_utc(end_at - 1)
+      period = info.period_for_utc(TimeOrDateTime.wrap(end_at).add_with_convert(-1).to_orig)
     else
       # no transitions, pick the epoch
       period = info.period_for_utc(Time.utc(1970, 1, 1))
@@ -386,16 +394,11 @@ class TCZoneinfoTimezoneInfo < Minitest::Test
   end
   
   def test_load_before_epoch
-    # Some platforms don't support negative numbers for times before the epoch.
-    # Check that they are returned when supported and skipped when not.
-      
-    begin
-      Time.at(-1)
-      Time.at(-2147483648)
-      supports_negative = true
-    rescue ArgumentError
-      supports_negative = false
-    end
+    # Some platforms don't support negative timestamps for times before the
+    # epoch. Check that they are returned when supported and skipped when not.
+
+    # Note the last transition before the epoch (and within the 32-bit range) is
+    # moved to the epoch on platforms that do not support negative timestamps.
   
     offsets = [
       {:gmtoff => 3542, :isdst => false, :abbrev => 'LMT'},
@@ -413,12 +416,13 @@ class TCZoneinfoTimezoneInfo < Minitest::Test
       info = ZoneinfoTimezoneInfo.new('Zone/Negative', path)
       assert_equal('Zone/Negative', info.identifier)
       
-      if supports_negative
+      if SUPPORTS_NEGATIVE
         assert_period(:LMT,  3542,    0, false,                    nil, Time.utc(1948,  1,  2), info)
         assert_period(:XST,  3600,    0, false, Time.utc(1948,  1,  2), Time.utc(1969,  4, 22), info)
         assert_period(:XDT,  3600, 3600,  true, Time.utc(1969,  4, 22), Time.utc(1970, 10, 21), info)
       else
-        assert_period(:LMT,  3542,    0, false,                    nil, Time.utc(1970, 10, 21), info)
+        assert_period(:LMT,  3542,    0, false,                    nil, Time.utc(1970,  1,  1), info)
+        assert_period(:XDT,  3600, 3600,  true, Time.utc(1970,  1,  1), Time.utc(1970, 10, 21), info)
       end
       
       assert_period(:XST,  3600,    0, false, Time.utc(1970, 10, 21), Time.utc(2000, 12, 31), info)
@@ -426,9 +430,39 @@ class TCZoneinfoTimezoneInfo < Minitest::Test
     end
   end
 
+  def test_load_on_epoch
+    offsets = [
+      {:gmtoff => 3542, :isdst => false, :abbrev => 'LMT'},
+      {:gmtoff => 3600, :isdst => false, :abbrev => 'XST'},
+      {:gmtoff => 7200, :isdst => true,  :abbrev => 'XDT'},
+      {:gmtoff =>    0, :isdst => false, :abbrev => 'XNST'}]
+
+    transitions = [
+      {:at =>             -694224000, :offset_index => 1}, # Time.utc(1948,  1,  2)
+      {:at =>              -21945600, :offset_index => 2}, # Time.utc(1969,  4, 22)
+      {:at => Time.utc(1970,  1,  1), :offset_index => 1},
+      {:at => Time.utc(2000, 12, 31), :offset_index => 3}]
+
+    tzif_test(offsets, transitions) do |path, format|
+      info = ZoneinfoTimezoneInfo.new('Zone/Negative', path)
+      assert_equal('Zone/Negative', info.identifier)
+
+      if SUPPORTS_NEGATIVE
+        assert_period(:LMT,  3542,    0, false,                    nil, Time.utc(1948,  1,  2), info)
+        assert_period(:XST,  3600,    0, false, Time.utc(1948,  1,  2), Time.utc(1969,  4, 22), info)
+        assert_period(:XDT,  3600, 3600,  true, Time.utc(1969,  4, 22), Time.utc(1970,  1,  1), info)
+      else
+        assert_period(:LMT,  3542,    0, false,                    nil, Time.utc(1970,  1,  1), info)
+      end
+
+      assert_period(:XST,  3600,    0, false, Time.utc(1970,  1,  1), Time.utc(2000, 12, 31), info)
+      assert_period(:XNST,    0,    0, false, Time.utc(2000, 12, 31),                    nil, info)
+    end
+  end
+
   def test_load_64bit
     # Some platforms support 64-bit Times, others only 32-bit. The TZif version
-    # 2 and later format contains both 32-bit and 64-bit times. 
+    # 2 and later format contains both 32-bit and 64-bit times.
     
     # Where 64-bit is supported and a TZif 2 or later file is provided, the 
     # 64-bit times should be used, otherwise the 32-bit information should be 
@@ -464,6 +498,104 @@ class TCZoneinfoTimezoneInfo < Minitest::Test
     end
   end
   
+  def test_load_64bit_range
+    # The full range of 64 bit timestamps is not currently supported because of
+    # the way transitions are indexed. Transitions outside the supported range
+    # will be ignored.
+
+    offsets = [
+      {:gmtoff => 3542, :isdst => false, :abbrev => 'LMT'},
+      {:gmtoff => 3600, :isdst => false, :abbrev => 'XST'},
+      {:gmtoff => 7200, :isdst => false, :abbrev => 'XNST'}]
+
+    transitions = [
+      {:at => -2**63,                :offset_index => 1},
+      {:at => Time.utc(2014, 5, 27), :offset_index => 2},
+      {:at => 2**63 - 1,             :offset_index => 0}]
+
+    tzif_test(offsets, transitions) do |path, format|
+      info = ZoneinfoTimezoneInfo.new('Zone/SixtyFourRange', path)
+      assert_equal('Zone/SixtyFourRange', info.identifier)
+
+      if SUPPORTS_64BIT && format >= 2
+        # When the full range is supported, the following periods will be defined:
+        #assert_period(:LMT,  3542, 0, false, nil,                    Time.at(-2**63).utc,    info)
+        #assert_period(:XST,  3600, 0, false, Time.at(-2**63).utc,    Time.utc(2014, 5, 27),  info)
+        #assert_period(:XNST, 7200, 0, false, Time.utc(2014, 5, 27),  Time.at(2**63 - 1).utc, info)
+        #assert_period(:LMT,  3542, 0, false, Time.at(2**63 - 1).utc, nil,                    info)
+
+        # Without full range support, the following periods will be defined:
+        assert_period(:LMT,  3542, 0, false, nil,                   Time.utc(2014, 5, 27), info)
+        assert_period(:XNST, 7200, 0, false, Time.utc(2014, 5, 27), nil,                   info)
+      else
+        assert_period(:LMT,  3542, 0, false, nil,                   Time.utc(2014, 5, 27), info)
+        assert_period(:XNST, 7200, 0, false, Time.utc(2014, 5, 27), nil,                   info)
+      end
+    end
+  end
+
+  def test_load_supported_64bit_range
+    # The full range of 64 bit timestamps is not currently supported because of
+    # the way transitions are indexed. Transitions outside the supported range
+    # will be ignored.
+
+    min_timestamp = -8520336000 # Time.utc(1700, 1, 1).to_i
+    max_timestamp = 16725225600 # Time.utc(2500, 1, 1).to_i
+
+    offsets = [
+      {:gmtoff => 3542, :isdst => false, :abbrev => 'LMT'},
+      {:gmtoff => 3600, :isdst => false, :abbrev => 'XST'},
+      {:gmtoff => 7200, :isdst => false, :abbrev => 'XNST'}]
+
+    transitions = [
+      {:at => min_timestamp,         :offset_index => 1},
+      {:at => Time.utc(2014, 5, 27), :offset_index => 2},
+      {:at => max_timestamp - 1,     :offset_index => 0}]
+
+    tzif_test(offsets, transitions) do |path, format|
+      info = ZoneinfoTimezoneInfo.new('Zone/SupportedSixtyFourRange', path)
+      assert_equal('Zone/SupportedSixtyFourRange', info.identifier)
+
+      if SUPPORTS_64BIT && format >= 2
+        assert_period(:LMT,  3542, 0, false, nil,                            Time.at(min_timestamp).utc,     info)
+        assert_period(:XST,  3600, 0, false, Time.at(min_timestamp).utc,     Time.utc(2014, 5, 27),          info)
+        assert_period(:XNST, 7200, 0, false, Time.utc(2014, 5, 27),          Time.at(max_timestamp - 1).utc, info)
+        assert_period(:LMT,  3542, 0, false, Time.at(max_timestamp - 1).utc, nil,                            info)
+      else
+        assert_period(:LMT,  3542, 0, false, nil,                   Time.utc(2014, 5, 27), info)
+        assert_period(:XNST, 7200, 0, false, Time.utc(2014, 5, 27), nil,                   info)
+      end
+    end
+  end
+
+  def test_load_32bit_range
+    offsets = [
+      {:gmtoff => 3542, :isdst => false, :abbrev => 'LMT'},
+      {:gmtoff => 3600, :isdst => false, :abbrev => 'XST'},
+      {:gmtoff => 7200, :isdst => false, :abbrev => 'XNST'}]
+
+    transitions = [
+      {:at => -2**31,                :offset_index => 1},
+      {:at => Time.utc(2014, 5, 27), :offset_index => 2},
+      {:at => 2**31 - 1,             :offset_index => 0}]
+
+    tzif_test(offsets, transitions) do |path, format|
+      info = ZoneinfoTimezoneInfo.new('Zone/ThirtyTwoRange', path)
+      assert_equal('Zone/ThirtyTwoRange', info.identifier)
+
+      if SUPPORTS_NEGATIVE
+        assert_period(:LMT,  3542, 0, false, nil,                    Time.at(-2**31).utc,    info)
+        assert_period(:XST,  3600, 0, false, Time.at(-2**31).utc,    Time.utc(2014, 5, 27),  info)
+        assert_period(:XNST, 7200, 0, false, Time.utc(2014, 5, 27),  Time.at(2**31 - 1).utc, info)
+        assert_period(:LMT,  3542, 0, false, Time.at(2**31 - 1).utc, nil,                    info)
+      else
+        assert_period(:XST,  3600, 0, false, Time.utc(1970, 1, 1),   Time.utc(2014, 5, 27),  info)
+        assert_period(:XNST, 7200, 0, false, Time.utc(2014, 5, 27),  Time.at(2**31 - 1).utc, info)
+        assert_period(:LMT,  3542, 0, false, Time.at(2**31 - 1).utc, nil,                    info)
+      end
+    end
+  end
+
   def test_load_std_offset_changes
     # The zoneinfo files don't include the offset from standard time, so this
     # has to be derived by looking at changes in the total UTC offset.

data/test/tzinfo-data/tzinfo/data.rb

@@ -1 +1,8 @@
+# Top level module for TZInfo.
+module TZInfo
+  # Top level module for TZInfo::Data.
+  module Data
+  end
+end
+
 require 'tzinfo/data/version'

data/test/tzinfo-data/tzinfo/data/definitions/America/New_York.rb

@@ -305,6 +305,8 @@ module TZInfo
             tz.transition 2062, 11, :o1, 2929932000, 9897995, 4
             tz.transition 2063, 3, :o2, 2940822000, 59390995, 24
             tz.transition 2063, 11, :o1, 2961381600, 9899451, 4
+            tz.transition 2064, 3, :o2, 2972271600, 59399731, 24
+            tz.transition 2064, 11, :o1, 2992831200, 9900907, 4
           end
         end
       end

data/test/tzinfo-data/tzinfo/data/definitions/Australia/Melbourne.rb

@@ -208,6 +208,8 @@ module TZInfo
             tz.transition 2062, 4, :o1, 2911132800, 14845687, 6
             tz.transition 2062, 9, :o2, 2926857600, 14846779, 6
             tz.transition 2063, 3, :o1, 2942582400, 14847871, 6
+            tz.transition 2063, 10, :o2, 2958912000, 14849005, 6
+            tz.transition 2064, 4, :o1, 2974636800, 14850097, 6
           end
         end
       end

data/test/tzinfo-data/tzinfo/data/definitions/Europe/Amsterdam.rb

@@ -251,6 +251,8 @@ module TZInfo
             tz.transition 2062, 10, :o6, 2929309200, 59387797, 24
             tz.transition 2063, 3, :o5, 2942010000, 59391325, 24
             tz.transition 2063, 10, :o6, 2960758800, 59396533, 24
+            tz.transition 2064, 3, :o5, 2974064400, 59400229, 24
+            tz.transition 2064, 10, :o6, 2992208400, 59405269, 24
           end
         end
       end

data/test/tzinfo-data/tzinfo/data/definitions/Europe/Andorra.rb

@@ -176,6 +176,8 @@ module TZInfo
             tz.transition 2062, 10, :o2, 2929309200, 59387797, 24
             tz.transition 2063, 3, :o3, 2942010000, 59391325, 24
             tz.transition 2063, 10, :o2, 2960758800, 59396533, 24
+            tz.transition 2064, 3, :o3, 2974064400, 59400229, 24
+            tz.transition 2064, 10, :o2, 2992208400, 59405269, 24
           end
         end
       end

data/test/tzinfo-data/tzinfo/data/definitions/Europe/London.rb

@@ -311,6 +311,8 @@ module TZInfo
             tz.transition 2062, 10, :o1, 2929309200, 59387797, 24
             tz.transition 2063, 3, :o2, 2942010000, 59391325, 24
             tz.transition 2063, 10, :o1, 2960758800, 59396533, 24
+            tz.transition 2064, 3, :o2, 2974064400, 59400229, 24
+            tz.transition 2064, 10, :o1, 2992208400, 59405269, 24
           end
         end
       end

data/test/tzinfo-data/tzinfo/data/definitions/Europe/Paris.rb

@@ -255,6 +255,8 @@ module TZInfo
             tz.transition 2062, 10, :o5, 2929309200, 59387797, 24
             tz.transition 2063, 3, :o4, 2942010000, 59391325, 24
             tz.transition 2063, 10, :o5, 2960758800, 59396533, 24
+            tz.transition 2064, 3, :o4, 2974064400, 59400229, 24
+            tz.transition 2064, 10, :o5, 2992208400, 59405269, 24
           end
         end
       end

data/test/tzinfo-data/tzinfo/data/definitions/Europe/Prague.rb

@@ -210,6 +210,8 @@ module TZInfo
             tz.transition 2062, 10, :o2, 2929309200, 59387797, 24
             tz.transition 2063, 3, :o3, 2942010000, 59391325, 24
             tz.transition 2063, 10, :o2, 2960758800, 59396533, 24
+            tz.transition 2064, 3, :o3, 2974064400, 59400229, 24
+            tz.transition 2064, 10, :o2, 2992208400, 59405269, 24
           end
         end
       end

data/test/tzinfo-data/tzinfo/data/indexes/countries.rb

@@ -34,8 +34,7 @@ module TZInfo
           c.timezone 'Africa/Luanda', -44, 5, 397, 30
         end
         country 'AQ', 'Antarctica' do |c|
-          c.timezone 'Antarctica/McMurdo', -467, 6, 833, 5, 'McMurdo Station, Ross Island'
-          c.timezone 'Antarctica/South_Pole', -90, 1, 0, 1, 'Amundsen-Scott Station, South Pole'
+          c.timezone 'Antarctica/McMurdo', -467, 6, 833, 5, 'McMurdo, South Pole, Scott (New Zealand time)'
           c.timezone 'Antarctica/Rothera', -2027, 30, -1022, 15, 'Rothera Station, Adelaide Island'
           c.timezone 'Antarctica/Palmer', -324, 5, -641, 10, 'Palmer Station, Anvers Island'
           c.timezone 'Antarctica/Mawson', -338, 5, 3773, 60, 'Mawson Station, Holme Bay'
@@ -44,6 +43,7 @@ module TZInfo
           c.timezone 'Antarctica/Vostok', -392, 5, 1069, 10, 'Vostok Station, Lake Vostok'
           c.timezone 'Antarctica/DumontDUrville', -200, 3, 8401, 60, 'Dumont-d\'Urville Station, Terre Adelie'
           c.timezone 'Antarctica/Syowa', -124211, 1800, 3959, 100, 'Syowa Station, E Ongul I'
+          c.timezone 'Antarctica/Troll', -259241, 3600, 507, 200, 'Troll Station, Queen Maud Land'
         end
         country 'AR', 'Argentina' do |c|
           c.timezone 'America/Argentina/Buenos_Aires', -173, 5, -1169, 20, 'Buenos Aires (BA, CF)'
@@ -128,7 +128,7 @@ module TZInfo
         country 'BO', 'Bolivia' do |c|
           c.timezone 'America/La_Paz', -33, 2, -1363, 20
         end
-        country 'BQ', 'Bonaire Sint Eustatius & Saba' do |c|
+        country 'BQ', 'Caribbean Netherlands' do |c|
           c.timezone 'America/Kralendijk', 14581, 1200, -20483, 300
         end
         country 'BR', 'Brazil' do |c|
@@ -172,8 +172,7 @@ module TZInfo
           c.timezone 'America/Moncton', 461, 10, -3887, 60, 'Atlantic Time - New Brunswick'
           c.timezone 'America/Goose_Bay', 160, 3, -725, 12, 'Atlantic Time - Labrador - most locations'
           c.timezone 'America/Blanc-Sablon', 617, 12, -3427, 60, 'Atlantic Standard Time - Quebec - Lower North Shore'
-          c.timezone 'America/Montreal', 2731, 60, -2207, 30, 'Eastern Time - Quebec - most locations'
-          c.timezone 'America/Toronto', 873, 20, -4763, 60, 'Eastern Time - Ontario - most locations'
+          c.timezone 'America/Toronto', 873, 20, -4763, 60, 'Eastern Time - Ontario & Quebec - most locations'
           c.timezone 'America/Nipigon', 2941, 60, -1324, 15, 'Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973'
           c.timezone 'America/Thunder_Bay', 2903, 60, -357, 4, 'Eastern Time - Thunder Bay, Ontario'
           c.timezone 'America/Iqaluit', 956, 15, -1027, 15, 'Eastern Time - east Nunavut - most locations'
@@ -404,7 +403,7 @@ module TZInfo
           c.timezone 'Europe/Dublin', 160, 3, -25, 4
         end
         country 'IL', 'Israel' do |c|
-          c.timezone 'Asia/Jerusalem', 953, 30, 1057, 30
+          c.timezone 'Asia/Jerusalem', 11441, 360, 63403, 1800
         end
         country 'IM', 'Isle of Man' do |c|
           c.timezone 'Europe/Isle_of_Man', 1083, 20, -67, 15
@@ -431,7 +430,7 @@ module TZInfo
           c.timezone 'Europe/Jersey', 246, 5, -127, 60
         end
         country 'JM', 'Jamaica' do |c|
-          c.timezone 'America/Jamaica', 18, 1, -384, 5
+          c.timezone 'America/Jamaica', 12937, 720, -11519, 150
         end
         country 'JO', 'Jordan' do |c|
           c.timezone 'Asia/Amman', 639, 20, 539, 15
@@ -699,6 +698,7 @@ module TZInfo
           c.timezone 'Europe/Moscow', 223, 4, 451, 12, 'Moscow+00 - west Russia'
           c.timezone 'Europe/Volgograd', 731, 15, 533, 12, 'Moscow+00 - Caspian Sea'
           c.timezone 'Europe/Samara', 266, 5, 1003, 20, 'Moscow+00 - Samara, Udmurtia'
+          c.timezone 'Europe/Simferopol', 899, 20, 341, 10, 'Moscow+00 - Crimea'
           c.timezone 'Asia/Yekaterinburg', 1137, 20, 303, 5, 'Moscow+02 - Urals'
           c.timezone 'Asia/Omsk', 55, 1, 367, 5, 'Moscow+03 - west Siberia'
           c.timezone 'Asia/Novosibirsk', 1651, 30, 995, 12, 'Moscow+03 - Novosibirsk'
@@ -771,7 +771,7 @@ module TZInfo
         country 'SV', 'El Salvador' do |c|
           c.timezone 'America/El_Salvador', 137, 10, -446, 5
         end
-        country 'SX', 'Sint Maarten' do |c|
+        country 'SX', 'St Maarten (Dutch part)' do |c|
           c.timezone 'America/Lower_Princes', 12997, 720, -22697, 360
         end
         country 'SY', 'Syria' do |c|
@@ -832,7 +832,6 @@ module TZInfo
           c.timezone 'Europe/Kiev', 1513, 30, 1831, 60, 'most locations'
           c.timezone 'Europe/Uzhgorod', 2917, 60, 223, 10, 'Ruthenia'
           c.timezone 'Europe/Zaporozhye', 287, 6, 211, 6, 'Zaporozh\'ye, E Lugansk / Zaporizhia, E Luhansk'
-          c.timezone 'Europe/Simferopol', 899, 20, 341, 10, 'central Crimea'
         end
         country 'UG', 'Uganda' do |c|
           c.timezone 'Africa/Kampala', 19, 60, 389, 12
@@ -862,8 +861,7 @@ module TZInfo
           c.timezone 'America/North_Dakota/Beulah', 56717, 1200, -916, 9, 'Central Time - North Dakota - Mercer County'
           c.timezone 'America/Denver', 47687, 1200, -125981, 1200, 'Mountain Time'
           c.timezone 'America/Boise', 157009, 3600, -46481, 400, 'Mountain Time - south Idaho & east Oregon'
-          c.timezone 'America/Shiprock', 33107, 900, -391271, 3600, 'Mountain Time - Navajo'
-          c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'Mountain Standard Time - Arizona'
+          c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'Mountain Standard Time - Arizona (except Navajo)'
           c.timezone 'America/Los_Angeles', 30647, 900, -212837, 1800, 'Pacific Time'
           c.timezone 'America/Anchorage', 44077, 720, -539641, 3600, 'Alaska Time'
           c.timezone 'America/Juneau', 209887, 3600, -483911, 3600, 'Alaska Time - Alaska panhandle'

data/test/tzinfo-data/tzinfo/data/indexes/timezones.rb

@@ -35,7 +35,7 @@ module TZInfo
         timezone 'Africa/Gaborone'
         timezone 'Africa/Harare'
         timezone 'Africa/Johannesburg'
-        timezone 'Africa/Juba'
+        linked_timezone 'Africa/Juba'
         timezone 'Africa/Kampala'
         timezone 'Africa/Khartoum'
         timezone 'Africa/Kigali'
@@ -65,7 +65,7 @@ module TZInfo
         timezone 'Africa/Windhoek'
         timezone 'America/Adak'
         timezone 'America/Anchorage'
-        timezone 'America/Anguilla'
+        linked_timezone 'America/Anguilla'
         timezone 'America/Antigua'
         timezone 'America/Araguaina'
         timezone 'America/Argentina/Buenos_Aires'
@@ -81,7 +81,7 @@ module TZInfo
         timezone 'America/Argentina/San_Luis'
         timezone 'America/Argentina/Tucuman'
         timezone 'America/Argentina/Ushuaia'
-        timezone 'America/Aruba'
+        linked_timezone 'America/Aruba'
         timezone 'America/Asuncion'
         timezone 'America/Atikokan'
         linked_timezone 'America/Atka'
@@ -115,7 +115,7 @@ module TZInfo
         timezone 'America/Dawson_Creek'
         timezone 'America/Denver'
         timezone 'America/Detroit'
-        timezone 'America/Dominica'
+        linked_timezone 'America/Dominica'
         timezone 'America/Edmonton'
         timezone 'America/Eirunepe'
         timezone 'America/El_Salvador'
@@ -126,8 +126,8 @@ module TZInfo
         timezone 'America/Godthab'
         timezone 'America/Goose_Bay'
         timezone 'America/Grand_Turk'
-        timezone 'America/Grenada'
-        timezone 'America/Guadeloupe'
+        linked_timezone 'America/Grenada'
+        linked_timezone 'America/Guadeloupe'
         timezone 'America/Guatemala'
         timezone 'America/Guayaquil'
         timezone 'America/Guyana'
@@ -174,7 +174,7 @@ module TZInfo
         timezone 'America/Monterrey'
         timezone 'America/Montevideo'
         timezone 'America/Montreal'
-        timezone 'America/Montserrat'
+        linked_timezone 'America/Montserrat'
         timezone 'America/Nassau'
         timezone 'America/New_York'
         timezone 'America/Nipigon'
@@ -210,17 +210,17 @@ module TZInfo
         timezone 'America/Sitka'
         linked_timezone 'America/St_Barthelemy'
         timezone 'America/St_Johns'
-        timezone 'America/St_Kitts'
-        timezone 'America/St_Lucia'
-        timezone 'America/St_Thomas'
-        timezone 'America/St_Vincent'
+        linked_timezone 'America/St_Kitts'
+        linked_timezone 'America/St_Lucia'
+        linked_timezone 'America/St_Thomas'
+        linked_timezone 'America/St_Vincent'
         timezone 'America/Swift_Current'
         timezone 'America/Tegucigalpa'
         timezone 'America/Thule'
         timezone 'America/Thunder_Bay'
         timezone 'America/Tijuana'
         timezone 'America/Toronto'
-        timezone 'America/Tortola'
+        linked_timezone 'America/Tortola'
         timezone 'America/Vancouver'
         linked_timezone 'America/Virgin'
         timezone 'America/Whitehorse'
@@ -232,11 +232,12 @@ module TZInfo
         timezone 'Antarctica/DumontDUrville'
         timezone 'Antarctica/Macquarie'
         timezone 'Antarctica/Mawson'
-        timezone 'Antarctica/McMurdo'
+        linked_timezone 'Antarctica/McMurdo'
         timezone 'Antarctica/Palmer'
         timezone 'Antarctica/Rothera'
         linked_timezone 'Antarctica/South_Pole'
         timezone 'Antarctica/Syowa'
+        timezone 'Antarctica/Troll'
         timezone 'Antarctica/Vostok'
         linked_timezone 'Arctic/Longyearbyen'
         timezone 'Asia/Aden'
@@ -306,9 +307,6 @@ module TZInfo
         timezone 'Asia/Qyzylorda'
         timezone 'Asia/Rangoon'
         timezone 'Asia/Riyadh'
-        timezone 'Asia/Riyadh87'
-        timezone 'Asia/Riyadh88'
-        timezone 'Asia/Riyadh89'
         linked_timezone 'Asia/Saigon'
         timezone 'Asia/Sakhalin'
         timezone 'Asia/Samarkand'
@@ -476,7 +474,7 @@ module TZInfo
         timezone 'Europe/Tirane'
         linked_timezone 'Europe/Tiraspol'
         timezone 'Europe/Uzhgorod'
-        timezone 'Europe/Vaduz'
+        linked_timezone 'Europe/Vaduz'
         linked_timezone 'Europe/Vatican'
         timezone 'Europe/Vienna'
         timezone 'Europe/Vilnius'
@@ -518,9 +516,6 @@ module TZInfo
         linked_timezone 'Mexico/BajaNorte'
         linked_timezone 'Mexico/BajaSur'
         linked_timezone 'Mexico/General'
-        linked_timezone 'Mideast/Riyadh87'
-        linked_timezone 'Mideast/Riyadh88'
-        linked_timezone 'Mideast/Riyadh89'
         linked_timezone 'NZ'
         linked_timezone 'NZ-CHAT'
         linked_timezone 'Navajo'
@@ -541,7 +536,7 @@ module TZInfo
         timezone 'Pacific/Guadalcanal'
         timezone 'Pacific/Guam'
         timezone 'Pacific/Honolulu'
-        timezone 'Pacific/Johnston'
+        linked_timezone 'Pacific/Johnston'
         timezone 'Pacific/Kiritimati'
         timezone 'Pacific/Kosrae'
         timezone 'Pacific/Kwajalein'

data/test/tzinfo-data/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 = '2013c'
+      TZDATA = '2014d'
     end
   end
 end

data/test/zoneinfo/iso3166.tab

@@ -1,17 +1,15 @@
-# <pre>
+# ISO 3166 alpha-2 country codes
+#
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
-# ISO 3166 alpha-2 country codes
 #
-# From Paul Eggert (2006-09-27):
+# From Paul Eggert (2013-05-27):
 #
 # This file contains a table with the following columns:
 # 1.  ISO 3166-1 alpha-2 country code, current as of
-#     ISO 3166-1 Newsletter VI-1 (2007-09-21).  See:
-#     <a href="http://www.iso.org/iso/en/prods-services/iso3166ma/index.html">
-#     ISO 3166 Maintenance agency (ISO 3166/MA)
-#     </a>.
-# 2.  The usual English name for the country,
+#     ISO 3166-1 Newsletter VI-15 (2013-05-10).  See: Updates on ISO 3166
+#   http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
+# 2.  The usual English name for the coded region,
 #     chosen so that alphabetic sorting of subsets produces helpful lists.
 #     This is not the same as the English name in the ISO 3166 tables.
 #
@@ -20,11 +18,12 @@
 #
 # Lines beginning with `#' are comments.
 #
-# From Arthur David Olson (2011-08-17):
-# Resynchronized today with the ISO 3166 site (adding SS for South Sudan).
+# This table is intended as an aid for users, to help them select time
+# zone data appropriate for their practical needs.  It is not intended
+# to take or endorse any position on legal or territorial claims.
 #
 #country-
-#code	country name
+#code	name of country, territory, area, or subdivision
 AD	Andorra
 AE	United Arab Emirates
 AF	Afghanistan
@@ -54,7 +53,7 @@ BL	St Barthelemy
 BM	Bermuda
 BN	Brunei
 BO	Bolivia
-BQ	Bonaire Sint Eustatius & Saba
+BQ	Caribbean Netherlands
 BR	Brazil
 BS	Bahamas
 BT	Bhutan
@@ -235,7 +234,7 @@ SR	Suriname
 SS	South Sudan
 ST	Sao Tome & Principe
 SV	El Salvador
-SX	Sint Maarten
+SX	St Maarten (Dutch part)
 SY	Syria
 SZ	Swaziland
 TC	Turks & Caicos Is

data/test/zoneinfo/zone.tab

@@ -1,26 +1,36 @@
-# <pre>
+# TZ zone descriptions
+#
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
-# TZ zone descriptions
+# From Paul Eggert (2013-08-14):
 #
-# From Paul Eggert (1996-08-05):
+# This file contains a table where each row stands for an area that is
+# the intersection of a region identified by a country code and of a
+# zone where civil clocks have agreed since 1970.  The columns of the
+# table are as follows:
 #
-# This file contains a table with the following columns:
-# 1.  ISO 3166 2-character country code.  See the file `iso3166.tab'.
-# 2.  Latitude and longitude of the zone's principal location
+# 1.  ISO 3166 2-character country code.  See the file 'iso3166.tab'.
+# 2.  Latitude and longitude of the area's principal location
 #     in ISO 6709 sign-degrees-minutes-seconds format,
 #     either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
 #     first latitude (+ is north), then longitude (+ is east).
 # 3.  Zone name used in value of TZ environment variable.
+#     Please see the 'Theory' file for how zone names are chosen.
+#     If multiple zones overlap a country, each has a row in the
+#     table, with column 1 being duplicated.
 # 4.  Comments; present if and only if the country has multiple rows.
 #
 # Columns are separated by a single tab.
 # The table is sorted first by country, then an order within the country that
 # (1) makes some geographical sense, and
-# (2) puts the most populous zones first, where that does not contradict (1).
+# (2) puts the most populous areas first, where that does not contradict (1).
+#
+# Lines beginning with '#' are comments.
 #
-# Lines beginning with `#' are comments.
+# This table is intended as an aid for users, to help them select time
+# zone data appropriate for their practical needs.  It is not intended
+# to take or endorse any position on legal or territorial claims.
 #
 #country-
 #code	coordinates	TZ			comments
@@ -32,8 +42,7 @@ AI	+1812-06304	America/Anguilla
 AL	+4120+01950	Europe/Tirane
 AM	+4011+04430	Asia/Yerevan
 AO	-0848+01314	Africa/Luanda
-AQ	-7750+16636	Antarctica/McMurdo	McMurdo Station, Ross Island
-AQ	-9000+00000	Antarctica/South_Pole	Amundsen-Scott Station, South Pole
+AQ	-7750+16636	Antarctica/McMurdo	McMurdo, South Pole, Scott (New Zealand time)
 AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
 AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
 AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
@@ -42,6 +51,7 @@ AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
 AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
 AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Terre Adelie
 AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
+AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
 AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
 AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
 AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
@@ -113,8 +123,7 @@ CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did n
 CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
 CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
 CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
-CA	+4531-07334	America/Montreal	Eastern Time - Quebec - most locations
-CA	+4339-07923	America/Toronto	Eastern Time - Ontario - most locations
+CA	+4339-07923	America/Toronto	Eastern Time - Ontario & Quebec - most locations
 CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
 CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
 CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
@@ -216,7 +225,7 @@ ID	-0002+10920	Asia/Pontianak	west & central Borneo
 ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
 ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
 IE	+5320-00615	Europe/Dublin
-IL	+3146+03514	Asia/Jerusalem
+IL	+314650+0351326	Asia/Jerusalem
 IM	+5409-00428	Europe/Isle_of_Man
 IN	+2232+08822	Asia/Kolkata
 IO	-0720+07225	Indian/Chagos
@@ -225,7 +234,7 @@ IR	+3540+05126	Asia/Tehran
 IS	+6409-02151	Atlantic/Reykjavik
 IT	+4154+01229	Europe/Rome
 JE	+4912-00207	Europe/Jersey
-JM	+1800-07648	America/Jamaica
+JM	+175805-0764736	America/Jamaica
 JO	+3157+03556	Asia/Amman
 JP	+353916+1394441	Asia/Tokyo
 KE	-0117+03649	Africa/Nairobi
@@ -335,6 +344,7 @@ RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
 RU	+5545+03735	Europe/Moscow	Moscow+00 - west Russia
 RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
 RU	+5312+05009	Europe/Samara	Moscow+00 - Samara, Udmurtia
+RU	+4457+03406	Europe/Simferopol	Moscow+00 - Crimea
 RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
 RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
 RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
@@ -390,7 +400,6 @@ TZ	-0648+03917	Africa/Dar_es_Salaam
 UA	+5026+03031	Europe/Kiev	most locations
 UA	+4837+02218	Europe/Uzhgorod	Ruthenia
 UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
-UA	+4457+03406	Europe/Simferopol	central Crimea
 UG	+0019+03225	Africa/Kampala
 UM	+1645-16931	Pacific/Johnston	Johnston Atoll
 UM	+2813-17722	Pacific/Midway	Midway Islands
@@ -414,8 +423,7 @@ US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota -
 US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
 US	+394421-1045903	America/Denver	Mountain Time
 US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
-US	+364708-1084111	America/Shiprock	Mountain Time - Navajo
-US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona
+US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona (except Navajo)
 US	+340308-1181434	America/Los_Angeles	Pacific Time
 US	+611305-1495401	America/Anchorage	Alaska Time
 US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle

data/tzinfo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'tzinfo'
-  s.version = '1.2.0'  
+  s.version = '1.2.1'
   s.summary = 'Daylight savings aware timezone library'
   s.description = 'TZInfo provides daylight savings aware transformations between times in different time zones.'
   s.author = 'Philip Ross'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tzinfo
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Philip Ross
@@ -30,7 +30,7 @@ cert_chain:
   fs7XSYlwQp0zY7PFSMwJeBpQFDBnShcweRQ+0QdUUS4FHrwfXex0QsXp9UROUX+4
   6BVw9ZDNFnDH4PQjZGbdwanB7kzm+TEi
   -----END CERTIFICATE-----
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_safe

metadata.gz.sig

@@ -1 +1,2 @@
-%����xlVJ{��2�"d�r�%�Co	)���o0f��mi���
+;���g���Z)���(����l�M�3�����샄-m�~LB\_��|7ooj�'mV6 ���@����J�܋�:����1uJ'G
+~���a_6�14���x���� �0��O&���AƏ�Ʌ��%������Ճ���.�a��=(V�WP�@��Q����k��b�#|d��=뀍k�iAޘtԂ]�����v�K]�ӓ"s���ӭh79����9��@�/��������bô�&�L