tzinfo 0.3.8 → 0.3.9

data/CHANGES

@@ -1,3 +1,14 @@
+== Version 0.3.9 (tzdata v2008c) - 27-May-2008
+
+* Updated to tzdata version 2008c
+  (http://article.gmane.org/gmane.comp.time.tz/2183).
+* Support loading timezone data in the latest trunk versions of Ruby 1.9.
+  Rational.new! is now private, so call it using Rational.send :new! instead.
+  Thanks to Jeremy Kemper and Pratik Naik for spotting this. Closes #19184.
+* Prevent warnings from being output when running Ruby with the -v or -w
+  command line options. Thanks to Paul McMahon for the patch. Closes #19719.
+
+
 == Version 0.3.8 (tzdata v2008b) - 24-Mar-2008
 
 * Updated to tzdata version 2008b

data/Rakefile

@@ -16,7 +16,7 @@ require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'fileutils'
 
-PKG_VERSION = "0.3.8"
+PKG_VERSION = "0.3.9"
 PKG_FILES = FileList[
   'CHANGES',
   'LICENSE',

data/lib/tzinfo/country_index_definition.rb

@@ -29,6 +29,7 @@ module TZInfo
     def self.append_features(base)
       super
       base.extend(ClassMethods)
+      base.instance_eval { @countries = {} }
     end
     
     module ClassMethods #:nodoc:
@@ -36,7 +37,6 @@ module TZInfo
       # block will be evaluated to obtain all the timezones for the country.
       # Calls Country.country_defined with the definition of each country.
       def country(code, name, &block)
-        @countries = {} unless @countries
         @countries[code] = CountryInfo.new(code, name, &block)      
       end
       

data/lib/tzinfo/country_timezone.rb

@@ -64,12 +64,12 @@ module TZInfo
     
     # The latitude of this timezone in degrees as a Rational.
     def latitude
-      @latitude ||= Rational.new!(@latitude_numerator, @latitude_denominator)
+      @latitude ||= Rational.send(:new!, @latitude_numerator, @latitude_denominator)
     end
     
     # The longitude of this timezone in degrees as a Rational.
     def longitude
-      @longitude ||= Rational.new!(@longitude_numerator, @longitude_denominator)
+      @longitude ||= Rational.send(:new!, @longitude_numerator, @longitude_denominator)
     end
     
     # Returns true if and only if the given CountryTimezone is equal to the

data/lib/tzinfo/data_timezone_info.rb

@@ -40,6 +40,8 @@ module TZInfo
       super(identifier)
       @offsets = {}
       @transitions = []
+      @previous_offset = nil
+      @transitions_index = nil
     end
  
     # Defines a offset. The id uniquely identifies this offset within the

data/lib/tzinfo/definitions/Africa/Casablanca.rb

@@ -31,6 +31,8 @@ module TZInfo
           tz.transition 1978, 8, :o1, 271033200
           tz.transition 1984, 3, :o3, 448243200
           tz.transition 1985, 12, :o1, 504918000
+          tz.transition 2008, 6, :o2, 1212278400
+          tz.transition 2008, 9, :o1, 1222556400
         end
       end
     end

data/lib/tzinfo/definitions/Asia/Choibalsan.rb

@@ -12,6 +12,7 @@ module TZInfo
           tz.offset :o2, 28800, 0, :ULAT
           tz.offset :o3, 32400, 3600, :CHOST
           tz.offset :o4, 32400, 0, :CHOT
+          tz.offset :o5, 28800, 0, :CHOT
           
           tz.transition 1905, 7, :o1, 1740281891, 720
           tz.transition 1977, 12, :o2, 252435600
@@ -59,6 +60,7 @@ module TZInfo
           tz.transition 2005, 9, :o4, 1127491200
           tz.transition 2006, 3, :o3, 1143219600
           tz.transition 2006, 9, :o4, 1159545600
+          tz.transition 2008, 3, :o5, 1206889200
         end
       end
     end

data/lib/tzinfo/definitions/Asia/Karachi.rb

@@ -21,6 +21,8 @@ module TZInfo
           tz.transition 1971, 3, :o4, 38775600
           tz.transition 2002, 4, :o5, 1018119660
           tz.transition 2002, 10, :o4, 1033840860
+          tz.transition 2008, 5, :o5, 1212260400
+          tz.transition 2008, 8, :o4, 1220205600
         end
       end
     end

data/lib/tzinfo/offset_rationals.rb

@@ -27,63 +27,63 @@ module TZInfo
   # -14 and +14 hours to avoid having to call gcd at runtime.  
   module OffsetRationals #:nodoc:
     @@rational_cache = {
-      -50400 => Rational.new!(-7,12), 
-      -48600 => Rational.new!(-9,16),
-      -46800 => Rational.new!(-13,24),
-      -45000 => Rational.new!(-25,48),
-      -43200 => Rational.new!(-1,2),
-      -41400 => Rational.new!(-23,48),
-      -39600 => Rational.new!(-11,24),
-      -37800 => Rational.new!(-7,16),
-      -36000 => Rational.new!(-5,12),
-      -34200 => Rational.new!(-19,48),
-      -32400 => Rational.new!(-3,8),
-      -30600 => Rational.new!(-17,48),
-      -28800 => Rational.new!(-1,3),
-      -27000 => Rational.new!(-5,16),
-      -25200 => Rational.new!(-7,24),
-      -23400 => Rational.new!(-13,48),
-      -21600 => Rational.new!(-1,4),
-      -19800 => Rational.new!(-11,48),
-      -18000 => Rational.new!(-5,24),
-      -16200 => Rational.new!(-3,16),
-      -14400 => Rational.new!(-1,6),
-      -12600 => Rational.new!(-7,48),
-      -10800 => Rational.new!(-1,8),
-       -9000 => Rational.new!(-5,48),
-       -7200 => Rational.new!(-1,12),
-       -5400 => Rational.new!(-1,16),
-       -3600 => Rational.new!(-1,24),
-       -1800 => Rational.new!(-1,48),
-           0 => Rational.new!(0,1),
-        1800 => Rational.new!(1,48),
-        3600 => Rational.new!(1,24),
-        5400 => Rational.new!(1,16),
-        7200 => Rational.new!(1,12),
-        9000 => Rational.new!(5,48),
-       10800 => Rational.new!(1,8),
-       12600 => Rational.new!(7,48),
-       14400 => Rational.new!(1,6),
-       16200 => Rational.new!(3,16),
-       18000 => Rational.new!(5,24),
-       19800 => Rational.new!(11,48),
-       21600 => Rational.new!(1,4),
-       23400 => Rational.new!(13,48),
-       25200 => Rational.new!(7,24),
-       27000 => Rational.new!(5,16),
-       28800 => Rational.new!(1,3),
-       30600 => Rational.new!(17,48),
-       32400 => Rational.new!(3,8),
-       34200 => Rational.new!(19,48),
-       36000 => Rational.new!(5,12),
-       37800 => Rational.new!(7,16),
-       39600 => Rational.new!(11,24),
-       41400 => Rational.new!(23,48),
-       43200 => Rational.new!(1,2),
-       45000 => Rational.new!(25,48),
-       46800 => Rational.new!(13,24),  
-       48600 => Rational.new!(9,16),            
-       50400 => Rational.new!(7,12)}
+      -50400 => Rational.send(:new!, -7,12), 
+      -48600 => Rational.send(:new!, -9,16),
+      -46800 => Rational.send(:new!, -13,24),
+      -45000 => Rational.send(:new!, -25,48),
+      -43200 => Rational.send(:new!, -1,2),
+      -41400 => Rational.send(:new!, -23,48),
+      -39600 => Rational.send(:new!, -11,24),
+      -37800 => Rational.send(:new!, -7,16),
+      -36000 => Rational.send(:new!, -5,12),
+      -34200 => Rational.send(:new!, -19,48),
+      -32400 => Rational.send(:new!, -3,8),
+      -30600 => Rational.send(:new!, -17,48),
+      -28800 => Rational.send(:new!, -1,3),
+      -27000 => Rational.send(:new!, -5,16),
+      -25200 => Rational.send(:new!, -7,24),
+      -23400 => Rational.send(:new!, -13,48),
+      -21600 => Rational.send(:new!, -1,4),
+      -19800 => Rational.send(:new!, -11,48),
+      -18000 => Rational.send(:new!, -5,24),
+      -16200 => Rational.send(:new!, -3,16),
+      -14400 => Rational.send(:new!, -1,6),
+      -12600 => Rational.send(:new!, -7,48),
+      -10800 => Rational.send(:new!, -1,8),
+       -9000 => Rational.send(:new!, -5,48),
+       -7200 => Rational.send(:new!, -1,12),
+       -5400 => Rational.send(:new!, -1,16),
+       -3600 => Rational.send(:new!, -1,24),
+       -1800 => Rational.send(:new!, -1,48),
+           0 => Rational.send(:new!, 0,1),
+        1800 => Rational.send(:new!, 1,48),
+        3600 => Rational.send(:new!, 1,24),
+        5400 => Rational.send(:new!, 1,16),
+        7200 => Rational.send(:new!, 1,12),
+        9000 => Rational.send(:new!, 5,48),
+       10800 => Rational.send(:new!, 1,8),
+       12600 => Rational.send(:new!, 7,48),
+       14400 => Rational.send(:new!, 1,6),
+       16200 => Rational.send(:new!, 3,16),
+       18000 => Rational.send(:new!, 5,24),
+       19800 => Rational.send(:new!, 11,48),
+       21600 => Rational.send(:new!, 1,4),
+       23400 => Rational.send(:new!, 13,48),
+       25200 => Rational.send(:new!, 7,24),
+       27000 => Rational.send(:new!, 5,16),
+       28800 => Rational.send(:new!, 1,3),
+       30600 => Rational.send(:new!, 17,48),
+       32400 => Rational.send(:new!, 3,8),
+       34200 => Rational.send(:new!, 19,48),
+       36000 => Rational.send(:new!, 5,12),
+       37800 => Rational.send(:new!, 7,16),
+       39600 => Rational.send(:new!, 11,24),
+       41400 => Rational.send(:new!, 23,48),
+       43200 => Rational.send(:new!, 1,2),
+       45000 => Rational.send(:new!, 25,48),
+       46800 => Rational.send(:new!, 13,24),  
+       48600 => Rational.send(:new!, 9,16),            
+       50400 => Rational.send(:new!, 7,12)}
     
     # Returns a Rational expressing the fraction of a day that offset in 
     # seconds represents (i.e. equivalent to Rational(offset, 86400)). 

data/lib/tzinfo/timezone.rb

@@ -371,8 +371,8 @@ module TZInfo
     # type as utc. Any timezone information in utc is ignored (it is treated as 
     # a UTC time).
     def utc_to_local(utc)
-      TimeOrDateTime.wrap(utc) {|utc|
-        period_for_utc(utc).to_local(utc)
+      TimeOrDateTime.wrap(utc) {|wrapped|
+        period_for_utc(wrapped).to_local(wrapped)
       }
     end
     
@@ -410,14 +410,14 @@ module TZInfo
     # single period to use to convert the time or return nil or an empty array
     # to cause an AmbiguousTime exception to be raised.
     def local_to_utc(local, dst = nil)
-      TimeOrDateTime.wrap(local) {|local|
+      TimeOrDateTime.wrap(local) {|wrapped|
         if block_given?
-          period = period_for_local(local, dst) {|periods| yield periods }
+          period = period_for_local(wrapped, dst) {|periods| yield periods }
         else
-          period = period_for_local(local, dst)
+          period = period_for_local(wrapped, dst)
         end
         
-        period.to_utc(local)
+        period.to_utc(wrapped)
       }
     end
     

data/lib/tzinfo/timezone_index_definition.rb

@@ -27,21 +27,22 @@ module TZInfo
     def self.append_features(base)
       super
       base.extend(ClassMethods)
+      base.instance_eval do
+        @timezones = []
+        @data_timezones = []
+        @linked_timezones = []
+      end
     end
     
     module ClassMethods #:nodoc:
       # Defines a timezone based on data.
       def timezone(identifier)
-        @timezones = [] unless @timezones
-        @data_timezones = [] unless @data_timezones
         @timezones << identifier
         @data_timezones << identifier
       end
       
       # Defines a timezone which is a link to another timezone.
       def linked_timezone(identifier)
-        @timezones = [] unless @timezones
-        @linked_timezones = [] unless @linked_timezones
         @timezones << identifier
         @linked_timezones << identifier
       end
@@ -49,14 +50,12 @@ module TZInfo
       # Returns a frozen array containing the identifiers of all the timezones.
       # Identifiers appear in the order they were defined in the index.
       def timezones
-        @timezones = [] unless @timezones
         @timezones.freeze
       end
       
       # Returns a frozen array containing the identifiers of all data timezones.
       # Identifiers appear in the order they were defined in the index.
       def data_timezones
-        @data_timezones = [] unless @data_timezones
         @data_timezones.freeze
       end
       
@@ -64,7 +63,6 @@ module TZInfo
       # timezones. Identifiers appear in the order they were defined in 
       # the index.
       def linked_timezones
-        @linked_timezones = [] unless @linked_timezones
         @linked_timezones.freeze
       end      
     end

data/lib/tzinfo/timezone_offset_info.rb

@@ -56,15 +56,15 @@ module TZInfo
     
     # Converts a UTC DateTime to local time based on the offset of this period.
     def to_local(utc)
-      TimeOrDateTime.wrap(utc) {|utc|
-        utc + @utc_total_offset
+      TimeOrDateTime.wrap(utc) {|wrapped|
+        wrapped + @utc_total_offset
       }
     end
     
     # Converts a local DateTime to UTC based on the offset of this period.
     def to_utc(local)
-      TimeOrDateTime.wrap(local) {|local|
-        local - @utc_total_offset
+      TimeOrDateTime.wrap(local) {|wrapped|
+        wrapped - @utc_total_offset
       }
     end
     

data/lib/tzinfo/timezone_transition_info.rb

@@ -48,7 +48,7 @@ module TZInfo
     # seconds since the epoch. If denominator is specified numerator_or_time
     # and denominator are used to create a DateTime as follows:
     # 
-    #  DateTime.new!(Rational.new!(numerator_or_time, denominator), 0, Date::ITALY)
+    #  DateTime.new!(Rational.send(:new!, numerator_or_time, denominator), 0, Date::ITALY)
     #
     # For performance reasons, the numerator and denominator must be specified
     # in their lowest form.
@@ -70,7 +70,7 @@ module TZInfo
         unless @denominator 
           @at = TimeOrDateTime.new(@numerator_or_time)
         else
-          r = Rational.new!(@numerator_or_time, @denominator)
+          r = Rational.send(:new!, @numerator_or_time, @denominator)
           
           # Ruby 1.8.6 introduced new! and deprecated new0.
           # Ruby 1.9.0 removed new0.

data/test/tc_country.rb

@@ -1,5 +1,6 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 require 'test/unit'
+require File.join(File.dirname(__FILE__), 'test_utils')
 require 'tzinfo/country'
 
 include TZInfo
@@ -143,8 +144,11 @@ class TCCountry < Test::Unit::TestCase
     
     c = Country.get('US')
     assert_equal('US', Country.get('US').code)
-    
-    load 'tzinfo/country.rb'
+
+    # Suppress redefined method warnings.
+    without_warnings do
+      load 'tzinfo/country.rb'
+    end
     
     c = Country.get('US')
     assert_equal('US', Country.get('US').code)

data/test/tc_linked_timezone.rb

@@ -1,5 +1,6 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 require 'test/unit'
+require File.join(File.dirname(__FILE__), 'test_utils')
 require 'tzinfo/linked_timezone'
 require 'tzinfo/linked_timezone_info'
 
@@ -48,18 +49,23 @@ class TCLinkedTimezone < Test::Unit::TestCase
   
   def setup
     # Redefine Timezone.get to return a fake timezone.
-    
-    def Timezone.get(identifier)
-      raise InvalidTimezoneIdentifier, 'Invalid identifier' if identifier == 'Invalid/Identifier'
-      
-      @timezones ||= {}
-      @timezones[identifier] ||= TestTimezone.new(identifier, identifier == 'Test/No/Local')        
+    # Use without_warnings to suppress redefined get method warning.
+    without_warnings do
+      def Timezone.get(identifier)
+        raise InvalidTimezoneIdentifier, 'Invalid identifier' if identifier == 'Invalid/Identifier'
+       
+        @timezones ||= {}
+        @timezones[identifier] ||= TestTimezone.new(identifier, identifier == 'Test/No/Local')        
+      end
     end
   end
   
   def teardown
     # Re-require timezone to reset.
-    load 'tzinfo/timezone.rb'
+    # Suppress redefined method warnings.
+    without_warnings do
+      load 'tzinfo/timezone.rb'
+    end
   end
   
   def test_identifier

data/test/tc_timezone.rb

@@ -195,8 +195,8 @@ class TCTimezone < Test::Unit::TestCase
   def test_all_country_zones
     # Probably should relax this test - just need all the zones, don't care
     # about order.
-    expected = Country.all.inject([]) {|expected,country|
-      expected += country.zones
+    expected = Country.all.inject([]) {|result,country|
+      result += country.zones
     }
     expected.uniq!
     
@@ -215,8 +215,8 @@ class TCTimezone < Test::Unit::TestCase
   def test_all_country_zone_identifiers
     # Probably should relax this test - just need all the zones, don't care
     # about order.
-    expected = Country.all.inject([]) {|expected,country|
-      expected += country.zone_identifiers
+    expected = Country.all.inject([]) {|result,country|
+      result += country.zone_identifiers
     }
     expected.uniq!
         

data/test/test_utils.rb

@@ -0,0 +1,12 @@
+module Kernel
+  # Suppresses any warnings raised in a specified block.
+  def without_warnings
+    old_verbose = $VERBOSE
+    begin
+      $VERBOSE = nil
+      yield
+    ensure
+      $-v = old_verbose
+    end
+  end
+end

data/test/ts_all.rb

@@ -3,4 +3,4 @@
 ENV['TZ'] = 'America/Los_Angeles'
 
 require 'test/unit'
-Dir['tc_*.rb'].each {|t| require t}
+Dir[File.join(File.dirname(__FILE__), 'tc_*.rb')].each {|t| require t}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tzinfo
 version: !ruby/object:Gem::Version 
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors: 
 - Philip Ross
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-24 00:00:00 +00:00
+date: 2008-05-27 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -659,6 +659,7 @@ files:
 - test/tc_timezone_transition_info.rb
 - test/tc_timezone_utc.rb
 - test/tc_time_or_datetime.rb
+- test/test_utils.rb
 - test/ts_all.rb
 has_rdoc: true
 homepage: http://tzinfo.rubyforge.org/
@@ -685,7 +686,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tzinfo
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Daylight-savings aware timezone library