tzinfo 0.3.20 → 0.3.21

data/CHANGES

@@ -1,3 +1,20 @@
+== Version 0.3.21 (tzdata v2010j) - 28-May-2010
+
+* Updated to tzdata version 2010j
+  (http://article.gmane.org/gmane.comp.time.tz/3225).
+* Change invalid timezone check to exclude characters not used in timezone
+  identifiers and avoid 'character class has duplicated range' warnings with
+  Ruby 1.9.2.
+* Ruby 1.9.2 has deprecated "require 'rational'", but older versions of
+  Ruby need rational to be required. Require rational only when the Rational
+  module has not already been loaded.
+* Remove circular requires (now a warning in Ruby 1.9.2). Instead of using
+  requires in each file for dependencies, tzinfo.rb now requires all tzinfo
+  files. If you were previously requiring files within the tzinfo directory
+  (e.g. require 'tzinfo/timezone'), then you will now have to
+  require 'tzinfo' instead.
+
+
 == Version 0.3.20 (tzdata v2010i) - 19-Apr-2010
 
 * Updated to tzdata version 2010i

data/Rakefile

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

data/lib/tzinfo.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2006 Philip Ross
+# Copyright (c) 2005-2010 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
@@ -25,9 +25,31 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+
+require 'tzinfo/ruby_core_support'
+require 'tzinfo/offset_rationals'
+require 'tzinfo/time_or_datetime'
+
+require 'tzinfo/timezone_definition'
+
+require 'tzinfo/timezone_offset_info'
+require 'tzinfo/timezone_transition_info'
+
+require 'tzinfo/timezone_index_definition'
+
+require 'tzinfo/timezone_info'
+require 'tzinfo/data_timezone_info'
+require 'tzinfo/linked_timezone_info'
+
+require 'tzinfo/timezone_period'
 require 'tzinfo/timezone'
-require 'tzinfo/country'
-require 'tzinfo/tzdataparser'
-require 'tzinfo/timezone_proxy'
+require 'tzinfo/info_timezone'
 require 'tzinfo/data_timezone'
-require 'tzinfo/linked_timezone'
+require 'tzinfo/linked_timezone'
+require 'tzinfo/timezone_proxy'
+
+require 'tzinfo/country_index_definition'
+require 'tzinfo/country_info'
+
+require 'tzinfo/country'
+require 'tzinfo/country_timezone'

data/lib/tzinfo/country.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2006 Philip Ross
+# Copyright (c) 2005-2010 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
@@ -20,9 +20,6 @@
 # THE SOFTWARE.
 #++
 
-require 'tzinfo/country_info'
-require 'tzinfo/timezone'
-
 module TZInfo
   # Thrown by Country#get if the code given is not valid.
   class InvalidCountryCode < StandardError

data/lib/tzinfo/country_index_definition.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006 Philip Ross
+# Copyright (c) 2006-2010 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
@@ -20,8 +20,6 @@
 # THE SOFTWARE.
 #++
 
-require 'tzinfo/country_info'
-
 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,5 +1,5 @@
 #--
-# Copyright (c) 2006 Philip Ross
+# Copyright (c) 2006-2010 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
@@ -20,8 +20,6 @@
 # THE SOFTWARE.
 #++
 
-require 'tzinfo/country_timezone'
-
 module TZInfo  
   # Class to store the data loaded from the country index. Instances of this
   # class are passed to the blocks in the index that define timezones.

data/lib/tzinfo/country_timezone.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006 Philip Ross
+# Copyright (c) 2006-2010 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
@@ -20,9 +20,6 @@
 # THE SOFTWARE.
 #++
 
-require 'tzinfo/timezone'
-require 'tzinfo/ruby_core_support'
-
 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

data/lib/tzinfo/data_timezone.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006 Philip Ross
+# Copyright (c) 2006-2010 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
@@ -20,8 +20,6 @@
 # THE SOFTWARE.
 #++
 
-require 'tzinfo/info_timezone'
-
 module TZInfo
 
   # A Timezone based on a DataTimezoneInfo.

data/lib/tzinfo/data_timezone_info.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006 Philip Ross
+# Copyright (c) 2006-2010 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
@@ -20,12 +20,6 @@
 # THE SOFTWARE.
 #++
 
-require 'tzinfo/time_or_datetime'
-require 'tzinfo/timezone_info'
-require 'tzinfo/timezone_offset_info'
-require 'tzinfo/timezone_period'
-require 'tzinfo/timezone_transition_info'
-
 module TZInfo
   # Thrown 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/definitions/Africa/Abidjan.rb

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa

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

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_definition'
-
 module TZInfo
   module Definitions
     module Africa