tzinfo 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 662b2ec751b579f7b20de43697598ccee07c838f
-  data.tar.gz: 43e394c6175dc6e679880591e067e6914b829ee0
+  metadata.gz: e48380a40bf9c0b26cf7b925cbe0eef6d198130c
+  data.tar.gz: d2fbd737fd05d0e56d8835ab85f1de51338971a6
 SHA512:
-  metadata.gz: 1eb4f019dff8e7c6f919bb17f24623afa1cc2fccdcd6f9a8271f0e9a25e7370eb0b75ceeab74278c7e113c93e75ecd6d3989517a8fe8001aecaf49e670e4ce79
-  data.tar.gz: 82f8436074597dc911c84de7e684b6326c95dc05422146f91771c2696bd0d16ce635428bc9fbc3c8cac0a09b128ba20282a72fa12d571cd8c942fed538f6759e
+  metadata.gz: 2a631f6a845f0547389417def1880190f16d7d761d75dcbf940c9c15cc96b884f3f30f5afce7ac76ac64361ae020158615096fa7e48897e2b635e5249827be8a
+  data.tar.gz: e06467b2b159ce423db5d2ef55c5eab9f2ee3c7f912b58268ea160d1047da576af46613378aa6a2b7d579ca6a4365edb036597f7fa9e85a5261e4768578862c5

data/CHANGES.md

@@ -1,3 +1,22 @@
+Version 1.2.0 - 26-May-2014
+---------------------------
+
+* Raise the minimum supported Ruby version to 1.8.7.
+* Support loading system zoneinfo data on FreeBSD, OpenBSD and Solaris.
+  Resolves #15.
+* Add canonical_identifier and canonical_zone methods to Timezone. Resolves #16.
+* Add a link to a DataSourceNotFound help page in the TZInfo::DataSourceNotFound
+  exception message.
+* Load iso3166.tab and zone.tab files as UTF-8.
+* Fix Timezone#local_to_utc returning local Time instances on systems using UTC
+  as the local time zone. Resolves #13.
+* Fix == methods raising an exception when passed an instance of a different
+  class by making <=> return nil if passed a non-comparable argument.
+* Eliminate "require 'rational'" warnings. Resolves #10.
+* Eliminate "assigned but unused variable - info" warnings. Resolves #11.
+* Switch to minitest v5 for unit tests. Resolves #18.
+
+
 Version 1.1.0 - 25-Sep-2013
 ---------------------------
 
@@ -52,6 +71,20 @@ Version 1.0.0 - 2-Jun-2013
   use other TimezonePeriod instance methods instead (issue #7655).
 
 
+Version 0.3.39 (tzdata v2014a) - 9-Mar-2014
+-------------------------------------------
+
+* Updated to tzdata version 2014a
+  (http://mm.icann.org/pipermail/tz-announce/2014-March/000018.html).
+
+
+Version 0.3.38 (tzdata v2013g) - 8-Oct-2013
+-------------------------------------------
+
+* Updated to tzdata version 2013g
+  (http://mm.icann.org/pipermail/tz-announce/2013-October/000015.html).
+
+
 Version 0.3.37 (tzdata v2013b) - 11-Mar-2013
 --------------------------------------------
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2013 Philip Ross
+Copyright (c) 2005-2014 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/README.md

@@ -1,6 +1,8 @@
 TZInfo - Ruby Timezone Library
 ==============================
 
+[![Gem Version](https://badge.fury.io/rb/tzinfo.svg)](http://badge.fury.io/rb/tzinfo) [![Build Status](https://travis-ci.org/tzinfo/tzinfo.svg?branch=master)](https://travis-ci.org/tzinfo/tzinfo)
+
 [TZInfo](http://tzinfo.github.io) provides daylight savings aware 
 transformations between times in different timezones.
 
@@ -17,17 +19,19 @@ TZInfo requires a source of timezone data. There are two built-in options:
    [IANA Time Zone Database](http://www.iana.org/time-zones).
 
 By default, TZInfo::Data will be used. If TZInfo::Data is not available (i.e. 
-if require 'tzinfo/data' fails), then TZInfo will search for a zoneinfo
+if `require 'tzinfo/data'` fails), then TZInfo will search for a zoneinfo
 directory instead (using the search path specified by 
-TZInfo::ZoneinfoDataSource::DEFAULT_SEARCH_PATH).
+`TZInfo::ZoneinfoDataSource::DEFAULT_SEARCH_PATH`).
 
-If no data source can be found, a TZInfo::DataSourceNotFound exception will be
-raised when TZInfo is used.
+If no data source can be found, a `TZInfo::DataSourceNotFound` exception will be
+raised when TZInfo is used. Further information is available 
+[in the wiki](http://tzinfo.github.io/datasourcenotfound) to help with 
+resolving `TZInfo::DataSourceNotFound` errors.
 
 The default data source selection can be overridden using 
-TZInfo::DataSource.set.
+`TZInfo::DataSource.set`.
 
-Custom data sources can also be used. See TZInfo::DataSource.set for
+Custom data sources can also be used. See `TZInfo::DataSource.set` for
 further details.
 
 
@@ -48,24 +52,24 @@ Example Usage
 -------------
 
 The following code will obtain the America/New_York timezone (as an instance
-of TZInfo::Timezone) and covert a time in UTC to local New York time:
+of `TZInfo::Timezone`) and convert a time in UTC to local New York time:
 
     require 'tzinfo'
     
     tz = TZInfo::Timezone.get('America/New_York')
     local = tz.utc_to_local(Time.utc(2005,8,29,15,35,0))
 
-Note that the local Time returned will have a UTC timezone (local.zone will 
-return "UTC"). This is because the Ruby Time class only supports two timezones: 
+Note that the local Time returned will have a UTC timezone (`local.zone` will 
+return `"UTC"`). This is because the Ruby Time class only supports two timezones: 
 UTC and the current system local timezone.
   
-To convert from a local time to UTC, the local_to_utc method can be used as
+To convert from a local time to UTC, the `local_to_utc` method can be used as
 follows:
 
     utc = tz.local_to_utc(local)
 
 Note that the timezone information of the local Time object is ignored (TZInfo
-will just read the date and time and treat them as if there were in the 'tz'
+will just read the date and time and treat them as if there were in the `tz`
 timezone). The following two lines will return the same result regardless of 
 the system's local timezone:
 
@@ -73,50 +77,51 @@ the system's local timezone:
     tz.local_to_utc(Time.utc(2006,6,26,1,0,0))
   
 To obtain information about the rules in force at a particular UTC or local 
-time, the TZInfo::Timezone.period_for_utc and TZInfo::Timezone.period_for_local
-methods can be used. Both of these methods return TZInfo::TimezonePeriod 
-objects. The following gets the identifier for the period (in this case EDT).
+time, the `TZInfo::Timezone.period_for_utc` and 
+`TZInfo::Timezone.period_for_local` methods can be used. Both of these methods 
+return `TZInfo::TimezonePeriod` objects. The following gets the identifier for 
+the period (in this case EDT).
 
     period = tz.period_for_utc(Time.utc(2005,8,29,15,35,0))
     id = period.zone_identifier
   
-The current local time in a Timezone can be obtained with the 
-TZInfo::Timezone#now method:
+The current local time in a `Timezone` can be obtained with the 
+`TZInfo::Timezone#now` method:
 
     now = tz.now
 
-All methods in TZInfo that operate on a time can be used with either Time or 
-DateTime instances or with Integer timestamps (i.e. as returned by Time#to_i). 
-The type of the values returned will match the the type passed in.
+All methods in TZInfo that operate on a time can be used with either `Time` or 
+`DateTime` instances or with nteger timestamps (i.e. as returned by 
+`Time#to_i`). The type of the values returned will match the the type passed in.
 
-A list of all the available Timezone identifiers can be obtained using the
-TZInfo::Timezone.all_identifiers method. TZInfo::Timezone.all can be called
-to get an Array of all the TZInfo::Timezone instances.
+A list of all the available timezone identifiers can be obtained using the
+`TZInfo::Timezone.all_identifiers` method. `TZInfo::Timezone.all` can be called
+to get an `Array` of all the `TZInfo::Timezone` instances.
 
 Timezones can also be accessed by country (using an ISO 3166-1 alpha-2 country 
-code). The following code retrieves the TZInfo::Country instance representing 
-the USA (country code 'US') and then gets all the Timezone identifiers used in 
+code). The following code retrieves the `TZInfo::Country` instance representing 
+the USA (country code 'US') and then gets all the timezone identifiers used in 
 the USA.
 
     us = TZInfo::Country.get('US')
     timezones = us.zone_identifiers
   
-The TZInfo::Country#zone_info method provides an additional description and 
-geographic location for each Timezone in a Country.
+The `TZInfo::Country#zone_info` method provides an additional description and 
+geographic location for each timezone in a country.
 
 A list of all the available country codes can be obtained using the
-TZInfo::Country.all_codes method. TZInfo::Country.all can be called to get an 
-Array of all the Country instances.
+`TZInfo::Country.all_codes` method. `TZInfo::Country.all` can be called to get 
+an `Array` of all the `Country` instances.
   
 For further detail, please refer to the API documentation for the 
-TZInfo::Timezone and TZInfo::Country classes.
+`TZInfo::Timezone` and `TZInfo::Country` classes.
 
 
 Thread-Safety
 -------------
 
-The TZInfo::Country and TZInfo::Timezone classes are thread-safe. It is safe to 
-use class and instance methods of TZInfo::Country and TZInfo::Timezone in 
+The `TZInfo::Country` and `TZInfo::Timezone` classes are thread-safe. It is safe
+to use class and instance methods of `TZInfo::Country` and `TZInfo::Timezone` in 
 concurrently executing threads. Instances of both classes can be shared across 
 thread boundaries.
 

data/Rakefile

@@ -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 'rubygems'
 require 'rubygems/package_task'
 require 'fileutils'
@@ -53,7 +31,22 @@ class TZInfoPackageTask < Gem::PackageTask
   end
 end
 
-package_task = TZInfoPackageTask.new(spec) do |pkg|
+def add_signing_key(spec)
+  # Attempt to find the private key and add options to sign the gem if found.
+  private_key_path = File.expand_path(File.join(BASE_DIR, '..', 'key', 'gem-private_key.pem'))
+  
+  if File.exist?(private_key_path)
+    spec = spec.clone
+    spec.signing_key = private_key_path
+    spec.cert_chain = [File.join(BASE_DIR, 'gem-public_cert.pem')]
+  else
+    puts 'WARNING: Private key not found. Not signing gem file.'
+  end
+  
+  spec
+end
+
+package_task = TZInfoPackageTask.new(add_signing_key(spec)) do |pkg|
   pkg.need_zip = true
   pkg.need_tar_gz = true
   pkg.tar_command = '__tar_with_owner__'
@@ -99,6 +92,7 @@ end
 def setup_tests(test_task, type)
   test_task.libs = [File.join(BASE_DIR, 'lib')]
   test_task.pattern = File.join(BASE_DIR, 'test', "ts_all_#{type}.rb")
+  test_task.warning = true
 end
 
 Rake::TestTask.new(:test_ruby) do |t|

data/lib/tzinfo.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.
-#++
-
 # Top level module for TZInfo.
 module TZInfo
 end

data/lib/tzinfo/country.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 'thread_safe'
 
 module TZInfo
@@ -154,7 +132,10 @@ module TZInfo
         
     # Compare two Countries based on their code. Returns -1 if c is less
     # than self, 0 if c is equal to self and +1 if c is greater than self.
+    #
+    # Returns nil if c is not comparable with Country instances.
     def <=>(c)
+      return nil unless c.is_a?(Country)
       code <=> c.code
     end
     

data/lib/tzinfo/country_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 country index file includes CountryIndexDefinition which provides
   # a country method used to define each country in the index.

data/lib/tzinfo/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 a country and references to its timezones as returned by a
   # DataSource.

data/lib/tzinfo/country_timezone.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
   # A Timezone within a Country. This contains extra information about the
   # Timezone that is specific to the Country (a Timezone could be used by
@@ -33,19 +11,54 @@ module TZInfo
     # Timezone.
     attr_reader :description
     
+    class << self
+      # Creates a new CountryTimezone with a timezone identifier, latitude,
+      # longitude and description. The latitude and longitude are specified as
+      # rationals - a numerator and denominator. For performance reasons, the 
+      # numerators and denominators must be specified in their lowest form.
+      #
+      # For use internally within TZInfo.
+      #
+      # @!visibility private
+      alias :new! :new
+      
+      # Creates a new CountryTimezone with a timezone identifier, latitude,
+      # longitude and description. The latitude and longitude must be specified
+      # as instances of Rational.
+      #
+      # CountryTimezone instances should normally only be constructed when
+      # creating new DataSource implementations.
+      def new(identifier, latitude, longitude, description = nil)
+        super(identifier, latitude, nil, longitude, nil, description)      
+      end
+    end
+    
     # Creates a new CountryTimezone with a timezone identifier, latitude,
     # longitude and description. The latitude and longitude are specified as
     # rationals - a numerator and denominator. For performance reasons, the 
     # numerators and denominators must be specified in their lowest form.
     #
-    # CountryTimezone instances should not normally be constructed manually.
+    # @!visibility private
     def initialize(identifier, latitude_numerator, latitude_denominator, 
                    longitude_numerator, longitude_denominator, description = nil) #:nodoc:
       @identifier = identifier
-      @latitude_numerator = latitude_numerator
-      @latitude_denominator = latitude_denominator
-      @longitude_numerator = longitude_numerator
-      @longitude_denominator = longitude_denominator      
+      
+      if latitude_numerator.kind_of?(Rational)
+        @latitude = latitude_numerator
+      else
+        @latitude = nil
+        @latitude_numerator = latitude_numerator
+        @latitude_denominator = latitude_denominator
+      end
+      
+      if longitude_numerator.kind_of?(Rational)
+        @longitude = longitude_numerator
+      else
+        @longitude = nil
+        @longitude_numerator = longitude_numerator
+        @longitude_denominator = longitude_denominator
+      end
+        
       @description = description
     end
     
@@ -62,7 +75,7 @@ module TZInfo
     
     # The latitude of this timezone in degrees as a Rational.
     def latitude
-      # Thread-safey: It is possible that the value of @latitude may be 
+      # Thread-safety: It is possible that the value of @latitude may be 
       # calculated multiple times in concurrently executing threads. It is not 
       # worth the overhead of locking to ensure that @latitude is only 
       # calculated once.
@@ -71,7 +84,7 @@ module TZInfo
     
     # The longitude of this timezone in degrees as a Rational.
     def longitude
-      # Thread-safey: It is possible that the value of @longitude may be 
+      # Thread-safety: It is possible that the value of @longitude may be 
       # calculated multiple times in concurrently executing threads. It is not 
       # worth the overhead of locking to ensure that @longitude is only 
       # calculated once.
@@ -96,8 +109,10 @@ module TZInfo
     
     # Returns a hash of this CountryTimezone. 
     def hash
-      @identifier.hash ^ @latitude_numerator.hash ^ @latitude_denominator.hash ^ 
-        @longitude_numerator.hash ^ @longitude_denominator.hash ^ @description.hash
+      @identifier.hash ^ 
+        (@latitude ? @latitude.numerator.hash ^ @latitude.denominator.hash : @latitude_numerator.hash ^ @latitude_denominator.hash) ^
+        (@longitude ? @longitude.numerator.hash ^ @longitude.denominator.hash : @longitude_numerator.hash ^ @longitude_denominator.hash) ^
+        @description.hash
     end
     
     # Returns internal object state as a programmer-readable string.