tzinfo 0.3.61 → 1.0.0

data/lib/tzinfo/ruby_core_support.rb

@@ -1,82 +1,152 @@
-#--
-# 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)
-
-module TZInfo
-  
-  # Methods to support different versions of Ruby.
-  #
-  # @private
-  module RubyCoreSupport #:nodoc:
-  
-    # Use Rational.new! for performance reasons in Ruby 1.8.
-    # This has been removed from 1.9, but Rational performs better.        
-    if Rational.respond_to? :new!
-      def self.rational_new!(numerator, denominator = 1)
-        Rational.new!(numerator, denominator)
-      end
-    else
-      def self.rational_new!(numerator, denominator = 1)
-        Rational(numerator, denominator)
-      end
-    end
-    
-    # Ruby 1.8.6 introduced new! and deprecated new0.
-    # Ruby 1.9.0 removed new0.
-    # Ruby trunk revision 31668 removed the new! method.
-    # Still support new0 for better performance on older versions of Ruby (new0 indicates
-    # that the rational has already been reduced to its lowest terms).
-    # Fallback to jd with conversion from ajd if new! and new0 are unavailable.
-    if DateTime.respond_to? :new!
-      def self.datetime_new!(ajd = 0, of = 0, sg = Date::ITALY)
-        DateTime.new!(ajd, of, sg)
-      end
-    elsif DateTime.respond_to? :new0
-      def self.datetime_new!(ajd = 0, of = 0, sg = Date::ITALY)
-        DateTime.new0(ajd, of, sg)
-      end
-    else
-      HALF_DAYS_IN_DAY = rational_new!(1, 2)
-
-      def self.datetime_new!(ajd = 0, of = 0, sg = Date::ITALY)
-        # Convert from an Astronomical Julian Day number to a civil Julian Day number.
-        jd = ajd + of + HALF_DAYS_IN_DAY
-        
-        # Ruby trunk revision 31862 changed the behaviour of DateTime.jd so that it will no
-        # longer accept a fractional civil Julian Day number if further arguments are specified.
-        # Calculate the hours, minutes and seconds to pass to jd.
-        
-        jd_i = jd.to_i
-        jd_i -= 1 if jd < 0
-        hours = (jd - jd_i) * 24
-        hours_i = hours.to_i
-        minutes = (hours - hours_i) * 60
-        minutes_i = minutes.to_i
-        seconds = (minutes - minutes_i) * 60
-        
-        DateTime.jd(jd_i, hours_i, minutes_i, seconds, of, sg)
-      end
-    end
-  end
-end
+#--
+# 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)
+
+module TZInfo
+  
+  # Methods to support different versions of Ruby.
+  module RubyCoreSupport #:nodoc:
+  
+    # Use Rational.new! for performance reasons in Ruby 1.8.
+    # This has been removed from 1.9, but Rational performs better.        
+    if Rational.respond_to? :new!
+      def self.rational_new!(numerator, denominator = 1)
+        Rational.new!(numerator, denominator)
+      end
+    else
+      def self.rational_new!(numerator, denominator = 1)
+        Rational(numerator, denominator)
+      end
+    end
+    
+    # Ruby 1.8.6 introduced new! and deprecated new0.
+    # Ruby 1.9.0 removed new0.
+    # Ruby trunk revision 31668 removed the new! method.
+    # Still support new0 for better performance on older versions of Ruby (new0 indicates
+    # that the rational has already been reduced to its lowest terms).
+    # Fallback to jd with conversion from ajd if new! and new0 are unavailable.
+    if DateTime.respond_to? :new!
+      def self.datetime_new!(ajd = 0, of = 0, sg = Date::ITALY)
+        DateTime.new!(ajd, of, sg)
+      end
+    elsif DateTime.respond_to? :new0
+      def self.datetime_new!(ajd = 0, of = 0, sg = Date::ITALY)
+        DateTime.new0(ajd, of, sg)
+      end
+    else
+      HALF_DAYS_IN_DAY = rational_new!(1, 2)
+
+      def self.datetime_new!(ajd = 0, of = 0, sg = Date::ITALY)
+        # Convert from an Astronomical Julian Day number to a civil Julian Day number.
+        jd = ajd + of + HALF_DAYS_IN_DAY
+        
+        # Ruby trunk revision 31862 changed the behaviour of DateTime.jd so that it will no
+        # longer accept a fractional civil Julian Day number if further arguments are specified.
+        # Calculate the hours, minutes and seconds to pass to jd.
+        
+        jd_i = jd.to_i
+        jd_i -= 1 if jd < 0
+        hours = (jd - jd_i) * 24
+        hours_i = hours.to_i
+        minutes = (hours - hours_i) * 60
+        minutes_i = minutes.to_i
+        seconds = (minutes - minutes_i) * 60
+        
+        DateTime.jd(jd_i, hours_i, minutes_i, seconds, of, sg)
+      end
+    end
+    
+    # DateTime in Ruby 1.8.6 doesn't consider times within the 60th second to be
+    # valid. When attempting to specify such a DateTime, subtract the fractional
+    # part and then add it back later
+    if Date.respond_to?(:valid_time?) && !Date.valid_time?(0, 0, rational_new!(59001, 1000)) # 0:0:59.001
+      def self.datetime_new(y=-4712, m=1, d=1, h=0, min=0, s=0, of=0, sg=Date::ITALY)
+        if !s.kind_of?(Integer) && s > 59
+          dt = DateTime.new(y, m, d, h, min, 59, of, sg)
+          dt + (s - 59) / 86400
+        else
+          DateTime.new(y, m, d, h, min, s, of, sg)
+        end
+      end
+    else
+      def self.datetime_new(y=-4712, m=1, d=1, h=0, min=0, s=0, of=0, sg=Date::ITALY)
+        DateTime.new(y, m, d, h, min, s, of, sg)
+      end    
+    end    
+    
+    # Returns true if Time on the runtime platform supports Times defined
+    # by negative 32-bit timestamps, otherwise false.
+    begin
+      Time.at(-1)
+      Time.at(-2147483648)
+      
+      def self.time_supports_negative
+        true
+      end
+    rescue ArgumentError
+      def self.time_supports_negative
+        false
+      end
+    end
+    
+    # Returns true if Time on the runtime platform supports Times defined by
+    # 64-bit timestamps, otherwise false.
+    begin
+      Time.at(-2147483649)
+      Time.at(2147483648)
+      
+      def self.time_supports_64bit
+        true
+      end
+    rescue RangeError
+      def self.time_supports_64bit
+        false
+      end
+    end
+    
+    # Return the result of Time#nsec if it exists, otherwise return the
+    # result of Time#usec * 1000.
+    if Time.method_defined?(:nsec)
+      def self.time_nsec(time)
+        time.nsec
+      end
+    else
+      def self.time_nsec(time)
+        time.usec * 1000
+      end
+    end
+    
+    # Call String#force_encoding if this version of Ruby has encoding support
+    # otherwise treat as a no-op.
+    if String.method_defined?(:force_encoding)
+      def self.force_encoding(str, encoding)
+        str.force_encoding(encoding)
+      end
+    else
+      def self.force_encoding(str, encoding)
+        str
+      end
+    end
+  end
+end

data/lib/tzinfo/ruby_country_info.rb

@@ -0,0 +1,78 @@
+#--
+# 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.
+  class RubyCountryInfo < CountryInfo #:nodoc:
+    # Constructs a new CountryInfo with an ISO 3166 country code, name and 
+    # block. The block will be evaluated to obtain the timezones for the 
+    # country when the zones are first needed.
+    def initialize(code, name, &block)
+      super(code, name)
+      @block = block
+      @zones = nil
+      @zone_identifiers = nil
+    end
+    
+    # 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
+      unless @zone_identifiers
+        @zone_identifiers = zones.collect {|zone| zone.identifier}.freeze
+      end
+      
+      @zone_identifiers
+    end
+    
+    # Returns a frozen array of all the timezones for the for the country as
+    # CountryTimezone instances. These are in the order they were added using 
+    # the timezone method.
+    def zones
+      unless @zones
+        zones = Zones.new
+        @block.call(zones) if @block
+        @block = nil
+        @zones = zones.list.freeze
+      end
+      
+      @zones
+    end
+    
+    # An instance of the Zones class is passed to the block used to define
+    # timezones.
+    class Zones #:nodoc:
+      attr_reader :list
+    
+      def initialize
+        @list = []
+      end
+    
+      # 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, 
+          latitude_denominator, longitude_numerator, longitude_denominator,
+          description)     
+      end
+    end
+  end
+end

data/lib/tzinfo/ruby_data_source.rb

@@ -0,0 +1,153 @@
+#--
+# 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).
+  #
+  # To have TZInfo use this DataSource, call TZInfo::DataSource.set as follows:
+  #
+  #   TZInfo::DataSource.set(:ruby)
+  class RubyDataSource < DataSource
+    # Base path for require.
+    REQUIRE_PATH = File.join('tzinfo', 'data', 'definitions')
+    
+    # Whether the timezone index has been loaded yet.
+    @@timezone_index_loaded = false
+    
+    # Whether the country index has been loaded yet.
+    @@country_index_loaded = false
+  
+    # Returns a TimezoneInfo instance for a given identifier. 
+    # Raises InvalidTimezoneIdentifier if the timezone is not found or the 
+    # identifier is invalid.
+    def load_timezone_info(identifier)
+      raise InvalidTimezoneIdentifier, 'Invalid identifier' if identifier !~ /^[A-Za-z0-9\+\-_]+(\/[A-Za-z0-9\+\-_]+)*$/
+      
+      identifier = identifier.gsub(/-/, '__m__').gsub(/\+/, '__p__')
+      identifier.untaint
+      identifier = identifier.split('/')
+      begin
+        require_definition(identifier)
+        
+        m = Data::Definitions
+        identifier.each {|part|
+          m = m.const_get(part)
+        }
+        
+        info = m.get
+      rescue LoadError, NameError => e
+        raise InvalidTimezoneIdentifier, e.message
+      end
+    end
+    
+    # Returns an array of all the available timezone identifiers.
+    def timezone_identifiers
+      load_timezone_index
+      Data::Indexes::Timezones.timezones
+    end
+    
+    # Returns an array of all the available timezone identifiers for
+    # data timezones (i.e. those that actually contain definitions).
+    def data_timezone_identifiers
+      load_timezone_index
+      Data::Indexes::Timezones.data_timezones
+    end
+    
+    # Returns an array of all the available timezone identifiers that
+    # are links to other timezones.
+    def linked_timezone_identifiers
+      load_timezone_index
+      Data::Indexes::Timezones.linked_timezones
+    end
+    
+    # Returns a CountryInfo instance for the given ISO 3166-1 alpha-2
+    # country code. Raises InvalidCountryCode if the country could not be found
+    # or the code is invalid.
+    def load_country_info(code)
+      load_country_index
+      info = Data::Indexes::Countries.countries[code]
+      raise InvalidCountryCode.new, 'Invalid country code' unless info
+      info
+    end
+    
+    # Returns an array of all the available ISO 3166-1 alpha-2
+    # country codes.
+    def country_codes
+      load_country_index
+      Data::Indexes::Countries.countries.keys.freeze
+    end
+    
+    # Returns the name of this DataSource.
+    def to_s
+      "Ruby DataSource"
+    end
+    
+    private
+    
+    # Requires a zone definition by its identifier (split on /).
+    def require_definition(identifier)
+      require_data(*(['definitions'] + identifier))
+    end
+    
+    # Requires an index by its name.
+    def self.require_index(name)
+      require_data(*['indexes', name])
+    end
+    
+    # Requires a file from tzinfo/data.
+    def require_data(*file)
+      self.class.require_data(*file)
+    end
+    
+    # Requires a file from tzinfo/data.
+    def self.require_data(*file)
+      require File.join('tzinfo', 'data', *file)
+    end
+    
+    # Loads in the index of timezones if it hasn't already been loaded.
+    def load_timezone_index
+      self.class.load_timezone_index
+    end
+    
+    # Loads in the index of timezones if it hasn't already been loaded.
+    def self.load_timezone_index
+      unless @@timezone_index_loaded
+        require_index('timezones')
+        @@timezone_index_loaded = true
+      end        
+    end
+    
+    # Loads in the index of countries if it hasn't already been loaded.
+    def load_country_index
+      self.class.load_country_index
+    end
+    
+    # Loads in the index of countries if it hasn't already been loaded.
+    def self.load_country_index
+      unless @@country_index_loaded
+        require_index('countries')
+        @@country_index_loaded = true
+      end
+    end
+  end
+end