tzinfo 0.2.2 → 0.3.0

data/lib/tzinfo/definitions/America/Paramaribo.rb

@@ -1,17 +1,26 @@
-require 'tzinfo/timezone'
+require 'tzinfo/timezone_definition'
+
 module TZInfo
-module Definitions #:nodoc:
-module America #:nodoc:
-class Paramaribo < Timezone #:nodoc:
-setup
-set_identifier('America/Paramaribo')
-add_unbounded_start_period {TimezonePeriod.new(nil,DateTime.new0(Rational.new!(5225121331,2160),0,Date::ITALY),-13240,0,:LMT)}
-add_period(1911,1) {TimezonePeriod.new(DateTime.new0(Rational.new!(5225121331,2160),0,Date::ITALY),DateTime.new0(Rational.new!(52440558913,21600),0,Date::ITALY),-13252,0,:PMT)}
-add_period(1935,1) {TimezonePeriod.new(DateTime.new0(Rational.new!(52440558913,21600),0,Date::ITALY),DateTime.new0(Rational.new!(17508453503,7200),0,Date::ITALY),-13236,0,:PMT)}
-add_period(1945,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(17508453503,7200),0,Date::ITALY),185686200,-12600,0,:NEGT)}
-add_period(1975,11) {TimezonePeriod.new(185686200,465449400,-12600,0,:SRT)}
-add_period(1984,10) {TimezonePeriod.new(465449400,nil,-10800,0,:SRT)}
-end
-end
-end
+  module Definitions
+    module America
+      module Paramaribo
+        include TimezoneDefinition
+        
+        timezone 'America/Paramaribo' do |tz|
+          tz.offset :o0, -13240, 0, :LMT
+          tz.offset :o1, -13252, 0, :PMT
+          tz.offset :o2, -13236, 0, :PMT
+          tz.offset :o3, -12600, 0, :NEGT
+          tz.offset :o4, -12600, 0, :SRT
+          tz.offset :o5, -10800, 0, :SRT
+          
+          tz.transition 1911, 1, :o1, 5225121331, 2160
+          tz.transition 1935, 1, :o2, 52440558913, 21600
+          tz.transition 1945, 10, :o3, 17508453503, 7200
+          tz.transition 1975, 11, :o4, 185686200
+          tz.transition 1984, 10, :o5, 465449400
+        end
+      end
+    end
+  end
 end

data/lib/tzinfo/definitions/America/Phoenix.rb

@@ -1,23 +1,30 @@
-require 'tzinfo/timezone'
+require 'tzinfo/timezone_definition'
+
 module TZInfo
-module Definitions #:nodoc:
-module America #:nodoc:
-class Phoenix < Timezone #:nodoc:
-setup
-set_identifier('America/Phoenix')
-add_unbounded_start_period {TimezonePeriod.new(nil,DateTime.new0(Rational.new!(57819199,24),0,Date::ITALY),-26898,0,:LMT)}
-add_period(1883,11) {TimezonePeriod.new(DateTime.new0(Rational.new!(57819199,24),0,Date::ITALY),DateTime.new0(Rational.new!(19373471,8),0,Date::ITALY),-25200,0,:MST)}
-add_period(1918,3) {TimezonePeriod.new(DateTime.new0(Rational.new!(19373471,8),0,Date::ITALY),DateTime.new0(Rational.new!(14531363,6),0,Date::ITALY),-25200,3600,:MDT)}
-add_period(1918,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(14531363,6),0,Date::ITALY),DateTime.new0(Rational.new!(19376383,8),0,Date::ITALY),-25200,0,:MST)}
-add_period(1919,3) {TimezonePeriod.new(DateTime.new0(Rational.new!(19376383,8),0,Date::ITALY),DateTime.new0(Rational.new!(14533547,6),0,Date::ITALY),-25200,3600,:MDT)}
-add_period(1919,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(14533547,6),0,Date::ITALY),DateTime.new0(Rational.new!(19443199,8),0,Date::ITALY),-25200,0,:MST)}
-add_period(1942,2) {TimezonePeriod.new(DateTime.new0(Rational.new!(19443199,8),0,Date::ITALY),DateTime.new0(Rational.new!(3500770681,1440),0,Date::ITALY),-25200,3600,:MWT)}
-add_period(1944,1) {TimezonePeriod.new(DateTime.new0(Rational.new!(3500770681,1440),0,Date::ITALY),DateTime.new0(Rational.new!(3500901781,1440),0,Date::ITALY),-25200,0,:MST)}
-add_period(1944,4) {TimezonePeriod.new(DateTime.new0(Rational.new!(3500901781,1440),0,Date::ITALY),DateTime.new0(Rational.new!(3501165241,1440),0,Date::ITALY),-25200,3600,:MWT)}
-add_period(1944,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(3501165241,1440),0,Date::ITALY),DateTime.new0(Rational.new!(19516887,8),0,Date::ITALY),-25200,0,:MST)}
-add_period(1967,4) {TimezonePeriod.new(DateTime.new0(Rational.new!(19516887,8),0,Date::ITALY),DateTime.new0(Rational.new!(14638757,6),0,Date::ITALY),-25200,3600,:MDT)}
-add_period(1967,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(14638757,6),0,Date::ITALY),nil,-25200,0,:MST)}
-end
-end
-end
+  module Definitions
+    module America
+      module Phoenix
+        include TimezoneDefinition
+        
+        timezone 'America/Phoenix' do |tz|
+          tz.offset :o0, -26898, 0, :LMT
+          tz.offset :o1, -25200, 0, :MST
+          tz.offset :o2, -25200, 3600, :MDT
+          tz.offset :o3, -25200, 3600, :MWT
+          
+          tz.transition 1883, 11, :o1, 57819199, 24
+          tz.transition 1918, 3, :o2, 19373471, 8
+          tz.transition 1918, 10, :o1, 14531363, 6
+          tz.transition 1919, 3, :o2, 19376383, 8
+          tz.transition 1919, 10, :o1, 14533547, 6
+          tz.transition 1942, 2, :o3, 19443199, 8
+          tz.transition 1944, 1, :o1, 3500770681, 1440
+          tz.transition 1944, 4, :o3, 3500901781, 1440
+          tz.transition 1944, 10, :o1, 3501165241, 1440
+          tz.transition 1967, 4, :o2, 19516887, 8
+          tz.transition 1967, 10, :o1, 14638757, 6
+        end
+      end
+    end
+  end
 end

data/lib/tzinfo/definitions/America/Port__m__au__m__Prince.rb

@@ -1,136 +1,143 @@
-require 'tzinfo/timezone'
+require 'tzinfo/timezone_definition'
+
 module TZInfo
-module Definitions #:nodoc:
-module America #:nodoc:
-class Port__m__au__m__Prince < Timezone #:nodoc:
-setup
-set_identifier('America/Port-au-Prince')
-add_unbounded_start_period {TimezonePeriod.new(nil,DateTime.new0(Rational.new!(2604278197,1080),0,Date::ITALY),-17360,0,:LMT)}
-add_period(1890,1) {TimezonePeriod.new(DateTime.new0(Rational.new!(2604278197,1080),0,Date::ITALY),DateTime.new0(Rational.new!(3486604609,1440),0,Date::ITALY),-17340,0,:PPMT)}
-add_period(1917,1) {TimezonePeriod.new(DateTime.new0(Rational.new!(3486604609,1440),0,Date::ITALY),421218000,-18000,0,:EST)}
-add_period(1983,5) {TimezonePeriod.new(421218000,436334400,-18000,3600,:EDT)}
-add_period(1983,10) {TimezonePeriod.new(436334400,452062800,-18000,0,:EST)}
-add_period(1984,4) {TimezonePeriod.new(452062800,467784000,-18000,3600,:EDT)}
-add_period(1984,10) {TimezonePeriod.new(467784000,483512400,-18000,0,:EST)}
-add_period(1985,4) {TimezonePeriod.new(483512400,499233600,-18000,3600,:EDT)}
-add_period(1985,10) {TimezonePeriod.new(499233600,514962000,-18000,0,:EST)}
-add_period(1986,4) {TimezonePeriod.new(514962000,530683200,-18000,3600,:EDT)}
-add_period(1986,10) {TimezonePeriod.new(530683200,546411600,-18000,0,:EST)}
-add_period(1987,4) {TimezonePeriod.new(546411600,562132800,-18000,3600,:EDT)}
-add_period(1987,10) {TimezonePeriod.new(562132800,576050400,-18000,0,:EST)}
-add_period(1988,4) {TimezonePeriod.new(576050400,594194400,-18000,3600,:EDT)}
-add_period(1988,10) {TimezonePeriod.new(594194400,607500000,-18000,0,:EST)}
-add_period(1989,4) {TimezonePeriod.new(607500000,625644000,-18000,3600,:EDT)}
-add_period(1989,10) {TimezonePeriod.new(625644000,638949600,-18000,0,:EST)}
-add_period(1990,4) {TimezonePeriod.new(638949600,657093600,-18000,3600,:EDT)}
-add_period(1990,10) {TimezonePeriod.new(657093600,671004000,-18000,0,:EST)}
-add_period(1991,4) {TimezonePeriod.new(671004000,688543200,-18000,3600,:EDT)}
-add_period(1991,10) {TimezonePeriod.new(688543200,702453600,-18000,0,:EST)}
-add_period(1992,4) {TimezonePeriod.new(702453600,719992800,-18000,3600,:EDT)}
-add_period(1992,10) {TimezonePeriod.new(719992800,733903200,-18000,0,:EST)}
-add_period(1993,4) {TimezonePeriod.new(733903200,752047200,-18000,3600,:EDT)}
-add_period(1993,10) {TimezonePeriod.new(752047200,765352800,-18000,0,:EST)}
-add_period(1994,4) {TimezonePeriod.new(765352800,783496800,-18000,3600,:EDT)}
-add_period(1994,10) {TimezonePeriod.new(783496800,796802400,-18000,0,:EST)}
-add_period(1995,4) {TimezonePeriod.new(796802400,814946400,-18000,3600,:EDT)}
-add_period(1995,10) {TimezonePeriod.new(814946400,828856800,-18000,0,:EST)}
-add_period(1996,4) {TimezonePeriod.new(828856800,846396000,-18000,3600,:EDT)}
-add_period(1996,10) {TimezonePeriod.new(846396000,860306400,-18000,0,:EST)}
-add_period(1997,4) {TimezonePeriod.new(860306400,877845600,-18000,3600,:EDT)}
-add_period(1997,10) {TimezonePeriod.new(877845600,1112504400,-18000,0,:EST)}
-add_period(2005,4) {TimezonePeriod.new(1112504400,1130644800,-18000,3600,:EDT)}
-add_period(2005,10) {TimezonePeriod.new(1130644800,1143954000,-18000,0,:EST)}
-add_period(2006,4) {TimezonePeriod.new(1143954000,1162094400,-18000,3600,:EDT)}
-add_period(2006,10) {TimezonePeriod.new(1162094400,1175403600,-18000,0,:EST)}
-add_period(2007,4) {TimezonePeriod.new(1175403600,1193544000,-18000,3600,:EDT)}
-add_period(2007,10) {TimezonePeriod.new(1193544000,1207458000,-18000,0,:EST)}
-add_period(2008,4) {TimezonePeriod.new(1207458000,1224993600,-18000,3600,:EDT)}
-add_period(2008,10) {TimezonePeriod.new(1224993600,1238907600,-18000,0,:EST)}
-add_period(2009,4) {TimezonePeriod.new(1238907600,1256443200,-18000,3600,:EDT)}
-add_period(2009,10) {TimezonePeriod.new(1256443200,1270357200,-18000,0,:EST)}
-add_period(2010,4) {TimezonePeriod.new(1270357200,1288497600,-18000,3600,:EDT)}
-add_period(2010,10) {TimezonePeriod.new(1288497600,1301806800,-18000,0,:EST)}
-add_period(2011,4) {TimezonePeriod.new(1301806800,1319947200,-18000,3600,:EDT)}
-add_period(2011,10) {TimezonePeriod.new(1319947200,1333256400,-18000,0,:EST)}
-add_period(2012,4) {TimezonePeriod.new(1333256400,1351396800,-18000,3600,:EDT)}
-add_period(2012,10) {TimezonePeriod.new(1351396800,1365310800,-18000,0,:EST)}
-add_period(2013,4) {TimezonePeriod.new(1365310800,1382846400,-18000,3600,:EDT)}
-add_period(2013,10) {TimezonePeriod.new(1382846400,1396760400,-18000,0,:EST)}
-add_period(2014,4) {TimezonePeriod.new(1396760400,1414296000,-18000,3600,:EDT)}
-add_period(2014,10) {TimezonePeriod.new(1414296000,1428210000,-18000,0,:EST)}
-add_period(2015,4) {TimezonePeriod.new(1428210000,1445745600,-18000,3600,:EDT)}
-add_period(2015,10) {TimezonePeriod.new(1445745600,1459659600,-18000,0,:EST)}
-add_period(2016,4) {TimezonePeriod.new(1459659600,1477800000,-18000,3600,:EDT)}
-add_period(2016,10) {TimezonePeriod.new(1477800000,1491109200,-18000,0,:EST)}
-add_period(2017,4) {TimezonePeriod.new(1491109200,1509249600,-18000,3600,:EDT)}
-add_period(2017,10) {TimezonePeriod.new(1509249600,1522558800,-18000,0,:EST)}
-add_period(2018,4) {TimezonePeriod.new(1522558800,1540699200,-18000,3600,:EDT)}
-add_period(2018,10) {TimezonePeriod.new(1540699200,1554613200,-18000,0,:EST)}
-add_period(2019,4) {TimezonePeriod.new(1554613200,1572148800,-18000,3600,:EDT)}
-add_period(2019,10) {TimezonePeriod.new(1572148800,1586062800,-18000,0,:EST)}
-add_period(2020,4) {TimezonePeriod.new(1586062800,1603598400,-18000,3600,:EDT)}
-add_period(2020,10) {TimezonePeriod.new(1603598400,1617512400,-18000,0,:EST)}
-add_period(2021,4) {TimezonePeriod.new(1617512400,1635652800,-18000,3600,:EDT)}
-add_period(2021,10) {TimezonePeriod.new(1635652800,1648962000,-18000,0,:EST)}
-add_period(2022,4) {TimezonePeriod.new(1648962000,1667102400,-18000,3600,:EDT)}
-add_period(2022,10) {TimezonePeriod.new(1667102400,1680411600,-18000,0,:EST)}
-add_period(2023,4) {TimezonePeriod.new(1680411600,1698552000,-18000,3600,:EDT)}
-add_period(2023,10) {TimezonePeriod.new(1698552000,1712466000,-18000,0,:EST)}
-add_period(2024,4) {TimezonePeriod.new(1712466000,1730001600,-18000,3600,:EDT)}
-add_period(2024,10) {TimezonePeriod.new(1730001600,1743915600,-18000,0,:EST)}
-add_period(2025,4) {TimezonePeriod.new(1743915600,1761451200,-18000,3600,:EDT)}
-add_period(2025,10) {TimezonePeriod.new(1761451200,1775365200,-18000,0,:EST)}
-add_period(2026,4) {TimezonePeriod.new(1775365200,1792900800,-18000,3600,:EDT)}
-add_period(2026,10) {TimezonePeriod.new(1792900800,1806814800,-18000,0,:EST)}
-add_period(2027,4) {TimezonePeriod.new(1806814800,1824955200,-18000,3600,:EDT)}
-add_period(2027,10) {TimezonePeriod.new(1824955200,1838264400,-18000,0,:EST)}
-add_period(2028,4) {TimezonePeriod.new(1838264400,1856404800,-18000,3600,:EDT)}
-add_period(2028,10) {TimezonePeriod.new(1856404800,1869714000,-18000,0,:EST)}
-add_period(2029,4) {TimezonePeriod.new(1869714000,1887854400,-18000,3600,:EDT)}
-add_period(2029,10) {TimezonePeriod.new(1887854400,1901768400,-18000,0,:EST)}
-add_period(2030,4) {TimezonePeriod.new(1901768400,1919304000,-18000,3600,:EDT)}
-add_period(2030,10) {TimezonePeriod.new(1919304000,1933218000,-18000,0,:EST)}
-add_period(2031,4) {TimezonePeriod.new(1933218000,1950753600,-18000,3600,:EDT)}
-add_period(2031,10) {TimezonePeriod.new(1950753600,1964667600,-18000,0,:EST)}
-add_period(2032,4) {TimezonePeriod.new(1964667600,1982808000,-18000,3600,:EDT)}
-add_period(2032,10) {TimezonePeriod.new(1982808000,1996117200,-18000,0,:EST)}
-add_period(2033,4) {TimezonePeriod.new(1996117200,2014257600,-18000,3600,:EDT)}
-add_period(2033,10) {TimezonePeriod.new(2014257600,2027566800,-18000,0,:EST)}
-add_period(2034,4) {TimezonePeriod.new(2027566800,2045707200,-18000,3600,:EDT)}
-add_period(2034,10) {TimezonePeriod.new(2045707200,2059016400,-18000,0,:EST)}
-add_period(2035,4) {TimezonePeriod.new(2059016400,2077156800,-18000,3600,:EDT)}
-add_period(2035,10) {TimezonePeriod.new(2077156800,2091070800,-18000,0,:EST)}
-add_period(2036,4) {TimezonePeriod.new(2091070800,2108606400,-18000,3600,:EDT)}
-add_period(2036,10) {TimezonePeriod.new(2108606400,2122520400,-18000,0,:EST)}
-add_period(2037,4) {TimezonePeriod.new(2122520400,2140056000,-18000,3600,:EDT)}
-add_period(2037,10) {TimezonePeriod.new(2140056000,DateTime.new0(Rational.new!(59172425,24),0,Date::ITALY),-18000,0,:EST)}
-add_period(2038,4) {TimezonePeriod.new(DateTime.new0(Rational.new!(59172425,24),0,Date::ITALY),DateTime.new0(Rational.new!(7397183,3),0,Date::ITALY),-18000,3600,:EDT)}
-add_period(2038,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(7397183,3),0,Date::ITALY),DateTime.new0(Rational.new!(59181161,24),0,Date::ITALY),-18000,0,:EST)}
-add_period(2039,4) {TimezonePeriod.new(DateTime.new0(Rational.new!(59181161,24),0,Date::ITALY),DateTime.new0(Rational.new!(7398275,3),0,Date::ITALY),-18000,3600,:EDT)}
-add_period(2039,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(7398275,3),0,Date::ITALY),DateTime.new0(Rational.new!(59189897,24),0,Date::ITALY),-18000,0,:EST)}
-add_period(2040,4) {TimezonePeriod.new(DateTime.new0(Rational.new!(59189897,24),0,Date::ITALY),DateTime.new0(Rational.new!(7399367,3),0,Date::ITALY),-18000,3600,:EDT)}
-add_period(2040,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(7399367,3),0,Date::ITALY),DateTime.new0(Rational.new!(59198801,24),0,Date::ITALY),-18000,0,:EST)}
-add_period(2041,4) {TimezonePeriod.new(DateTime.new0(Rational.new!(59198801,24),0,Date::ITALY),DateTime.new0(Rational.new!(7400459,3),0,Date::ITALY),-18000,3600,:EDT)}
-add_period(2041,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(7400459,3),0,Date::ITALY),DateTime.new0(Rational.new!(59207537,24),0,Date::ITALY),-18000,0,:EST)}
-add_period(2042,4) {TimezonePeriod.new(DateTime.new0(Rational.new!(59207537,24),0,Date::ITALY),DateTime.new0(Rational.new!(7401551,3),0,Date::ITALY),-18000,3600,:EDT)}
-add_period(2042,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(7401551,3),0,Date::ITALY),DateTime.new0(Rational.new!(59216273,24),0,Date::ITALY),-18000,0,:EST)}
-add_period(2043,4) {TimezonePeriod.new(DateTime.new0(Rational.new!(59216273,24),0,Date::ITALY),DateTime.new0(Rational.new!(7402643,3),0,Date::ITALY),-18000,3600,:EDT)}
-add_period(2043,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(7402643,3),0,Date::ITALY),DateTime.new0(Rational.new!(59225009,24),0,Date::ITALY),-18000,0,:EST)}
-add_period(2044,4) {TimezonePeriod.new(DateTime.new0(Rational.new!(59225009,24),0,Date::ITALY),DateTime.new0(Rational.new!(7403756,3),0,Date::ITALY),-18000,3600,:EDT)}
-add_period(2044,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(7403756,3),0,Date::ITALY),DateTime.new0(Rational.new!(59233745,24),0,Date::ITALY),-18000,0,:EST)}
-add_period(2045,4) {TimezonePeriod.new(DateTime.new0(Rational.new!(59233745,24),0,Date::ITALY),DateTime.new0(Rational.new!(7404848,3),0,Date::ITALY),-18000,3600,:EDT)}
-add_period(2045,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(7404848,3),0,Date::ITALY),DateTime.new0(Rational.new!(59242481,24),0,Date::ITALY),-18000,0,:EST)}
-add_period(2046,4) {TimezonePeriod.new(DateTime.new0(Rational.new!(59242481,24),0,Date::ITALY),DateTime.new0(Rational.new!(7405940,3),0,Date::ITALY),-18000,3600,:EDT)}
-add_period(2046,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(7405940,3),0,Date::ITALY),DateTime.new0(Rational.new!(59251385,24),0,Date::ITALY),-18000,0,:EST)}
-add_period(2047,4) {TimezonePeriod.new(DateTime.new0(Rational.new!(59251385,24),0,Date::ITALY),DateTime.new0(Rational.new!(7407032,3),0,Date::ITALY),-18000,3600,:EDT)}
-add_period(2047,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(7407032,3),0,Date::ITALY),DateTime.new0(Rational.new!(59260121,24),0,Date::ITALY),-18000,0,:EST)}
-add_period(2048,4) {TimezonePeriod.new(DateTime.new0(Rational.new!(59260121,24),0,Date::ITALY),DateTime.new0(Rational.new!(7408124,3),0,Date::ITALY),-18000,3600,:EDT)}
-add_period(2048,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(7408124,3),0,Date::ITALY),DateTime.new0(Rational.new!(59268857,24),0,Date::ITALY),-18000,0,:EST)}
-add_period(2049,4) {TimezonePeriod.new(DateTime.new0(Rational.new!(59268857,24),0,Date::ITALY),DateTime.new0(Rational.new!(7409237,3),0,Date::ITALY),-18000,3600,:EDT)}
-add_period(2049,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(7409237,3),0,Date::ITALY),DateTime.new0(Rational.new!(59277593,24),0,Date::ITALY),-18000,0,:EST)}
-add_period(2050,4) {TimezonePeriod.new(DateTime.new0(Rational.new!(59277593,24),0,Date::ITALY),DateTime.new0(Rational.new!(7410329,3),0,Date::ITALY),-18000,3600,:EDT)}
-add_period(2050,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(7410329,3),0,Date::ITALY),nil,-18000,0,:EST)}
-end
-end
-end
+  module Definitions
+    module America
+      module Port__m__au__m__Prince
+        include TimezoneDefinition
+        
+        timezone 'America/Port-au-Prince' do |tz|
+          tz.offset :o0, -17360, 0, :LMT
+          tz.offset :o1, -17340, 0, :PPMT
+          tz.offset :o2, -18000, 0, :EST
+          tz.offset :o3, -18000, 3600, :EDT
+          
+          tz.transition 1890, 1, :o1, 2604278197, 1080
+          tz.transition 1917, 1, :o2, 3486604609, 1440
+          tz.transition 1983, 5, :o3, 421218000
+          tz.transition 1983, 10, :o2, 436334400
+          tz.transition 1984, 4, :o3, 452062800
+          tz.transition 1984, 10, :o2, 467784000
+          tz.transition 1985, 4, :o3, 483512400
+          tz.transition 1985, 10, :o2, 499233600
+          tz.transition 1986, 4, :o3, 514962000
+          tz.transition 1986, 10, :o2, 530683200
+          tz.transition 1987, 4, :o3, 546411600
+          tz.transition 1987, 10, :o2, 562132800
+          tz.transition 1988, 4, :o3, 576050400
+          tz.transition 1988, 10, :o2, 594194400
+          tz.transition 1989, 4, :o3, 607500000
+          tz.transition 1989, 10, :o2, 625644000
+          tz.transition 1990, 4, :o3, 638949600
+          tz.transition 1990, 10, :o2, 657093600
+          tz.transition 1991, 4, :o3, 671004000
+          tz.transition 1991, 10, :o2, 688543200
+          tz.transition 1992, 4, :o3, 702453600
+          tz.transition 1992, 10, :o2, 719992800
+          tz.transition 1993, 4, :o3, 733903200
+          tz.transition 1993, 10, :o2, 752047200
+          tz.transition 1994, 4, :o3, 765352800
+          tz.transition 1994, 10, :o2, 783496800
+          tz.transition 1995, 4, :o3, 796802400
+          tz.transition 1995, 10, :o2, 814946400
+          tz.transition 1996, 4, :o3, 828856800
+          tz.transition 1996, 10, :o2, 846396000
+          tz.transition 1997, 4, :o3, 860306400
+          tz.transition 1997, 10, :o2, 877845600
+          tz.transition 2005, 4, :o3, 1112504400
+          tz.transition 2005, 10, :o2, 1130644800
+          tz.transition 2006, 4, :o3, 1143954000
+          tz.transition 2006, 10, :o2, 1162094400
+          tz.transition 2007, 4, :o3, 1175403600
+          tz.transition 2007, 10, :o2, 1193544000
+          tz.transition 2008, 4, :o3, 1207458000
+          tz.transition 2008, 10, :o2, 1224993600
+          tz.transition 2009, 4, :o3, 1238907600
+          tz.transition 2009, 10, :o2, 1256443200
+          tz.transition 2010, 4, :o3, 1270357200
+          tz.transition 2010, 10, :o2, 1288497600
+          tz.transition 2011, 4, :o3, 1301806800
+          tz.transition 2011, 10, :o2, 1319947200
+          tz.transition 2012, 4, :o3, 1333256400
+          tz.transition 2012, 10, :o2, 1351396800
+          tz.transition 2013, 4, :o3, 1365310800
+          tz.transition 2013, 10, :o2, 1382846400
+          tz.transition 2014, 4, :o3, 1396760400
+          tz.transition 2014, 10, :o2, 1414296000
+          tz.transition 2015, 4, :o3, 1428210000
+          tz.transition 2015, 10, :o2, 1445745600
+          tz.transition 2016, 4, :o3, 1459659600
+          tz.transition 2016, 10, :o2, 1477800000
+          tz.transition 2017, 4, :o3, 1491109200
+          tz.transition 2017, 10, :o2, 1509249600
+          tz.transition 2018, 4, :o3, 1522558800
+          tz.transition 2018, 10, :o2, 1540699200
+          tz.transition 2019, 4, :o3, 1554613200
+          tz.transition 2019, 10, :o2, 1572148800
+          tz.transition 2020, 4, :o3, 1586062800
+          tz.transition 2020, 10, :o2, 1603598400
+          tz.transition 2021, 4, :o3, 1617512400
+          tz.transition 2021, 10, :o2, 1635652800
+          tz.transition 2022, 4, :o3, 1648962000
+          tz.transition 2022, 10, :o2, 1667102400
+          tz.transition 2023, 4, :o3, 1680411600
+          tz.transition 2023, 10, :o2, 1698552000
+          tz.transition 2024, 4, :o3, 1712466000
+          tz.transition 2024, 10, :o2, 1730001600
+          tz.transition 2025, 4, :o3, 1743915600
+          tz.transition 2025, 10, :o2, 1761451200
+          tz.transition 2026, 4, :o3, 1775365200
+          tz.transition 2026, 10, :o2, 1792900800
+          tz.transition 2027, 4, :o3, 1806814800
+          tz.transition 2027, 10, :o2, 1824955200
+          tz.transition 2028, 4, :o3, 1838264400
+          tz.transition 2028, 10, :o2, 1856404800
+          tz.transition 2029, 4, :o3, 1869714000
+          tz.transition 2029, 10, :o2, 1887854400
+          tz.transition 2030, 4, :o3, 1901768400
+          tz.transition 2030, 10, :o2, 1919304000
+          tz.transition 2031, 4, :o3, 1933218000
+          tz.transition 2031, 10, :o2, 1950753600
+          tz.transition 2032, 4, :o3, 1964667600
+          tz.transition 2032, 10, :o2, 1982808000
+          tz.transition 2033, 4, :o3, 1996117200
+          tz.transition 2033, 10, :o2, 2014257600
+          tz.transition 2034, 4, :o3, 2027566800
+          tz.transition 2034, 10, :o2, 2045707200
+          tz.transition 2035, 4, :o3, 2059016400
+          tz.transition 2035, 10, :o2, 2077156800
+          tz.transition 2036, 4, :o3, 2091070800
+          tz.transition 2036, 10, :o2, 2108606400
+          tz.transition 2037, 4, :o3, 2122520400
+          tz.transition 2037, 10, :o2, 2140056000
+          tz.transition 2038, 4, :o3, 59172425, 24
+          tz.transition 2038, 10, :o2, 7397183, 3
+          tz.transition 2039, 4, :o3, 59181161, 24
+          tz.transition 2039, 10, :o2, 7398275, 3
+          tz.transition 2040, 4, :o3, 59189897, 24
+          tz.transition 2040, 10, :o2, 7399367, 3
+          tz.transition 2041, 4, :o3, 59198801, 24
+          tz.transition 2041, 10, :o2, 7400459, 3
+          tz.transition 2042, 4, :o3, 59207537, 24
+          tz.transition 2042, 10, :o2, 7401551, 3
+          tz.transition 2043, 4, :o3, 59216273, 24
+          tz.transition 2043, 10, :o2, 7402643, 3
+          tz.transition 2044, 4, :o3, 59225009, 24
+          tz.transition 2044, 10, :o2, 7403756, 3
+          tz.transition 2045, 4, :o3, 59233745, 24
+          tz.transition 2045, 10, :o2, 7404848, 3
+          tz.transition 2046, 4, :o3, 59242481, 24
+          tz.transition 2046, 10, :o2, 7405940, 3
+          tz.transition 2047, 4, :o3, 59251385, 24
+          tz.transition 2047, 10, :o2, 7407032, 3
+          tz.transition 2048, 4, :o3, 59260121, 24
+          tz.transition 2048, 10, :o2, 7408124, 3
+          tz.transition 2049, 4, :o3, 59268857, 24
+          tz.transition 2049, 10, :o2, 7409237, 3
+          tz.transition 2050, 4, :o3, 59277593, 24
+          tz.transition 2050, 10, :o2, 7410329, 3
+        end
+      end
+    end
+  end
 end

data/lib/tzinfo/definitions/America/Port_of_Spain.rb

@@ -1,13 +1,18 @@
-require 'tzinfo/timezone'
+require 'tzinfo/timezone_definition'
+
 module TZInfo
-module Definitions #:nodoc:
-module America #:nodoc:
-class Port_of_Spain < Timezone #:nodoc:
-setup
-set_identifier('America/Port_of_Spain')
-add_unbounded_start_period {TimezonePeriod.new(nil,DateTime.new0(Rational.new!(52260415291,21600),0,Date::ITALY),-14764,0,:LMT)}
-add_period(1912,3) {TimezonePeriod.new(DateTime.new0(Rational.new!(52260415291,21600),0,Date::ITALY),nil,-14400,0,:AST)}
-end
-end
-end
+  module Definitions
+    module America
+      module Port_of_Spain
+        include TimezoneDefinition
+        
+        timezone 'America/Port_of_Spain' do |tz|
+          tz.offset :o0, -14764, 0, :LMT
+          tz.offset :o1, -14400, 0, :AST
+          
+          tz.transition 1912, 3, :o1, 52260415291, 21600
+        end
+      end
+    end
+  end
 end

data/lib/tzinfo/definitions/America/Porto_Acre.rb

@@ -1,12 +1,13 @@
-require 'tzinfo/timezone'
-require 'tzinfo/definitions/America/Rio_Branco'
+require 'tzinfo/timezone_definition'
+
 module TZInfo
-module Definitions #:nodoc:
-module America #:nodoc:
-class Porto_Acre < Definitions::America::Rio_Branco #:nodoc:
-setup_linked
-set_identifier('America/Porto_Acre')
-end
-end
-end
+  module Definitions
+    module America
+      module Porto_Acre
+        include TimezoneDefinition
+        
+        linked_timezone 'America/Porto_Acre', 'America/Rio_Branco'
+      end
+    end
+  end
 end

data/lib/tzinfo/definitions/America/Porto_Velho.rb

@@ -1,41 +1,47 @@
-require 'tzinfo/timezone'
+require 'tzinfo/timezone_definition'
+
 module TZInfo
-module Definitions #:nodoc:
-module America #:nodoc:
-class Porto_Velho < Timezone #:nodoc:
-setup
-set_identifier('America/Porto_Velho')
-add_unbounded_start_period {TimezonePeriod.new(nil,DateTime.new0(Rational.new!(968053471,400),0,Date::ITALY),-15336,0,:LMT)}
-add_period(1914,1) {TimezonePeriod.new(DateTime.new0(Rational.new!(968053471,400),0,Date::ITALY),DateTime.new0(Rational.new!(19412945,8),0,Date::ITALY),-14400,0,:AMT)}
-add_period(1931,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(19412945,8),0,Date::ITALY),DateTime.new0(Rational.new!(19414389,8),0,Date::ITALY),-14400,3600,:AMST)}
-add_period(1932,4) {TimezonePeriod.new(DateTime.new0(Rational.new!(19414389,8),0,Date::ITALY),DateTime.new0(Rational.new!(7280951,3),0,Date::ITALY),-14400,0,:AMT)}
-add_period(1932,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(7280951,3),0,Date::ITALY),DateTime.new0(Rational.new!(19417309,8),0,Date::ITALY),-14400,3600,:AMST)}
-add_period(1933,4) {TimezonePeriod.new(DateTime.new0(Rational.new!(19417309,8),0,Date::ITALY),DateTime.new0(Rational.new!(7299755,3),0,Date::ITALY),-14400,0,:AMT)}
-add_period(1949,12) {TimezonePeriod.new(DateTime.new0(Rational.new!(7299755,3),0,Date::ITALY),DateTime.new0(Rational.new!(7300163,3),0,Date::ITALY),-14400,3600,:AMST)}
-add_period(1950,4) {TimezonePeriod.new(DateTime.new0(Rational.new!(7300163,3),0,Date::ITALY),DateTime.new0(Rational.new!(7300850,3),0,Date::ITALY),-14400,0,:AMT)}
-add_period(1950,12) {TimezonePeriod.new(DateTime.new0(Rational.new!(7300850,3),0,Date::ITALY),DateTime.new0(Rational.new!(19469901,8),0,Date::ITALY),-14400,3600,:AMST)}
-add_period(1951,4) {TimezonePeriod.new(DateTime.new0(Rational.new!(19469901,8),0,Date::ITALY),DateTime.new0(Rational.new!(7301945,3),0,Date::ITALY),-14400,0,:AMT)}
-add_period(1951,12) {TimezonePeriod.new(DateTime.new0(Rational.new!(7301945,3),0,Date::ITALY),DateTime.new0(Rational.new!(19472829,8),0,Date::ITALY),-14400,3600,:AMST)}
-add_period(1952,4) {TimezonePeriod.new(DateTime.new0(Rational.new!(19472829,8),0,Date::ITALY),DateTime.new0(Rational.new!(7303043,3),0,Date::ITALY),-14400,0,:AMT)}
-add_period(1952,12) {TimezonePeriod.new(DateTime.new0(Rational.new!(7303043,3),0,Date::ITALY),DateTime.new0(Rational.new!(19475501,8),0,Date::ITALY),-14400,3600,:AMST)}
-add_period(1953,3) {TimezonePeriod.new(DateTime.new0(Rational.new!(19475501,8),0,Date::ITALY),DateTime.new0(Rational.new!(7315118,3),0,Date::ITALY),-14400,0,:AMT)}
-add_period(1963,12) {TimezonePeriod.new(DateTime.new0(Rational.new!(7315118,3),0,Date::ITALY),DateTime.new0(Rational.new!(19507645,8),0,Date::ITALY),-14400,3600,:AMST)}
-add_period(1964,3) {TimezonePeriod.new(DateTime.new0(Rational.new!(19507645,8),0,Date::ITALY),DateTime.new0(Rational.new!(7316375,3),0,Date::ITALY),-14400,0,:AMT)}
-add_period(1965,1) {TimezonePeriod.new(DateTime.new0(Rational.new!(7316375,3),0,Date::ITALY),DateTime.new0(Rational.new!(19510805,8),0,Date::ITALY),-14400,3600,:AMST)}
-add_period(1965,3) {TimezonePeriod.new(DateTime.new0(Rational.new!(19510805,8),0,Date::ITALY),DateTime.new0(Rational.new!(7317287,3),0,Date::ITALY),-14400,0,:AMT)}
-add_period(1965,12) {TimezonePeriod.new(DateTime.new0(Rational.new!(7317287,3),0,Date::ITALY),DateTime.new0(Rational.new!(19513485,8),0,Date::ITALY),-14400,3600,:AMST)}
-add_period(1966,3) {TimezonePeriod.new(DateTime.new0(Rational.new!(19513485,8),0,Date::ITALY),DateTime.new0(Rational.new!(7318292,3),0,Date::ITALY),-14400,0,:AMT)}
-add_period(1966,11) {TimezonePeriod.new(DateTime.new0(Rational.new!(7318292,3),0,Date::ITALY),DateTime.new0(Rational.new!(19516405,8),0,Date::ITALY),-14400,3600,:AMST)}
-add_period(1967,3) {TimezonePeriod.new(DateTime.new0(Rational.new!(19516405,8),0,Date::ITALY),DateTime.new0(Rational.new!(7319387,3),0,Date::ITALY),-14400,0,:AMT)}
-add_period(1967,11) {TimezonePeriod.new(DateTime.new0(Rational.new!(7319387,3),0,Date::ITALY),DateTime.new0(Rational.new!(19519333,8),0,Date::ITALY),-14400,3600,:AMST)}
-add_period(1968,3) {TimezonePeriod.new(DateTime.new0(Rational.new!(19519333,8),0,Date::ITALY),499752000,-14400,0,:AMT)}
-add_period(1985,11) {TimezonePeriod.new(499752000,511239600,-14400,3600,:AMST)}
-add_period(1986,3) {TimezonePeriod.new(511239600,530596800,-14400,0,:AMT)}
-add_period(1986,10) {TimezonePeriod.new(530596800,540270000,-14400,3600,:AMST)}
-add_period(1987,2) {TimezonePeriod.new(540270000,562132800,-14400,0,:AMT)}
-add_period(1987,10) {TimezonePeriod.new(562132800,571201200,-14400,3600,:AMST)}
-add_period(1988,2) {TimezonePeriod.new(571201200,nil,-14400,0,:AMT)}
-end
-end
-end
+  module Definitions
+    module America
+      module Porto_Velho
+        include TimezoneDefinition
+        
+        timezone 'America/Porto_Velho' do |tz|
+          tz.offset :o0, -15336, 0, :LMT
+          tz.offset :o1, -14400, 0, :AMT
+          tz.offset :o2, -14400, 3600, :AMST
+          
+          tz.transition 1914, 1, :o1, 968053471, 400
+          tz.transition 1931, 10, :o2, 19412945, 8
+          tz.transition 1932, 4, :o1, 19414389, 8
+          tz.transition 1932, 10, :o2, 7280951, 3
+          tz.transition 1933, 4, :o1, 19417309, 8
+          tz.transition 1949, 12, :o2, 7299755, 3
+          tz.transition 1950, 4, :o1, 7300163, 3
+          tz.transition 1950, 12, :o2, 7300850, 3
+          tz.transition 1951, 4, :o1, 19469901, 8
+          tz.transition 1951, 12, :o2, 7301945, 3
+          tz.transition 1952, 4, :o1, 19472829, 8
+          tz.transition 1952, 12, :o2, 7303043, 3
+          tz.transition 1953, 3, :o1, 19475501, 8
+          tz.transition 1963, 12, :o2, 7315118, 3
+          tz.transition 1964, 3, :o1, 19507645, 8
+          tz.transition 1965, 1, :o2, 7316375, 3
+          tz.transition 1965, 3, :o1, 19510805, 8
+          tz.transition 1965, 12, :o2, 7317287, 3
+          tz.transition 1966, 3, :o1, 19513485, 8
+          tz.transition 1966, 11, :o2, 7318292, 3
+          tz.transition 1967, 3, :o1, 19516405, 8
+          tz.transition 1967, 11, :o2, 7319387, 3
+          tz.transition 1968, 3, :o1, 19519333, 8
+          tz.transition 1985, 11, :o2, 499752000
+          tz.transition 1986, 3, :o1, 511239600
+          tz.transition 1986, 10, :o2, 530596800
+          tz.transition 1987, 2, :o1, 540270000
+          tz.transition 1987, 10, :o2, 562132800
+          tz.transition 1988, 2, :o1, 571201200
+        end
+      end
+    end
+  end
 end