tzinfo 1.1.0 → 1.2.0

data/lib/tzinfo/timezone.rb

@@ -1,25 +1,3 @@
-#--
-# 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 'date'
 require 'set'
 require 'thread_safe'
@@ -327,6 +305,45 @@ module TZInfo
       raise UnknownTimezone, 'TZInfo::Timezone constructed directly'
     end
     
+    # Returns the canonical Timezone instance for this Timezone.
+    #
+    # The IANA Time Zone database contains two types of definition: Zones and 
+    # Links. Zones are defined by rules that set out when transitions occur. 
+    # Links are just references to fully defined Zone, creating an alias for 
+    # that Zone.
+    #
+    # Links are commonly used where a time zone has been renamed in a 
+    # release of the Time Zone database. For example, the Zone US/Eastern was 
+    # renamed as America/New_York. A US/Eastern Link was added in its place,
+    # linking to (and creating an alias for) for America/New_York.
+    #
+    # Links are also used for time zones that are currently identical to a full 
+    # Zone, but that are administered seperately. For example, Europe/Vatican is
+    # a Link to (and alias for) Europe/Rome.
+    #
+    # For a full Zone, canonical_zone returns self.
+    #
+    # For a Link, canonical_zone returns a Timezone instance representing the 
+    # full Zone that the link targets.
+    #
+    # TZInfo can be used with different data sources (see the documentation for
+    # TZInfo::DataSource). Please note that some DataSource implementations may 
+    # not support distinguishing between full Zones and Links and will treat all
+    # time zones as full Zones. In this case, the canonical_zone will always 
+    # return self.
+    #
+    # There are two built-in DataSource implementations. RubyDataSource (which
+    # will be used if the tzinfo-data gem is available) supports Link zones.
+    # ZoneinfoDataSource returns Link zones as if they were full Zones. If the 
+    # canonical_zone or canonical_identifier methods are required, the 
+    # tzinfo-data gem should be installed.
+    #
+    # 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'
+    end
+    
     # Returns the TimezonePeriod for the given local time. local can either be
     # a DateTime, Time or integer timestamp (Time.to_i). Any timezone 
     # information in local is ignored (it is treated as a time in the current 
@@ -514,6 +531,14 @@ module TZInfo
       end
     end
     
+    # Returns the canonical identifier for this Timezone.
+    #
+    # This is a shortcut for calling canonical_zone.identifier. Please refer
+    # to the canonical_zone documentation for further information.
+    def canonical_identifier
+      canonical_zone.identifier
+    end
+    
     # Returns the current time in the timezone as a Time.
     def now
       utc_to_local(Time.now.utc)
@@ -558,10 +583,13 @@ module TZInfo
     
     # Compares two Timezones based on their identifier. Returns -1 if tz is less
     # than self, 0 if tz is equal to self and +1 if tz is greater than self.
+    #
+    # Returns nil if tz is not comparable with Timezone instances.
     def <=>(tz)
+      return nil unless tz.is_a?(Timezone)
       identifier <=> tz.identifier
     end
-    
+
     # Returns true if and only if the identifier of tz is equal to the 
     # identifier of this Timezone.
     def eql?(tz)

data/lib/tzinfo/timezone_definition.rb

@@ -1,25 +1,3 @@
-#--
-# 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.
-#++
-
 module TZInfo
   
   # TimezoneDefinition is included into Timezone definition modules.

data/lib/tzinfo/timezone_index_definition.rb

@@ -1,25 +1,3 @@
-#--
-# 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.
-#++
-
 module TZInfo
   # The timezone index file includes TimezoneIndexDefinition which provides
   # methods used to define timezones in the index.

data/lib/tzinfo/timezone_info.rb

@@ -1,25 +1,3 @@
-#--
-# 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.
-#++
-
 module TZInfo
   # Represents a timezone defined by a data source.
   class TimezoneInfo

data/lib/tzinfo/timezone_offset.rb

@@ -1,25 +1,3 @@
-#--
-# 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.
-#++
-
 module TZInfo
   # Represents an offset defined in a Timezone data file.
   class TimezoneOffset

data/lib/tzinfo/timezone_period.rb

@@ -1,25 +1,3 @@
-#--
-# 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.
-#++
-
 module TZInfo
   # A period of time in a timezone where the same offset from UTC applies.
   #
@@ -87,7 +65,7 @@ module TZInfo
     
     # Total offset from UTC (days). Result is a Rational.
     def utc_total_offset_rational
-      # Thread-safey: It is possible that the value of 
+      # Thread-safety: It is possible that the value of 
       # @utc_total_offset_rational may be calculated multiple times in 
       # concurrently executing threads. It is not worth the overhead of locking
       # to ensure that @zone_identifiers is only calculated once.

data/lib/tzinfo/timezone_proxy.rb

@@ -1,25 +1,3 @@
-#--
-# 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.
-#++
-
 module TZInfo
 
   # A proxy class representing a timezone with a given identifier. TimezoneProxy
@@ -60,6 +38,11 @@ module TZInfo
       real_timezone.periods_for_local(local)
     end
     
+    # Returns the canonical zone for this Timezone.
+    def canonical_zone
+      real_timezone.canonical_zone
+    end
+    
     # Dumps this TimezoneProxy for marshalling.
     def _dump(limit)
       identifier
@@ -77,7 +60,7 @@ module TZInfo
       end  
     
       def real_timezone
-        # Thread-safey: It is possible that the value of @real_timezone may be 
+        # Thread-safety: It is possible that the value of @real_timezone may be 
         # calculated multiple times in concurrently executing threads. It is not 
         # worth the overhead of locking to ensure that @real_timezone is only 
         # calculated once.

data/lib/tzinfo/timezone_transition.rb

@@ -1,25 +1,3 @@
-#--
-# 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.
-#++
-
 module TZInfo
   # Represents a transition from one timezone offset to another at a particular
   # date and time.
@@ -60,7 +38,7 @@ module TZInfo
     # causes the previous observance to end (calculated from at using 
     # previous_offset).
     def local_end_at
-      # Thread-safey: It is possible that the value of @local_end_at may be
+      # Thread-safety: It is possible that the value of @local_end_at may be
       # calculated multiple times in concurrently executing threads. It is not 
       # worth the overhead of locking to ensure that @local_end_at is only
       # calculated once.
@@ -84,7 +62,7 @@ module TZInfo
     # A TimeOrDateTime instance representing the local time when this transition
     # causes the next observance to start (calculated from at using offset).
     def local_start_at
-      # Thread-safey: It is possible that the value of @local_start_at may be
+      # Thread-safety: It is possible that the value of @local_start_at may be
       # calculated multiple times in concurrently executing threads. It is not 
       # worth the overhead of locking to ensure that @local_start_at is only
       # calculated once.

data/lib/tzinfo/timezone_transition_definition.rb

@@ -1,25 +1,3 @@
-#--
-# Copyright (c) 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
   # A TimezoneTransition defined by as integer timestamp, as a rational to
   # create a DateTime or as both.
@@ -88,7 +66,7 @@ module TZInfo
     # A TimeOrDateTime instance representing the UTC time when this transition
     # occurs.
     def at
-      # Thread-safey: It is possible that the value of @at may be calculated
+      # Thread-safety: It is possible that the value of @at may be calculated
       # multiple times in concurrently executing threads. It is not worth the
       # overhead of locking to ensure that @at is only calculated once.
       

data/lib/tzinfo/transition_data_timezone_info.rb

@@ -1,25 +1,3 @@
-#--
-# 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.
-#++
-
 module TZInfo
   # Raised if no offsets have been defined when calling period_for_utc or
   # periods_for_local. Indicates an error in the timezone data.

data/lib/tzinfo/zoneinfo_country_info.rb

@@ -1,25 +1,3 @@
-#--
-# Copyright (c) 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  
   # Represents information about a country returned by ZoneinfoDataSource.
   #
@@ -36,7 +14,7 @@ module TZInfo
     # Returns a frozen array of all the zone identifiers for the country ordered
     # geographically, most populous first.
     def zone_identifiers
-      # Thread-safey: It is possible that the value of @zone_identifiers may be 
+      # Thread-safety: It is possible that the value of @zone_identifiers may be 
       # calculated multiple times in concurrently executing threads. It is not 
       # worth the overhead of locking to ensure that @zone_identifiers is only 
       # calculated once.

data/lib/tzinfo/zoneinfo_data_source.rb

@@ -1,25 +1,3 @@
-#--
-# Copyright (c) 2012-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 InvalidZoneinfoDirectory exception is raised if the DataSource is
   # set to a specific zoneinfo path, which is not a valid zoneinfo directory
@@ -95,12 +73,19 @@ module TZInfo
   # zoneinfo support, then you may want to consider using TZInfo::RubyDataSource 
   # instead.
   class ZoneinfoDataSource < DataSource
-    # The default value of ZoneInfoDataSource.search_path.
+    # The default value of ZoneinfoDataSource.search_path.
     DEFAULT_SEARCH_PATH = ['/usr/share/zoneinfo', '/usr/share/lib/zoneinfo', '/etc/zoneinfo'].freeze
     
+    # The default value of ZoneinfoDataSource.alternate_iso3166_tab_search_path.
+    DEFAULT_ALTERNATE_ISO3166_TAB_SEARCH_PATH = ['/usr/share/misc/iso3166.tab', '/usr/share/misc/iso3166'].freeze
+    
     # Paths to be checked to find the system zoneinfo directory.
     @@search_path = DEFAULT_SEARCH_PATH.dup
     
+    # Paths to possible alternate iso3166.tab files (used to locate the 
+    # system-wide iso3166.tab files on FreeBSD and OpenBSD).
+    @@alternate_iso3166_tab_search_path = DEFAULT_ALTERNATE_ISO3166_TAB_SEARCH_PATH.dup
+    
     # An Array of directories that will be checked to find the system zoneinfo
     # directory.
     #
@@ -121,15 +106,31 @@ module TZInfo
     #
     # Set to nil to revert to the default paths.
     def self.search_path=(search_path)
-      if search_path
-        if search_path.kind_of?(String)
-          @@search_path = search_path.split(File::PATH_SEPARATOR)
-        else
-          @@search_path = search_path.collect {|p| p.to_s}
-        end
-      else
-        @@search_path = DEFAULT_SEARCH_PATH.dup
-      end
+      @@search_path = process_search_path(search_path, DEFAULT_SEARCH_PATH)      
+    end
+    
+    # An Array of paths that will be checked to find an alternate iso3166.tab 
+    # file if one was not included in the zoneinfo directory (for example, on 
+    # FreeBSD and OpenBSD systems).
+    #
+    # Paths are checked in the order they appear in the array.
+    #
+    # The default value is ['/usr/share/misc/iso3166.tab', '/usr/share/misc/iso3166'].
+    def self.alternate_iso3166_tab_search_path
+      @@alternate_iso3166_tab_search_path
+    end
+    
+    # Sets the paths to check to locate an alternate iso3166.tab file if one was
+    # not included in the zoneinfo directory.
+    #
+    # Can be set to an Array of directories or a String containing directories
+    # separated with File::PATH_SEPARATOR.
+    #
+    # Paths are checked in the order they appear in the array.
+    #
+    # Set to nil to revert to the default paths.
+    def self.alternate_iso3166_tab_search_path=(alternate_iso3166_tab_search_path)
+      @@alternate_iso3166_tab_search_path = process_search_path(alternate_iso3166_tab_search_path, DEFAULT_ALTERNATE_ISO3166_TAB_SEARCH_PATH)
     end
     
     # The zoneinfo directory being used.
@@ -138,33 +139,50 @@ module TZInfo
     # Creates a new ZoneinfoDataSource.
     #
     # If zoneinfo_dir is specified, it will be checked and used as the source
-    # of zoneinfo files. If the directory does not contain zone.tab and 
-    # iso3166.tab files, InvalidZoneinfoDirectory will be raised.
+    # of zoneinfo files. 
+    #
+    # The directory must contain iso3166.tab and zone.tab files. These may 
+    # either be included in the root of the directory or in a 'tab' 
+    # sub-directory named 'country.tab' and 'zone_sun.tab' respectively (as is
+    # the case on Solaris.
+    #
+    # Additionally, the path to iso3166.tab can be overridden using the 
+    # alternate_iso3166_tab_path parameter.
+    #
+    # InvalidZoneinfoDirectory will be raised if the iso3166.tab and zone.tab
+    # files cannot be found using the zoneinfo_dir and alternate_iso3166_tab_path
+    # parameters.
     # 
     # If zoneinfo_dir is not specified or nil, the paths referenced in
     # search_path are searched in order to find a valid zoneinfo directory 
-    # (one that contains files named zone.tab and iso3166.tab). If no valid 
-    # zoneinfo directory is found ZoneinfoDirectoryNotFound will be raised.
-    def initialize(zoneinfo_dir = nil)
+    # (one that contains zone.tab and iso3166.tab files as above).
+    #
+    # The paths referenced in alternate_iso3166_tab_search_path are also
+    # searched to find an iso3166.tab file if one of the searched zoneinfo
+    # directories doesn't contain an iso3166.tab file.
+    # 
+    # If no valid directory can be found by searching, ZoneinfoDirectoryNotFound
+    # will be raised.
+    def initialize(zoneinfo_dir = nil, alternate_iso3166_tab_path = nil)
       if zoneinfo_dir
-        unless valid_zoneinfo_dir?(zoneinfo_dir)
+        iso3166_tab_path, zone_tab_path = validate_zoneinfo_dir(zoneinfo_dir, alternate_iso3166_tab_path)
+      
+        unless iso3166_tab_path && zone_tab_path
           raise InvalidZoneinfoDirectory, "#{zoneinfo_dir} is not a directory or doesn't contain iso3166.tab and zone.tab files." 
         end
+        
         @zoneinfo_dir = zoneinfo_dir
       else
-        @zoneinfo_dir = self.class.search_path.detect do |path|
-          valid_zoneinfo_dir?(path)
-        end
+        @zoneinfo_dir, iso3166_tab_path, zone_tab_path = find_zoneinfo_dir
         
-        unless @zoneinfo_dir
+        unless @zoneinfo_dir && iso3166_tab_path && zone_tab_path
           raise ZoneinfoDirectoryNotFound, "None of the paths included in TZInfo::ZoneinfoDataSource.search_path are valid zoneinfo directories."
         end
       end
       
       @zoneinfo_dir = File.expand_path(@zoneinfo_dir).freeze
-      @zoneinfo_prefix = (@zoneinfo_dir + File::SEPARATOR).freeze
       @timezone_index = load_timezone_index.freeze
-      @country_index = load_country_index.freeze
+      @country_index = load_country_index(iso3166_tab_path, zone_tab_path).freeze
     end
     
     # Returns a TimezoneInfo instance for a given identifier. 
@@ -244,10 +262,77 @@ module TZInfo
     
     private
     
-    # Tests whether a path represents a valid zoneinfo directory (i.e.
-    # is a directory and contains zone.tab and iso3166.tab files).
-    def valid_zoneinfo_dir?(path)
-      File.directory?(path) && File.file?(File.join(path, 'zone.tab')) && File.file?(File.join(path, 'iso3166.tab'))
+    # Processes a path for use as the search_path or
+    # alternate_iso3166_tab_search_path.
+    def self.process_search_path(path, default)
+      if path
+        if path.kind_of?(String)
+          path.split(File::PATH_SEPARATOR)
+        else
+          path.collect {|p| p.to_s}
+        end
+      else
+        default.dup
+      end
+    end
+    
+    # Validates a zoneinfo directory and returns the paths to the iso3166.tab 
+    # and zone.tab files if valid. If the directory is not valid, returns nil.
+    #
+    # The path to the iso3166.tab file may be overriden by passing in a path.
+    # This is treated as either absolute or relative to the current working
+    # directory.    
+    def validate_zoneinfo_dir(path, iso3166_tab_path = nil)
+      if File.directory?(path)
+        if iso3166_tab_path
+          return nil unless File.file?(iso3166_tab_path)
+        else
+          iso3166_tab_path = resolve_tab_path(path, 'iso3166.tab', 'country.tab')
+          return nil unless iso3166_tab_path          
+        end
+        
+        zone_tab_path = resolve_tab_path(path, 'zone.tab', 'zone_sun.tab')
+        return nil unless zone_tab_path
+      
+        [iso3166_tab_path, zone_tab_path]
+      else
+        nil
+      end
+    end
+    
+    # Attempts to resolve the path to a tab file given its standard name and
+    # tab sub-directory name (as used on Solaris).
+    def resolve_tab_path(zoneinfo_path, standard_name, tab_name)
+      path = File.join(zoneinfo_path, standard_name)      
+      return path if File.file?(path)
+      
+      path = File.join(zoneinfo_path, 'tab', tab_name)
+      return path if File.file?(path)
+      
+      nil
+    end
+    
+    # Finds a zoneinfo directory using search_path and 
+    # alternate_iso3166_tab_search_path. Returns the paths to the directory,
+    # the iso3166.tab file and the zone.tab file or nil if not found.
+    def find_zoneinfo_dir
+      alternate_iso3166_tab_path = self.class.alternate_iso3166_tab_search_path.detect do |path|
+        File.file?(path)
+      end
+      
+      self.class.search_path.each do |path|
+        # Try without the alternate_iso3166_tab_path first.
+        iso3166_tab_path, zone_tab_path = validate_zoneinfo_dir(path)        
+        return path, iso3166_tab_path, zone_tab_path if iso3166_tab_path && zone_tab_path
+        
+        if alternate_iso3166_tab_path
+          iso3166_tab_path, zone_tab_path = validate_zoneinfo_dir(path, alternate_iso3166_tab_path)        
+          return path, iso3166_tab_path, zone_tab_path if iso3166_tab_path && zone_tab_path
+        end
+      end
+      
+      # Not found.
+      nil
     end
        
     # Scans @zoneinfo_dir and returns an Array of available timezone 
@@ -256,12 +341,13 @@ module TZInfo
       index = []
       
       # Ignoring particular files:
-      # +VERSION is included in Mac OS X.
+      # +VERSION is included on Mac OS X.
       # 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.
       
-      enum_timezones(nil, ['+VERSION', 'localtime', 'posix', 'posixrules', 'right', 'Factory']) do |identifier|
+      enum_timezones(nil, ['+VERSION', 'localtime', 'posix', 'posixrules', 'right', 'src', 'Factory']) do |identifier|
         index << identifier
       end
       
@@ -288,14 +374,31 @@ module TZInfo
     
     # Uses the iso3166.tab and zone.tab files to build an index of the 
     # available countries and their timezones.
-    def load_country_index
-      zones = {}
+    def load_country_index(iso3166_tab_path, zone_tab_path)
+      
+      # Handle standard 3 to 4 column zone.tab files as well as the 4 to 5 
+      # column format used by Solaris.
+      #
+      # On Solaris, an extra column before the comment gives an optional 
+      # linked/alternate timezone identifier (or '-' if not set).
+      #
+      # Additionally, there is a section at the end of the file for timezones
+      # covering regions. These are given lower-case "country" codes. The timezone
+      # identifier column refers to a continent instead of an identifier. These
+      # lines will be ignored by TZInfo.
+      #
+      # Since the last column is optional in both formats, testing for the 
+      # Solaris format is done in two passes. The first pass identifies if there
+      # are any lines using 5 columns.
       
-      File.open(File.join(@zoneinfo_dir, 'zone.tab')) do |file|
+      file_is_5_column = false
+      zone_tab = []
+      
+      RubyCoreSupport.open_file(zone_tab_path, 'r', :external_encoding => 'UTF-8', :internal_encoding => 'UTF-8') do |file|
         file.each_line do |line|
           line.chomp!
           
-          if line =~ /\A([A-Z]{2})\t(?:([+\-])(\d{2})(\d{2})([+\-])(\d{3})(\d{2})|([+\-])(\d{2})(\d{2})(\d{2})([+\-])(\d{3})(\d{2})(\d{2}))\t([^\t]+)(?:\t([^\t]+))?\z/
+          if line =~ /\A([A-Z]{2})\t(?:([+\-])(\d{2})(\d{2})([+\-])(\d{3})(\d{2})|([+\-])(\d{2})(\d{2})(\d{2})([+\-])(\d{3})(\d{2})(\d{2}))\t([^\t]+)(?:\t([^\t]+))?(?:\t([^\t]+))?\z/
             code = $1
             
             if $2
@@ -307,22 +410,35 @@ module TZInfo
             end
             
             zone_identifier = $16
-            description = $17
+            column4 = $17
+            column5 = $18
+            
+            file_is_5_column = true if column5
             
-            (zones[code] ||= []) << 
-              CountryTimezone.new(zone_identifier, latitude.numerator, latitude.denominator, 
-                                  longitude.numerator, longitude.denominator, description)
+            zone_tab << [code, zone_identifier, latitude, longitude, column4, column5]
           end
         end
       end
       
+      zones = {}
+      
+      zone_tab.each do |code, zone_identifier, latitude, longitude, column4, column5|
+        description = file_is_5_column ? column5 : column4
+           
+        (zones[code] ||= []) << CountryTimezone.new(zone_identifier, latitude, longitude, description)
+      end
+      
       countries = {}
       
-      File.open(File.join(@zoneinfo_dir, 'iso3166.tab')) do |file|
+      RubyCoreSupport.open_file(iso3166_tab_path, 'r', :external_encoding => 'UTF-8', :internal_encoding => 'UTF-8') do |file|
         file.each_line do |line|
           line.chomp!
           
-          if line =~ /\A([A-Z]{2})\t(.+)\z/
+          # Handle both the two column alpha-2 and name format used in the tz 
+          # database as well as the 4 column alpha-2, alpha-3, numeric-3 and 
+          # name format used by FreeBSD and OpenBSD.
+          
+          if line =~ /\A([A-Z]{2})(?:\t[A-Z]{3}\t[0-9]{3})?\t(.+)\z/
             code = $1
             name = $2
             countries[code] = ZoneinfoCountryInfo.new(code, name, zones[code] || [])
@@ -333,7 +449,7 @@ module TZInfo
       countries
     end
     
-    # Converts degrees, miunutes and seconds to a Rational
+    # Converts degrees, minutes and seconds to a Rational.
     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