tzinfo 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ebc85eb68af0647a8989ba7cb104b24100ef198
-  data.tar.gz: a2fdbcd5b2c456658ef15e7cedea229a66259a03
+  metadata.gz: be3c32bd74920808d67de39efaf3a73c6e8906d9
+  data.tar.gz: f553215128b1b18c614252434e45d9d4e1c2dc53
 SHA512:
-  metadata.gz: 96a612b4835747ab4a3990195c1d6ff0e8fbed4905091e0380fc0b8fb64f4635a5f2cdf1a4deb4d0e3983e64a346c8afae2b063d1f53a4a5fddda4950b1eaf11
-  data.tar.gz: 59611995417725d20c591824e40b09df9325c39fb0161744228876effb6d263776cf12e9e209fa5380207e017fc38dd49a960c7f8582243c3982745ee1c3e37c
+  metadata.gz: af62bf6235210846b42517a1151a20e2e5c376005c3aa9b90515ed97c729d39e0b9fd2fd743708acfc6bb9fae55bf68a69c7408168f942d4b256feed02016d0a
+  data.tar.gz: b8073737407948dc494a2d9a4215044ffeae2b7ec91e9047e6fdf0b328af021e371f4e21f51d5dc798c232c80d23f2b11ee9bc9cc5d6a3c34cd806c56933c5ba

data/CHANGES.md

@@ -1,3 +1,24 @@
+Version 1.2.3 - 25-Mar-2017
+---------------------------
+
+* Reduce the number of String objects allocated when loading zoneinfo files.
+  #54.
+* Make Timezone#friendly_identifier compatible with frozen string literals.
+* Improve the algorithm for deriving the utc_offset from zoneinfo files. This
+  now correctly handles Pacific/Apia switching from one side of the
+  International Date Line to the other whilst observing daylight savings time.
+  #66.
+* Fix an UnknownTimezone exception when calling transitions_up_to or
+  offsets_up_to on a TimezoneProxy instance obtained from Timezone.get_proxy.
+* Allow the Factory zone to be obtained from the Zoneinfo data source.
+* Ignore the /usr/share/zoneinfo/timeconfig symlink included in Slackware
+  distributions. #64.
+* Fix Timezone#strftime handling of %Z expansion when %Z is prefixed with more
+  than one percent. #31.
+* Support expansion of %z, %:z, %::z and %:::z to the UTC offset of the time
+  zone in Timezone#strftime. #31 and #67.
+
+
 Version 1.2.2 - 8-Aug-2014
 --------------------------
 
@@ -92,6 +113,106 @@ Version 1.0.0 - 2-Jun-2013
   use other TimezonePeriod instance methods instead (issue #7655).
 
 
+Version 0.3.53 (tzdata v2017b) - 23-Mar-2017
+--------------------------------------------
+
+* Updated to tzdata version 2017b
+  (https://mm.icann.org/pipermail/tz-announce/2017-March/000046.html).
+
+
+Version 0.3.52 (tzdata v2016h) - 28-Oct-2016
+--------------------------------------------
+
+* Updated to tzdata version 2016h
+  (https://mm.icann.org/pipermail/tz-announce/2016-October/000042.html).
+
+
+Version 0.3.51 (tzdata v2016f) - 5-Jul-2016
+-------------------------------------------
+
+* Updated to tzdata version 2016f
+  (https://mm.icann.org/pipermail/tz-announce/2016-July/000040.html).
+
+
+Version 0.3.50 (tzdata v2016e) - 14-Jun-2016
+--------------------------------------------
+
+* Updated to tzdata version 2016e
+  (https://mm.icann.org/pipermail/tz-announce/2016-June/000039.html).
+
+
+Version 0.3.49 (tzdata v2016d) - 18-Apr-2016
+--------------------------------------------
+
+* Updated to tzdata version 2016d
+  (https://mm.icann.org/pipermail/tz-announce/2016-April/000038.html).
+
+
+Version 0.3.48 (tzdata v2016c) - 23-Mar-2016
+--------------------------------------------
+
+* Updated to tzdata version 2016c
+  (https://mm.icann.org/pipermail/tz-announce/2016-March/000037.html).
+
+
+Version 0.3.47 (tzdata v2016b) - 15-Mar-2016
+--------------------------------------------
+
+* Updated to tzdata version 2016b
+  (https://mm.icann.org/pipermail/tz-announce/2016-March/000036.html).
+
+
+Version 0.3.46 (tzdata v2015g) - 2-Dec-2015
+-------------------------------------------
+
+* From version 2015e, the IANA time zone database uses non-ASCII characters in
+  country names. Backport the encoding handling from TZInfo::Data to allow
+  TZInfo 0.3.x to support Ruby 1.9 (which would otherwise fail with an invalid
+  byte sequence error when loading the countries index). Resolves #41.
+
+
+Version 0.3.45 (tzdata v2015g) - 3-Oct-2015
+-------------------------------------------
+
+* Updated to tzdata version 2015g
+  (http://mm.icann.org/pipermail/tz-announce/2015-October/000034.html).
+
+
+Version 0.3.44 (tzdata v2015d) - 24-Apr-2015
+--------------------------------------------
+
+* Updated to tzdata version 2015d
+  (http://mm.icann.org/pipermail/tz-announce/2015-April/000031.html).
+
+
+Version 0.3.43 (tzdata v2015a) - 31-Jan-2015
+--------------------------------------------
+
+* Updated to tzdata version 2015a
+  (http://mm.icann.org/pipermail/tz-announce/2015-January/000028.html).
+
+
+Version 0.3.42 (tzdata v2014i) - 23-Oct-2014
+--------------------------------------------
+
+* Updated to tzdata version 2014i
+  (http://mm.icann.org/pipermail/tz-announce/2014-October/000026.html).
+
+
+Version 0.3.41 (tzdata v2014f) - 8-Aug-2014
+-------------------------------------------
+
+* Updated to tzdata version 2014f
+  (http://mm.icann.org/pipermail/tz-announce/2014-August/000023.html).
+
+
+Version 0.3.40 (tzdata v2014e) - 10-Jul-2014
+--------------------------------------------
+
+* Updated to tzdata version 2014e
+  (http://mm.icann.org/pipermail/tz-announce/2014-June/000022.html).
+
+
 Version 0.3.39 (tzdata v2014a) - 9-Mar-2014
 -------------------------------------------
 
@@ -177,7 +298,7 @@ Version 0.3.29 (tzdata v2011h) - 27-Jun-2011
 
 
  Version 0.3.28 (tzdata v2011g) - 13-Jun-2011
---------------------------------------------=
+---------------------------------------------
 
 * Add support for Ruby 1.9.3 (trunk revision 31668 and later). Thanks to 
   Aaron Patterson for reporting the problems running on the new version.

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2014 Philip Ross
+Copyright (c) 2005-2017 Philip Ross
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of 
 this software and associated documentation files (the "Software"), to deal in 

data/Rakefile

@@ -21,7 +21,10 @@ class TZInfoPackageTask < Gem::PackageTask
   private :orig_sh
 
   def sh(*cmd, &block)
-    if cmd.first =~ /\A__tar_with_owner__ -?([zjcvf]+)(.*)\z/
+    if cmd[0] == '__tar_with_owner__' && cmd[1] =~ /\A-?[zjcvf]+\z/
+      opts = cmd[1]
+      cmd = ['tar', 'c', '--owner', '0', '--group', '0', "#{opts.start_with?('-') ? '' : '-'}#{opts.gsub('c', '')}"] + cmd.drop(2)
+    elsif cmd.first =~ /\A__tar_with_owner__ -?([zjcvf]+)(.*)\z/
       opts = $1
       args = $2
       cmd[0] = "tar c --owner 0 --group 0 -#{opts.gsub('c', '')}#{args}"    

data/lib/tzinfo/timezone.rb

@@ -236,13 +236,9 @@ module TZInfo
       elsif parts.length == 1        
         parts[0]
       else
-        if skip_first_part
-          result = ''
-        else
-          result = parts[0] + ' - '
-        end
-        
-        parts[1, parts.length - 1].reverse_each {|part|
+        prefix = skip_first_part ? nil : "#{parts[0]} - "
+
+        parts = parts.drop(1).map do |part|
           part.gsub!(/_/, ' ')
           
           if part.index(/[a-z]/)
@@ -254,13 +250,11 @@ module TZInfo
             # Missing an apostrophe if two consecutive upper case characters.
             part.gsub!(/([A-Z])([A-Z])/, '\1\'\2')
           end
-          
-          result << part
-          result << ', '
-        }
-        
-        result.slice!(result.length - 2, 2)
-        result
+
+          part
+        end
+
+        "#{prefix}#{parts.reverse.join(', ')}"
       end
     end
     
@@ -559,22 +553,60 @@ module TZInfo
     
     alias :current_time_and_period :current_period_and_time
 
-    # Converts a time in UTC to local time and returns it as a string 
-    # according to the given format. The formatting is identical to 
-    # Time.strftime and DateTime.strftime, except %Z is replaced with the
-    # timezone abbreviation for the specified time (for example, EST or EDT).        
+    # Converts a time in UTC to local time and returns it as a string according
+    # to the given format.
+    #
+    # The formatting is identical to Time.strftime and DateTime.strftime, except
+    # %Z and %z are replaced with the timezone abbreviation (for example, EST or
+    # EDT) and offset for the specified Timezone and time.
+    #
+    # The offset can be formatted as follows:
+    #
+    # - %z - hour and minute (e.g. +0500)
+    # - %:z - hour and minute separated with a colon (e.g. +05:00)
+    # - %::z - hour minute and second separated with colons (e.g. +05:00:00)
+    # - %:::z - hour only (e.g. +05)
+    #
+    # Timezone#strftime currently handles the replacement of %z. From TZInfo
+    # version 2.0.0, %z will be passed to Time#strftime and DateTime#strftime
+    # instead. Some of the formatting options may cease to be available
+    # depending on the version of Ruby in use (for example, %:::z is only
+    # supported by Time#strftime from MRI version 2.0.0 onwards.)
     def strftime(format, utc = Time.now.utc)      
       period = period_for_utc(utc)
       local = period.to_local(utc)      
       local = Time.at(local).utc unless local.kind_of?(Time) || local.kind_of?(DateTime)
       abbreviation = period.abbreviation.to_s.gsub(/%/, '%%')
       
-      format = format.gsub(/(.?)%Z/) do
-        if $1 == '%'
-          # return %%Z so the real strftime treats it as a literal %Z too
-          '%%Z'
-        else
+      format = format.gsub(/%(%*)(Z|:*z)/) do
+        if $1.length.odd?
+          # Escaped literal percent or series of percents. Pass on to strftime.          
+          "#$1%#$2"
+        elsif $2 == "Z"
           "#$1#{abbreviation}"
+        else
+          m, s = period.utc_total_offset.divmod(60)
+          h, m = m.divmod(60)
+          case $2.length
+          when 1
+            "#$1#{'%+03d%02d' % [h,m]}"
+          when 2
+            "#$1#{'%+03d:%02d' % [h,m]}"
+          when 3
+            "#$1#{'%+03d:%02d:%02d' % [h,m,s]}"
+          when 4
+            "#$1#{'%+03d' % [h]}"
+          else # more than 3 colons - not a valid option
+            # Passing the invalid format string through to Time#strftime or
+            # DateTime#strtime would normally result in it being returned in the
+            # result. However, with Ruby 1.8.7 on Windows (as tested with Ruby
+            # 1.8.7-p374 from http://rubyinstaller.org/downloads/archives), this
+            # causes Time#strftime to always return an empty string (e.g.
+            # Time.now.strftime('a %::::z b') returns '').
+            #
+            # Escape the percent to force it to be evaluated as a literal.
+            "#$1%%#$2"
+          end
         end
       end
       

data/lib/tzinfo/timezone_offset.rb

@@ -34,6 +34,8 @@ module TZInfo
     
     # Converts a UTC Time, DateTime or integer timestamp to local time, based on 
     # the offset of this period.
+    #
+    # Deprecation warning: this method will be removed in TZInfo version 2.0.0.
     def to_local(utc)
       TimeOrDateTime.wrap(utc) {|wrapped|
         wrapped + @utc_total_offset
@@ -42,6 +44,8 @@ module TZInfo
     
     # Converts a local Time, DateTime or integer timestamp to UTC, based on the
     # offset of this period.
+    #
+    # Deprecation warning: this method will be removed in TZInfo version 2.0.0.
     def to_utc(local)
       TimeOrDateTime.wrap(local) {|wrapped|
         wrapped - @utc_total_offset

data/lib/tzinfo/timezone_period.rb

@@ -126,45 +126,62 @@ module TZInfo
     end
     
     # true if this period is valid for the given UTC DateTime; otherwise false.
+    #
+    # Deprecation warning: this method will be removed in TZInfo version 2.0.0.
     def valid_for_utc?(utc)
       utc_after_start?(utc) && utc_before_end?(utc) 
     end
     
     # true if the given UTC DateTime is after the start of the period 
     # (inclusive); otherwise false.
+    #
+    # Deprecation warning: this method will be removed in TZInfo version 2.0.0.
     def utc_after_start?(utc)
       !@start_transition || @start_transition.at <= utc
     end
     
     # true if the given UTC DateTime is before the end of the period 
     # (exclusive); otherwise false.
+    #
+    # Deprecation warning: this method will be removed in TZInfo version 2.0.0.
     def utc_before_end?(utc)
       !@end_transition || @end_transition.at > utc
     end
     
-    # true if this period is valid for the given local DateTime; otherwise false.
+    # true if this period is valid for the given local DateTime; otherwise
+    # false.
+    #
+    # Deprecation warning: this method will be removed in TZInfo version 2.0.0.
     def valid_for_local?(local)      
       local_after_start?(local) && local_before_end?(local) 
     end
     
     # true if the given local DateTime is after the start of the period 
     # (inclusive); otherwise false.
+    #
+    # Deprecation warning: this method will be removed in TZInfo version 2.0.0.
     def local_after_start?(local)
       !@start_transition || @start_transition.local_start_at <= local
     end
     
     # true if the given local DateTime is before the end of the period 
     # (exclusive); otherwise false.
+    #
+    # Deprecation warning: this method will be removed in TZInfo version 2.0.0.
     def local_before_end?(local)
       !@end_transition || @end_transition.local_end_at > local
     end
     
     # Converts a UTC DateTime to local time based on the offset of this period.
+    #
+    # Deprecation warning: this method will be removed in TZInfo version 2.0.0.
     def to_local(utc)
       @offset.to_local(utc)
     end
     
     # Converts a local DateTime to UTC based on the offset of this period.
+    #
+    # Deprecation warning: this method will be removed in TZInfo version 2.0.0.
     def to_utc(local)
       @offset.to_utc(local)
     end

data/lib/tzinfo/timezone_proxy.rb

@@ -38,6 +38,35 @@ module TZInfo
       real_timezone.periods_for_local(local)
     end
     
+    # Returns an Array of TimezoneTransition instances representing the times
+    # where the UTC offset of the timezone changes.
+    #
+    # Transitions are returned up to a given date and time up to a given date
+    # and time (to).
+    #
+    # A from date and time may also be supplied using the from parameter. If
+    # from is not nil, only transitions from that date and time onwards will be
+    # returned.
+    #
+    # Comparisons with to are exclusive. Comparisons with from are inclusive.
+    # If a transition falls precisely on to, it will be excluded. If a
+    # transition falls on from, it will be included.
+    #
+    # Transitions returned are ordered by when they occur, from earliest to
+    # latest.
+    #
+    # to and from can be specified using either a Time, DateTime, Time or
+    # Timestamp.
+    #
+    # If from is specified and to is not greater than from, then an
+    # ArgumentError exception is raised.
+    #
+    # ArgumentError is raised if to is nil or of either to or from are
+    # Timestamps with unspecified offsets.
+    def transitions_up_to(to, from = nil)
+      real_timezone.transitions_up_to(to, from)
+    end
+
     # Returns the canonical zone for this Timezone.
     def canonical_zone
       real_timezone.canonical_zone

data/lib/tzinfo/zoneinfo_data_source.rb

@@ -349,9 +349,9 @@ module TZInfo
       # localtime current local timezone (may be a link).
       # posix, posixrules and right are directories containing other versions of the zoneinfo files.
       # src is a directory containing the tzdata source included on Solaris.
-      # Factory is the compiled in default timezone.
+      # timeconfig is a symlink included on Slackware.
       
-      enum_timezones(nil, ['+VERSION', 'localtime', 'posix', 'posixrules', 'right', 'src', 'Factory']) do |identifier|
+      enum_timezones(nil, ['+VERSION', 'localtime', 'posix', 'posixrules', 'right', 'src', 'timeconfig']) do |identifier|
         index << identifier
       end
       
@@ -432,7 +432,7 @@ module TZInfo
             
             file_is_5_column = true if column5
             
-            zone_tab << [codes.split(','), zone_identifier, latitude, longitude, column4, column5]
+            zone_tab << [codes.split(','.freeze), zone_identifier, latitude, longitude, column4, column5]
           end
         end
       end
@@ -480,7 +480,7 @@ module TZInfo
     def dms_to_rational(sign, degrees, minutes, seconds = nil)
       result = degrees.to_i + Rational(minutes.to_i, 60)
       result += Rational(seconds.to_i, 3600) if seconds
-      result = -result if sign == '-'
+      result = -result if sign == '-'.freeze
       result
     end
   end

data/lib/tzinfo/zoneinfo_timezone_info.rb

@@ -56,39 +56,109 @@ module TZInfo
         result
       end
       
-      # Zoneinfo doesn't include the offset from standard time (std_offset).
-      # Derive the missing offsets by looking at changes in the total UTC
-      # offset.
+      # Zoneinfo files don't include the offset from standard time (std_offset)
+      # for DST periods. Derive the base offset (utc_offset) where DST is
+      # observed from either the previous or next non-DST period.
       #
-      # This will be run through forwards and then backwards by the parse 
-      # method.
-      def derive_offsets(transitions, offsets)      
-        previous_offset = nil
+      # Returns the index of the offset to be used prior to the first
+      # transition.
+      def derive_offsets(transitions, offsets)
+        # The first non-DST offset (if there is one) is the offset observed
+        # before the first transition. Fallback to the first DST offset if there
+        # are no non-DST offsets.
+        first_non_dst_offset_index = offsets.index {|o| !o[:is_dst] }
+        first_offset_index = first_non_dst_offset_index || 0
+        return first_offset_index if transitions.empty?
 
-        transitions.each do |t|
-          offset = offsets[t[:offset]]
+        # Determine the utc_offset of the next non-dst offset at each transition.
+        utc_offset_from_next = nil
 
-          if !offset[:std_offset] && offset[:is_dst] && previous_offset
-            difference = offset[:utc_total_offset] - previous_offset[:utc_total_offset]
-            
-            if previous_offset[:is_dst]
-              if previous_offset[:std_offset]
-                std_offset = previous_offset[:std_offset] + difference
-              else
-                std_offset = nil
-              end
-            else
-              std_offset = difference
+        transitions.reverse_each do |transition|
+          offset = offsets[transition[:offset]]
+          if offset[:is_dst]
+            transition[:utc_offset_from_next] = utc_offset_from_next if utc_offset_from_next
+          else
+            utc_offset_from_next = offset[:utc_total_offset]
+          end
+        end
+
+        utc_offset_from_previous = first_non_dst_offset_index ? offsets[first_non_dst_offset_index][:utc_total_offset] : nil
+        defined_offsets = {}
+
+        transitions.each do |transition|
+          offset_index = transition[:offset]
+          offset = offsets[offset_index]
+          utc_total_offset = offset[:utc_total_offset]
+
+          if offset[:is_dst]
+            utc_offset_from_next = transition[:utc_offset_from_next]
+
+            difference_to_previous = utc_total_offset - (utc_offset_from_previous || utc_total_offset)
+            difference_to_next = utc_total_offset - (utc_offset_from_next || utc_total_offset)
+
+            utc_offset = if difference_to_previous > 0 && difference_to_next > 0
+              difference_to_previous < difference_to_next ? utc_offset_from_previous : utc_offset_from_next
+            elsif difference_to_previous > 0
+              utc_offset_from_previous
+            elsif difference_to_next > 0
+              utc_offset_from_next
+            else # difference_to_previous <= 0 && difference_to_next <= 0
+              # DST, but the either the offset has stayed the same or decreased
+              # relative to both the previous and next used base utc offset, or
+              # there are no non-DST offsets. Assume a 1 hour offset from base.
+              utc_total_offset - 3600
             end
-            
-            if std_offset && std_offset > 0
-              offset[:std_offset] = std_offset
-              offset[:utc_offset] = offset[:utc_total_offset] - std_offset
+
+            if !offset[:utc_offset]
+              offset[:utc_offset] = utc_offset
+              defined_offsets[offset] = offset_index
+            elsif offset[:utc_offset] != utc_offset
+              # An earlier transition has already derived a different
+              # utc_offset. Define a new offset or reuse an existing identically
+              # defined offset.
+              new_offset = offset.dup
+              new_offset[:utc_offset] = utc_offset
+
+              offset_index = defined_offsets[new_offset]
+
+              unless offset_index
+                offsets << new_offset
+                offset_index = offsets.length - 1
+                defined_offsets[new_offset] = offset_index
+              end
+
+              transition[:offset] = offset_index
             end
+          else
+            utc_offset_from_previous = utc_total_offset
           end
-          
-          previous_offset = offset
         end
+
+        first_offset_index
+      end
+
+      # Defines an offset for the timezone based on the given index and offset
+      # Hash.
+      def define_offset(index, offset)
+        utc_total_offset = offset[:utc_total_offset]
+        utc_offset = offset[:utc_offset]
+
+        if utc_offset
+          # DST offset with base utc_offset derived by derive_offsets.
+          std_offset = utc_total_offset - utc_offset
+        elsif offset[:is_dst]
+          # DST offset unreferenced by a transition (offset in use before the
+          # first transition). No derived base UTC offset, so assume 1 hour
+          # DST.
+          utc_offset = utc_total_offset - 3600
+          std_offset = 3600
+        else
+          # Non-DST offset.
+          utc_offset = utc_total_offset
+          std_offset = 0
+        end
+
+        offset index, utc_offset, std_offset, offset[:abbr].untaint.to_sym
       end
       
       # Parses a zoneinfo file and intializes the DataTimezoneInfo structures.
@@ -127,27 +197,27 @@ module TZInfo
         transitions = []
         
         if using_64bit
-          (0...timecnt).each do |i|
-            high, low = check_read(file, 8).unpack('NN')
+          timecnt.times do |i|
+            high, low = check_read(file, 8).unpack('NN'.freeze)
             transition_time = make_signed_int64(high, low)
             transitions << {:at => transition_time}          
           end
         else
-          (0...timecnt).each do |i|
-            transition_time = make_signed_int32(check_read(file, 4).unpack('N')[0])
+          timecnt.times do |i|
+            transition_time = make_signed_int32(check_read(file, 4).unpack('N'.freeze)[0])
             transitions << {:at => transition_time}          
           end
         end
         
-        (0...timecnt).each do |i|
-          localtime_type = check_read(file, 1).unpack('C')[0]
+        timecnt.times do |i|
+          localtime_type = check_read(file, 1).unpack('C'.freeze)[0]
           transitions[i][:offset] = localtime_type
         end
         
         offsets = []
         
-        (0...typecnt).each do |i|
-          gmtoff, isdst, abbrind = check_read(file, 6).unpack('NCC')
+        typecnt.times do |i|
+          gmtoff, isdst, abbrind = check_read(file, 6).unpack('NCC'.freeze)
           gmtoff = make_signed_int32(gmtoff)
           isdst = isdst == 1
           offset = {:utc_total_offset => gmtoff, :is_dst => isdst, :abbr_index => abbrind}
@@ -179,33 +249,12 @@ module TZInfo
         end
         
         # Derive the offsets from standard time (std_offset).
-        derive_offsets(transitions, offsets)
-        derive_offsets(transitions.reverse, offsets)
+        first_offset_index = derive_offsets(transitions, offsets)
         
-        # Assign anything left a standard offset of one hour
-        offsets.each do |o|
-          if !o[:std_offset] && o[:is_dst]
-            o[:std_offset] = 3600
-            o[:utc_offset] = o[:utc_total_offset] - 3600
-          end
-        end
-        
-        # Find the first non-dst offset. This is used as the offset for the time
-        # before the first transition.
-        first = nil
-        offsets.each_with_index do |o, i|
-          if !o[:is_dst]
-            first = i
-            break
-          end
-        end
-        
-        if first
-          offset first, offsets[first][:utc_offset], offsets[first][:std_offset], offsets[first][:abbr].untaint.to_sym
-        end
+        define_offset(first_offset_index, offsets[first_offset_index])
         
         offsets.each_with_index do |o, i|
-          offset i, o[:utc_offset], o[:std_offset], o[:abbr].untaint.to_sym unless i == first
+          define_offset(i, o) unless i == first_offset_index
         end
 
         if !using_64bit && !RubyCoreSupport.time_supports_negative