Khartoum.rb in tzinfo-0.3.0

- old
+ new
@@ -1,46 +1,53 @@
-require 'tzinfo/timezone'
+require 'tzinfo/timezone_definition'
+
 module TZInfo
-module Definitions #:nodoc:
-module Africa #:nodoc:
-class Khartoum < Timezone #:nodoc:
-setup
-set_identifier('Africa/Khartoum')
-add_unbounded_start_period {TimezonePeriod.new(nil,DateTime.new0(Rational.new!(3275562253,1350),0,Date::ITALY),7808,0,:LMT)}
-add_period(1930,12) {TimezonePeriod.new(DateTime.new0(Rational.new!(3275562253,1350),0,Date::ITALY),10360800,7200,0,:CAT)}
-add_period(1970,4) {TimezonePeriod.new(10360800,24786000,7200,3600,:CAST)}
-add_period(1970,10) {TimezonePeriod.new(24786000,41810400,7200,0,:CAT)}
-add_period(1971,4) {TimezonePeriod.new(41810400,56322000,7200,3600,:CAST)}
-add_period(1971,10) {TimezonePeriod.new(56322000,73432800,7200,0,:CAT)}
-add_period(1972,4) {TimezonePeriod.new(73432800,87944400,7200,3600,:CAST)}
-add_period(1972,10) {TimezonePeriod.new(87944400,104882400,7200,0,:CAT)}
-add_period(1973,4) {TimezonePeriod.new(104882400,119480400,7200,3600,:CAST)}
-add_period(1973,10) {TimezonePeriod.new(119480400,136332000,7200,0,:CAT)}
-add_period(1974,4) {TimezonePeriod.new(136332000,151016400,7200,3600,:CAST)}
-add_period(1974,10) {TimezonePeriod.new(151016400,167781600,7200,0,:CAT)}
-add_period(1975,4) {TimezonePeriod.new(167781600,182552400,7200,3600,:CAST)}
-add_period(1975,10) {TimezonePeriod.new(182552400,199231200,7200,0,:CAT)}
-add_period(1976,4) {TimezonePeriod.new(199231200,214174800,7200,3600,:CAST)}
-add_period(1976,10) {TimezonePeriod.new(214174800,230680800,7200,0,:CAT)}
-add_period(1977,4) {TimezonePeriod.new(230680800,245710800,7200,3600,:CAST)}
-add_period(1977,10) {TimezonePeriod.new(245710800,262735200,7200,0,:CAT)}
-add_period(1978,4) {TimezonePeriod.new(262735200,277246800,7200,3600,:CAST)}
-add_period(1978,10) {TimezonePeriod.new(277246800,294184800,7200,0,:CAT)}
-add_period(1979,4) {TimezonePeriod.new(294184800,308782800,7200,3600,:CAST)}
-add_period(1979,10) {TimezonePeriod.new(308782800,325634400,7200,0,:CAT)}
-add_period(1980,4) {TimezonePeriod.new(325634400,340405200,7200,3600,:CAST)}
-add_period(1980,10) {TimezonePeriod.new(340405200,357084000,7200,0,:CAT)}
-add_period(1981,4) {TimezonePeriod.new(357084000,371941200,7200,3600,:CAST)}
-add_period(1981,10) {TimezonePeriod.new(371941200,388533600,7200,0,:CAT)}
-add_period(1982,4) {TimezonePeriod.new(388533600,403477200,7200,3600,:CAST)}
-add_period(1982,10) {TimezonePeriod.new(403477200,419983200,7200,0,:CAT)}
-add_period(1983,4) {TimezonePeriod.new(419983200,435013200,7200,3600,:CAST)}
-add_period(1983,10) {TimezonePeriod.new(435013200,452037600,7200,0,:CAT)}
-add_period(1984,4) {TimezonePeriod.new(452037600,466635600,7200,3600,:CAST)}
-add_period(1984,10) {TimezonePeriod.new(466635600,483487200,7200,0,:CAT)}
-add_period(1985,4) {TimezonePeriod.new(483487200,498171600,7200,3600,:CAST)}
-add_period(1985,10) {TimezonePeriod.new(498171600,947930400,7200,0,:CAT)}
-add_period(2000,1) {TimezonePeriod.new(947930400,nil,10800,0,:EAT)}
-end
-end
-end
+  module Definitions
+    module Africa
+      module Khartoum
+        include TimezoneDefinition
+        
+        timezone 'Africa/Khartoum' do |tz|
+          tz.offset :o0, 7808, 0, :LMT
+          tz.offset :o1, 7200, 0, :CAT
+          tz.offset :o2, 7200, 3600, :CAST
+          tz.offset :o3, 10800, 0, :EAT
+          
+          tz.transition 1930, 12, :o1, 3275562253, 1350
+          tz.transition 1970, 4, :o2, 10360800
+          tz.transition 1970, 10, :o1, 24786000
+          tz.transition 1971, 4, :o2, 41810400
+          tz.transition 1971, 10, :o1, 56322000
+          tz.transition 1972, 4, :o2, 73432800
+          tz.transition 1972, 10, :o1, 87944400
+          tz.transition 1973, 4, :o2, 104882400
+          tz.transition 1973, 10, :o1, 119480400
+          tz.transition 1974, 4, :o2, 136332000
+          tz.transition 1974, 10, :o1, 151016400
+          tz.transition 1975, 4, :o2, 167781600
+          tz.transition 1975, 10, :o1, 182552400
+          tz.transition 1976, 4, :o2, 199231200
+          tz.transition 1976, 10, :o1, 214174800
+          tz.transition 1977, 4, :o2, 230680800
+          tz.transition 1977, 10, :o1, 245710800
+          tz.transition 1978, 4, :o2, 262735200
+          tz.transition 1978, 10, :o1, 277246800
+          tz.transition 1979, 4, :o2, 294184800
+          tz.transition 1979, 10, :o1, 308782800
+          tz.transition 1980, 4, :o2, 325634400
+          tz.transition 1980, 10, :o1, 340405200
+          tz.transition 1981, 4, :o2, 357084000
+          tz.transition 1981, 10, :o1, 371941200
+          tz.transition 1982, 4, :o2, 388533600
+          tz.transition 1982, 10, :o1, 403477200
+          tz.transition 1983, 4, :o2, 419983200
+          tz.transition 1983, 10, :o1, 435013200
+          tz.transition 1984, 4, :o2, 452037600
+          tz.transition 1984, 10, :o1, 466635600
+          tz.transition 1985, 4, :o2, 483487200
+          tz.transition 1985, 10, :o1, 498171600
+          tz.transition 2000, 1, :o3, 947930400
+        end
+      end
+    end
+  end
 end