tzinfo 0.3.61 → 1.0.0

data/lib/tzinfo/zoneinfo_timezone_info.rb

@@ -0,0 +1,226 @@
+#--
+# Copyright (c) 2008-2013 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 the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+module TZInfo
+  # An InvalidZoneinfoFile exception is raised if an attempt is made to load an
+  # invalid zoneinfo file.
+  class InvalidZoneinfoFile < StandardError
+  end
+
+  # Represents a timezone defined by a compiled zoneinfo TZif (\0 or 2) file.
+  class ZoneinfoTimezoneInfo < TransitionDataTimezoneInfo #:nodoc:
+    
+    # Constructs the new ZoneinfoTimezoneInfo with an identifier and path
+    # to the file.
+    def initialize(identifier, file_path)
+      super(identifier)
+      
+      File.open(file_path, 'rb') do |file|
+        parse(file)
+      end
+    end
+    
+    private
+      # Unpack will return unsigned 32-bit integers. Translate to 
+      # signed 32-bit.
+      def make_signed_int32(long)
+        long >= 0x80000000 ? long - 0x100000000 : long
+      end
+      
+      # Unpack will return a 64-bit integer as two unsigned 32-bit integers
+      # (most significant first). Translate to signed 64-bit
+      def make_signed_int64(high, low)
+        unsigned = (high << 32) | low
+        unsigned > 0x8000000000000000 ? unsigned - 0x10000000000000000 : unsigned
+      end
+      
+      # Read bytes from file and check that the correct number of bytes could
+      # be read. Raises InvalidZoneinfoFile if the number of bytes didn't match
+      # the number requested.
+      def check_read(file, bytes)
+        result = file.read(bytes)
+        
+        unless result && result.length == bytes
+          raise InvalidZoneinfoFile, "Expected #{bytes} bytes reading '#{file.path}', but got #{result ? result.length : 0} bytes"
+        end
+        
+        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.
+      #
+      # This will be run through forwards and then backwards by the parse 
+      # method.
+      def derive_offsets(transitions, offsets)      
+        previous_offset = nil
+
+        transitions.each do |t|
+          offset = offsets[t[:offset]]
+
+          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
+            end
+            
+            if std_offset && std_offset > 0
+              offset[:std_offset] = std_offset
+              offset[:utc_offset] = offset[:utc_total_offset] - std_offset
+            end
+          end
+          
+          previous_offset = offset
+        end
+      end
+      
+      # Parses a zoneinfo file and intializes the DataTimezoneInfo structures.
+      def parse(file)
+        magic, ttisgmtcnt, ttisstdcnt, leapcnt, timecnt, typecnt, charcnt =
+          check_read(file, 44).unpack('a5 x15 NNNNNN')
+
+        if magic == 'TZif2' && 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)
+          
+          magic, ttisgmtcnt, ttisstdcnt, leapcnt, timecnt, typecnt, charcnt =
+            check_read(file, 44).unpack('a5 x15 NNNNNN')
+            
+          unless magic == 'TZif2'
+            raise InvalidZoneinfoFile, "Invalid magic in second section of file '#{file.path}'"
+          end
+          
+          using_64bit = true          
+        elsif magic != 'TZif2' && magic != "TZif\0"
+          raise InvalidZoneinfoFile, "Invalid magic in file '#{file.path}'"
+        else
+          using_64bit = false
+        end
+        
+        unless leapcnt == 0
+          raise InvalidZoneinfoFile, "The zoneinfo file '#{file.path}' contains leap second data. TZInfo requires zoneinfo files that omit leap seconds."
+        end
+        
+        transitions = []
+        
+        if using_64bit
+          (0...timecnt).each do |i|
+            high, low = check_read(file, 8).unpack('NN')
+            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])
+            transitions << {:at => transition_time}          
+          end
+        end
+        
+        (0...timecnt).each do |i|
+          localtime_type = check_read(file, 1).unpack('C')[0]
+          transitions[i][:offset] = localtime_type
+        end
+        
+        offsets = []
+        
+        (0...typecnt).each do |i|
+          gmtoff, isdst, abbrind = check_read(file, 6).unpack('NCC')
+          gmtoff = make_signed_int32(gmtoff)
+          isdst = isdst == 1
+          offset = {:utc_total_offset => gmtoff, :is_dst => isdst, :abbr_index => abbrind}
+          
+          unless isdst
+            offset[:utc_offset] = gmtoff
+            offset[:std_offset] = 0
+          end
+          
+          offsets << offset
+        end
+        
+        abbrev = check_read(file, charcnt)
+
+        offsets.each do |o|
+          abbrev_start = o[:abbr_index]         
+          raise InvalidZoneinfoFile, "Abbreviation index is out of range in file '#{file.path}'" unless abbrev_start < abbrev.length
+          
+          abbrev_end = abbrev.index("\0", abbrev_start)
+          raise InvalidZoneinfoFile, "Missing abbreviation null terminator in file '#{file.path}'" unless abbrev_end
+
+          o[:abbr] = RubyCoreSupport.force_encoding(abbrev[abbrev_start...abbrev_end], 'UTF-8')
+        end
+        
+        transitions.each do |t|
+          if t[:offset] < 0 || t[:offset] >= offsets.length
+            raise InvalidZoneinfoFile, "Invalid offset referenced by transition in file '#{file.path}'."
+          end
+        end
+        
+        # Derive the offsets from standard time (std_offset).
+        derive_offsets(transitions, offsets)
+        derive_offsets(transitions.reverse, 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
+        
+        
+        
+        offsets.each_with_index do |o, i|
+          offset i, o[:utc_offset], o[:std_offset], o[:abbr].untaint.to_sym unless i == first
+        end
+        
+        transitions.each do |t|
+          at = t[:at]
+          if using_64bit || at > 0 || RubyCoreSupport.time_supports_negative
+            time = Time.at(at).utc
+            transition time.year, time.mon, t[:offset], at
+          end
+        end
+      end
+  end
+end

data/lib/tzinfo.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2010 Philip Ross
+# Copyright (c) 2005-2013 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
@@ -20,12 +20,6 @@
 # THE SOFTWARE.
 #++
 
-# Add the directory containing this file to the start of the load path if it
-# isn't there already.
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-
 require 'tzinfo/ruby_core_support'
 require 'tzinfo/offset_rationals'
 require 'tzinfo/time_or_datetime'
@@ -40,6 +34,12 @@ require 'tzinfo/timezone_index_definition'
 require 'tzinfo/timezone_info'
 require 'tzinfo/data_timezone_info'
 require 'tzinfo/linked_timezone_info'
+require 'tzinfo/transition_data_timezone_info'
+require 'tzinfo/zoneinfo_timezone_info'
+
+require 'tzinfo/data_source'
+require 'tzinfo/ruby_data_source'
+require 'tzinfo/zoneinfo_data_source'
 
 require 'tzinfo/timezone_period'
 require 'tzinfo/timezone'
@@ -50,6 +50,8 @@ require 'tzinfo/timezone_proxy'
 
 require 'tzinfo/country_index_definition'
 require 'tzinfo/country_info'
+require 'tzinfo/ruby_country_info'
+require 'tzinfo/zoneinfo_country_info'
 
 require 'tzinfo/country'
 require 'tzinfo/country_timezone'

data/test/tc_country.rb

@@ -1,11 +1,39 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require File.join(File.dirname(__FILE__), 'test_utils')
-require 'tzinfo'
+#--
+# Copyright (c) 2005-2013 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 the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils')
 
 include TZInfo
 
 class TCCountry < Test::Unit::TestCase
+  def setup
+    @orig_data_source = DataSource.get
+    Country.send :class_variable_set, :@@countries, {}
+  end
+  
+  def teardown
+    DataSource.set(@orig_data_source)
+  end
+  
   def test_get_valid
     c = Country.get('GB')
     
@@ -114,10 +142,6 @@ class TCCountry < Test::Unit::TestCase
     assert_equal(1, Country.get('US') <=> Country.get('FR'))
   end
   
-  def test_compare_non_comparable
-    assert_nil(Country.get('GB') <=> Object.new)
-  end
-  
   def test_equality
     assert_equal(true, Country.get('GB') == Country.get('GB'))
     assert_equal(false, Country.get('GB') == Country.get('US'))
@@ -157,4 +181,36 @@ class TCCountry < Test::Unit::TestCase
     c = Country.get('US')
     assert_equal('US', Country.get('US').code)
   end
-end
+  
+  def test_get_missing_data_source
+    DataSource.set(DataSource.new)
+    
+    assert_raises(InvalidDataSource) do
+      Country.get('GB')
+    end
+  end
+  
+  def test_new_missing_data_source
+    DataSource.set(DataSource.new)
+    
+    assert_raises(InvalidDataSource) do
+      Country.new('GB')
+    end
+  end
+  
+  def test_all_codes_missing_data_source
+    DataSource.set(DataSource.new)
+    
+    assert_raises(InvalidDataSource) do
+      Country.all_codes
+    end
+  end
+  
+  def test_all_missing_data_source
+    DataSource.set(DataSource.new)
+    
+    assert_raises(InvalidDataSource) do
+      Country.all
+    end
+  end
+end

data/test/tc_country_index_definition.rb

@@ -1,6 +1,26 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo'
+#--
+# Copyright (c) 2006-2013 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 the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils')
 
 include TZInfo
 
@@ -10,12 +30,10 @@ class TCCountryIndexDefinition < Test::Unit::TestCase
     include CountryIndexDefinition
     
     country 'ZZ', 'Country One' do |c|
-      raise 'Not a CountryInfo' unless c.kind_of?(CountryInfo)
       c.timezone 'Test/Zone/1', 3, 2, 41,20
     end
     
     country 'AA', 'Aland' do |c|
-      raise 'Not a CountryInfo' unless c.kind_of?(CountryInfo)
       c.timezone 'Test/Zone/3', 71,30, 358, 15
       c.timezone 'Test/Zone/2', 41, 20, 211, 30
     end
@@ -27,7 +45,6 @@ class TCCountryIndexDefinition < Test::Unit::TestCase
     include CountryIndexDefinition
     
     country 'CO', 'First Country' do |c|
-      raise 'Not a CountryInfo' unless c.kind_of?(CountryInfo)
     end
   end
   
@@ -40,17 +57,20 @@ class TCCountryIndexDefinition < Test::Unit::TestCase
     aa = hash['AA']
     te = hash['TE']
     
+    assert_kind_of(RubyCountryInfo, zz)
     assert_equal('ZZ', zz.code)
     assert_equal('Country One', zz.name)
     assert_equal(1, zz.zones.length)
     assert_equal('Test/Zone/1', zz.zones[0].identifier)
     
+    assert_kind_of(RubyCountryInfo, aa)
     assert_equal('AA', aa.code)
     assert_equal('Aland', aa.name)
     assert_equal(2, aa.zones.length)
     assert_equal('Test/Zone/3', aa.zones[0].identifier)
     assert_equal('Test/Zone/2', aa.zones[1].identifier)
     
+    assert_kind_of(RubyCountryInfo, te)
     assert_equal('TE', te.code)
     assert_equal('Three', te.name)
     assert_equal(0, te.zones.length)    
@@ -63,6 +83,7 @@ class TCCountryIndexDefinition < Test::Unit::TestCase
     
     co = hash['CO']
     
+    assert_kind_of(RubyCountryInfo, co)
     assert_equal('CO', co.code)
     assert_equal('First Country', co.name)
     assert_equal(0, co.zones.length)

data/test/tc_country_info.rb

@@ -1,6 +1,26 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo'
+#--
+# Copyright (c) 2006-2013 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 the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils')
 
 include TZInfo
 
@@ -15,58 +35,4 @@ class TCCountryInfo < Test::Unit::TestCase
     ci = CountryInfo.new('ZZ', 'Zzz') {|c| }
     assert_equal('Zzz', ci.name)
   end
-  
-  def test_zone_identifiers_empty
-    ci = CountryInfo.new('ZZ', 'Zzz') {|c| }
-    assert(ci.zone_identifiers.empty?)
-    assert(ci.zone_identifiers.frozen?)
-  end
-  
-  def test_zone_identifiers_no_block
-    ci = CountryInfo.new('ZZ', 'Zzz')
-    assert(ci.zone_identifiers.empty?)
-    assert(ci.zone_identifiers.frozen?)
-  end
-  
-  def test_zone_identifiers
-    ci = CountryInfo.new('ZZ', 'Zzz') do |c|
-      assert_same(ci, c)
-      c.timezone('ZZ/TimezoneB', 1, 2, 1, 2, 'Timezone B')
-      c.timezone('ZZ/TimezoneA', 1, 4, 1, 4, 'Timezone A')
-      c.timezone('ZZ/TimezoneC', -10, 3, -20, 7, 'C')
-      c.timezone('ZZ/TimezoneD', -10, 3, -20, 7)
-    end
-    
-    assert_equal(['ZZ/TimezoneB', 'ZZ/TimezoneA', 'ZZ/TimezoneC', 'ZZ/TimezoneD'], ci.zone_identifiers)
-    assert(ci.zone_identifiers.frozen?)
-  end
-  
-  def test_zones_empty
-    ci = CountryInfo.new('ZZ', 'Zzz') {|c| }
-    assert(ci.zones.empty?)
-    assert(ci.zones.frozen?)
-  end
-  
-  def test_zones_no_block
-    ci = CountryInfo.new('ZZ', 'Zzz')
-    assert(ci.zones.empty?)
-    assert(ci.zones.frozen?)
-  end
-  
-  def test_zones
-    ci = CountryInfo.new('ZZ', 'Zzz') do |c|
-      assert_same(ci, c)
-      c.timezone('ZZ/TimezoneB', 1, 2, 1, 2, 'Timezone B')
-      c.timezone('ZZ/TimezoneA', 1, 4, 1, 4, 'Timezone A')
-      c.timezone('ZZ/TimezoneC', -10, 3, -20, 7, 'C')
-      c.timezone('ZZ/TimezoneD', -10, 3, -20, 7)
-    end
-    
-    assert_equal([CountryTimezone.new('ZZ/TimezoneB', 1, 2, 1, 2, 'Timezone B'),
-      CountryTimezone.new('ZZ/TimezoneA', 1, 4, 1, 4, 'Timezone A'),
-      CountryTimezone.new('ZZ/TimezoneC', -10, 3, -20, 7, 'C'),
-      CountryTimezone.new('ZZ/TimezoneD', -10, 3, -20, 7)],
-      ci.zones)
-    assert(ci.zones.frozen?)
-  end    
 end

data/test/tc_country_timezone.rb

@@ -1,6 +1,26 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo'
+#--
+# Copyright (c) 2006-2013 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 the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils')
 
 include TZInfo