tzinfo 1.1.0 → 1.2.0

data/lib/tzinfo/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.
-#++
-
 require 'thread'
 
 module TZInfo
@@ -81,6 +59,7 @@ module TZInfo
     #   TZInfo::DataSource.set(:ruby)
     #   TZInfo::DataSource.set(:zoneinfo)
     #   TZInfo::DataSource.set(:zoneinfo, zoneinfo_dir)
+    #   TZInfo::DataSource.set(:zoneinfo, zoneinfo_dir, iso3166_tab_file)
     #
     # \DataSource.set(:zoneinfo) will automatically search for the zoneinfo
     # directory by checking the paths specified in 
@@ -91,6 +70,11 @@ module TZInfo
     # directory as the data source. If the directory is not a valid zoneinfo
     # directory, an InvalidZoneinfoDirectory exception will be raised.
     #
+    # \DataSource.set(:zoneinfo, zoneinfo_dir, iso3166_tab_file) uses the
+    # specified zoneinfo directory as the data source, but loads the iso3166.tab
+    # file from an alternate path. If the directory is not a valid zoneinfo
+    # directory, an InvalidZoneinfoDirectory exception will be raised.
+    #
     # Custom data sources can be created by subclassing TZInfo::DataSource and
     # implementing the following methods:
     #
@@ -120,7 +104,6 @@ module TZInfo
       elsif data_source_or_type == :ruby
         @@instance = RubyDataSource.new
       elsif data_source_or_type == :zoneinfo
-        raise ArgumentError, "wrong number of arguments #{args.length} for 1" if args.length > 1
         @@instance = ZoneinfoDataSource.new(*args)
       else
         raise ArgumentError, 'data_source_or_type must be a DataSource instance or a data source type (:ruby)'
@@ -196,7 +179,7 @@ module TZInfo
       begin
         return ZoneinfoDataSource.new
       rescue ZoneinfoDirectoryNotFound
-        raise DataSourceNotFound, 'No timezone data source could be found. To resolve this, either install TZInfo::Data (e.g. by running `gem install tzinfo-data`) or specify a zoneinfo directory using `TZInfo::DataSource.set(:zoneinfo, zoneinfo_path)`.'
+        raise DataSourceNotFound, "No source of timezone data could be found.\nPlease refer to http://tzinfo.github.io/datasourcenotfound for help resolving this error."
       end
     end
   end

data/lib/tzinfo/data_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 based on a DataTimezoneInfo.
@@ -69,5 +47,12 @@ module TZInfo
     def transitions_up_to(utc_to, utc_from = nil)
       info.transitions_up_to(utc_to, utc_from)
     end
+    
+    # Returns the canonical zone for this Timezone.
+    #
+    # For a DataTimezone, this is always self.
+    def canonical_zone
+      self
+    end
   end
 end

data/lib/tzinfo/data_timezone_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 defined timezone containing transition data.
   class DataTimezoneInfo < TimezoneInfo  

data/lib/tzinfo/info_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 based on a TimezoneInfo.

data/lib/tzinfo/linked_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 based on a LinkedTimezoneInfo.
@@ -69,6 +47,13 @@ module TZInfo
       @linked_timezone.transitions_up_to(utc_to, utc_from)
     end
     
+    # Returns the canonical zone for this Timezone.
+    #
+    # For a LinkedTimezone, this is the canonical zone of the link target.
+    def canonical_zone
+      @linked_timezone.canonical_zone
+    end
+    
     protected
       def setup(info)
         super(info)

data/lib/tzinfo/linked_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 that is defined as a link or alias to another zone.
   class LinkedTimezoneInfo < TimezoneInfo

data/lib/tzinfo/offset_rationals.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.
-#++
-
 require 'rational' unless defined?(Rational)
 
 module TZInfo

data/lib/tzinfo/ruby_core_support.rb

@@ -1,25 +1,3 @@
-#--
-# 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.
-#++
-
 require 'date'
 require 'rational' unless defined?(Rational)
 
@@ -150,5 +128,19 @@ module TZInfo
         str
       end
     end
+    
+    
+    # Wrapper for File.open that supports passing hash options for specifying
+    # encodings on Ruby 1.9+. The options are ignored on earlier versions of
+    # Ruby.
+    if RUBY_VERSION =~ /\A1\.[0-8]\./
+      def self.open_file(file_name, mode, opts, &block)
+        File.open(file_name, mode, &block)
+      end
+    else
+      def self.open_file(file_name, mode, opts, &block)
+        File.open(file_name, mode, opts, &block)
+      end
+    end
   end
 end

data/lib/tzinfo/ruby_country_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 information about a country returned by RubyDataSource.
   #
@@ -38,7 +16,7 @@ module TZInfo
     # Returns a frozen array of all the zone identifiers for the country. These
     # are in the order they were added using the timezone method.
     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.
@@ -54,7 +32,7 @@ module TZInfo
     # CountryTimezone instances. These are in the order they were added using 
     # the timezone method.
     def zones
-      # Thread-safey: It is possible that the value of @zones may be 
+      # Thread-safety: It is possible that the value of @zones may be 
       # calculated multiple times in concurrently executing threads. It is not 
       # worth the overhead of locking to ensure that @zones is only 
       # calculated once.
@@ -83,7 +61,7 @@ module TZInfo
       # Called by the index data to define a timezone for the country.
       def timezone(identifier, latitude_numerator, latitude_denominator, 
                    longitude_numerator, longitude_denominator, description = nil)          
-        @list << CountryTimezone.new(identifier, latitude_numerator, 
+        @list << CountryTimezone.new!(identifier, latitude_numerator, 
           latitude_denominator, longitude_numerator, longitude_denominator,
           description)     
       end

data/lib/tzinfo/ruby_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
   # A DataSource that loads data from the set of Ruby modules included in the
   # TZInfo::Data library (tzinfo-data gem).
@@ -59,7 +37,7 @@ module TZInfo
           m = m.const_get(part)
         }
         
-        info = m.get
+        m.get
       rescue LoadError, NameError => e
         raise InvalidTimezoneIdentifier, e.message
       end

data/lib/tzinfo/time_or_datetime.rb

@@ -1,27 +1,5 @@
-#--
-# 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 'date'
-require 'rational'
+require 'rational' unless defined?(Rational)
 require 'time'
 
 module TZInfo
@@ -48,7 +26,7 @@ module TZInfo
         nsec = RubyCoreSupport.time_nsec(@time)
         usec = nsec % 1000 == 0 ? nsec / 1000 : Rational(nsec, 1000)
         
-        @time = Time.utc(@time.year, @time.mon, @time.mday, @time.hour, @time.min, @time.sec, usec) unless @time.zone == 'UTC'        
+        @time = Time.utc(@time.year, @time.mon, @time.mday, @time.hour, @time.min, @time.sec, usec) unless @time.utc?        
         @orig = @time
       elsif timeOrDateTime.is_a?(DateTime)
         @datetime = timeOrDateTime
@@ -70,7 +48,7 @@ module TZInfo
     # When converting from a DateTime, the result is truncated to microsecond
     # precision.
     def to_time
-      # Thread-safey: It is possible that the value of @time may be 
+      # Thread-safety: It is possible that the value of @time may be 
       # calculated multiple times in concurrently executing threads. It is not 
       # worth the overhead of locking to ensure that @time is only 
       # calculated once.
@@ -91,7 +69,7 @@ module TZInfo
     # When converting from a Time, the result is truncated to microsecond
     # precision.
     def to_datetime
-      # Thread-safey: It is possible that the value of @datetime may be 
+      # Thread-safety: It is possible that the value of @datetime may be 
       # calculated multiple times in concurrently executing threads. It is not 
       # worth the overhead of locking to ensure that @datetime is only 
       # calculated once.
@@ -108,7 +86,7 @@ module TZInfo
     
     # Returns the time as an integer timestamp.
     def to_i
-      # Thread-safey: It is possible that the value of @timestamp may be 
+      # Thread-safety: It is possible that the value of @timestamp may be 
       # calculated multiple times in concurrently executing threads. It is not 
       # worth the overhead of locking to ensure that @timestamp is only 
       # calculated once.
@@ -230,11 +208,19 @@ module TZInfo
     # whether the receiver is less than, equal to, or greater than 
     # timeOrDateTime.
     #
+    # Returns nil if the passed in timeOrDateTime is not comparable with 
+    # TimeOrDateTime instances.
+    #
     # Comparisons involving a DateTime will be performed using DateTime#<=>.
     # Comparisons that don't involve a DateTime, but include a Time will be
     # performed with Time#<=>. Otherwise comparisons will be performed with
     # Integer#<=>.    
     def <=>(timeOrDateTime)
+      return nil unless timeOrDateTime.is_a?(TimeOrDateTime) || 
+                        timeOrDateTime.is_a?(Time) ||
+                        timeOrDateTime.is_a?(DateTime) ||
+                        timeOrDateTime.respond_to?(:to_i)
+    
       unless timeOrDateTime.is_a?(TimeOrDateTime)
         timeOrDateTime = TimeOrDateTime.wrap(timeOrDateTime)
       end