tzinfo 0.0.1 → 0.0.2

data/lib/tzinfo/countries/ZA.rb

@@ -2,17 +2,11 @@ require 'tzinfo/country'
 module TZInfo #:nodoc:
 module Countries #:nodoc:
 class ZA < Country #:nodoc:
-def initialize
-  super
-  set_code('ZA')
-  set_name('South Africa')
-  add_zone('Africa/Johannesburg')
-  zones_added
-end
-@@instance = new
-def self.instance
-   @@instance
-end
+setup
+set_code('ZA')
+set_name('South Africa')
+add_zone('Africa/Johannesburg')
+zones_added
 end
 end
 end

data/lib/tzinfo/countries/ZM.rb

@@ -2,17 +2,11 @@ require 'tzinfo/country'
 module TZInfo #:nodoc:
 module Countries #:nodoc:
 class ZM < Country #:nodoc:
-def initialize
-  super
-  set_code('ZM')
-  set_name('Zambia')
-  add_zone('Africa/Lusaka')
-  zones_added
-end
-@@instance = new
-def self.instance
-   @@instance
-end
+setup
+set_code('ZM')
+set_name('Zambia')
+add_zone('Africa/Lusaka')
+zones_added
 end
 end
 end

data/lib/tzinfo/countries/ZW.rb

@@ -2,17 +2,11 @@ require 'tzinfo/country'
 module TZInfo #:nodoc:
 module Countries #:nodoc:
 class ZW < Country #:nodoc:
-def initialize
-  super
-  set_code('ZW')
-  set_name('Zimbabwe')
-  add_zone('Africa/Harare')
-  zones_added
-end
-@@instance = new
-def self.instance
-   @@instance
-end
+setup
+set_code('ZW')
+set_name('Zimbabwe')
+add_zone('Africa/Harare')
+zones_added
 end
 end
 end

data/lib/tzinfo/country.rb

@@ -8,9 +8,6 @@ module TZInfo
   #  puts us.zone_identifiers
   #  puts us.zones    
   class Country
-    # Array of Timezone identifiers for the country.
-    attr_reader :zone_names
-    
     # Gets a Country by its ISO 3166 code. Raising an exception if it couldn't
     # be found.
     def self.get(identifier)
@@ -19,6 +16,15 @@ module TZInfo
       Countries.const_get(identifier).instance      
     end
     
+    # If identifier is nil calls super(), else calls get(identifier).
+    def self.new(identifier = nil)
+      if identifier
+        get(identifier)
+      else
+        super()
+      end
+    end
+    
     # Returns an Array of all the valid country codes.
     def self.all_codes
       require 'tzinfo/countries/Index'
@@ -34,20 +40,22 @@ module TZInfo
     
     # Initializes the Country.
     def initialize
-      super
-      @zone_names = []
-      @code = nil
-      @name = nil      
+            
     end
     
     # The country code.
     def code
-      @code
+      'Unknown'
     end
     
     # The name of the country.
     def name
-      @name
+      'Unknown'
+    end
+    
+    # Array of Timezone identifiers for the country.
+    def zone_names
+      []
     end
     
     # Array of Timezone identifiers for the country.
@@ -57,26 +65,48 @@ module TZInfo
     
     # An array of all the Timezones for this country.
     def zones
-      @zone_names.collect {|zone_name|
+      zone_names.collect {|zone_name|
         Timezone.get(zone_name)
       }
     end
             
     protected
-      def add_zone(zone_name)
-        @zone_names << zone_name
-      end
-      
-      def zones_added
-        @zone_names.freeze
-      end
-      
-      def set_code(code)
-        @code = code
-      end
-      
-      def set_name(name)
-        @name = name
-      end            
+      def self.setup
+        class_eval <<CODE
+            @@zone_names = []
+            def self.add_zone(zone_name)              
+              @@zone_names << zone_name
+            end
+            
+            def self.zones_added
+              @@zone_names.freeze
+            end
+            
+            def self.set_code(code)
+              @@code = code
+            end
+            
+            def self.set_name(name)
+              @@name = name
+            end
+                        
+            def zone_names
+              @@zone_names
+            end            
+            
+            def code
+              @@code
+            end
+            
+            def name
+              @@name
+            end
+            
+            @@instance = new
+            def self.instance
+              @@instance
+            end          
+CODE
+      end           
   end    
 end

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

@@ -3,16 +3,10 @@ module TZInfo
 module Definitions #:nodoc:
 module Africa #:nodoc:
 class Abidjan < Timezone #:nodoc:
-def initialize
-  super
+setup
 set_identifier('Africa/Abidjan')
-add_period(TimezonePeriod.new(nil,DateTime.new(1912,1,1,0,16,8),-968,0,'LMT'))
-add_period(TimezonePeriod.new(DateTime.new(1912,1,1,0,16,8),nil,0,0,'GMT'))
-end
-@@instance = new
-def self.instance
-   @@instance
-end
+add_period(TimezonePeriod.new(nil,DateTime.new(1912,1,1,0,16,8),-968,0,:'LMT'))
+add_period(TimezonePeriod.new(DateTime.new(1912,1,1,0,16,8),nil,0,0,:'GMT'))
 end
 end
 end

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

@@ -3,30 +3,24 @@ module TZInfo
 module Definitions #:nodoc:
 module Africa #:nodoc:
 class Accra < Timezone #:nodoc:
-def initialize
-  super
+setup
 set_identifier('Africa/Accra')
-add_period(TimezonePeriod.new(nil,DateTime.new(1918,1,1,0,0,52),-52,0,'LMT'))
-add_period(TimezonePeriod.new(DateTime.new(1918,1,1,0,0,52),DateTime.new(1936,9,1,0,0,0),0,0,''))
-add_period(TimezonePeriod.new(DateTime.new(1936,9,1,0,0,0),DateTime.new(1936,12,30,23,40,0),0,1200,'GHST'))
-add_period(TimezonePeriod.new(DateTime.new(1936,12,30,23,40,0),DateTime.new(1937,9,1,0,0,0),0,0,'GMT'))
-add_period(TimezonePeriod.new(DateTime.new(1937,9,1,0,0,0),DateTime.new(1937,12,30,23,40,0),0,1200,'GHST'))
-add_period(TimezonePeriod.new(DateTime.new(1937,12,30,23,40,0),DateTime.new(1938,9,1,0,0,0),0,0,'GMT'))
-add_period(TimezonePeriod.new(DateTime.new(1938,9,1,0,0,0),DateTime.new(1938,12,30,23,40,0),0,1200,'GHST'))
-add_period(TimezonePeriod.new(DateTime.new(1938,12,30,23,40,0),DateTime.new(1939,9,1,0,0,0),0,0,'GMT'))
-add_period(TimezonePeriod.new(DateTime.new(1939,9,1,0,0,0),DateTime.new(1939,12,30,23,40,0),0,1200,'GHST'))
-add_period(TimezonePeriod.new(DateTime.new(1939,12,30,23,40,0),DateTime.new(1940,9,1,0,0,0),0,0,'GMT'))
-add_period(TimezonePeriod.new(DateTime.new(1940,9,1,0,0,0),DateTime.new(1940,12,30,23,40,0),0,1200,'GHST'))
-add_period(TimezonePeriod.new(DateTime.new(1940,12,30,23,40,0),DateTime.new(1941,9,1,0,0,0),0,0,'GMT'))
-add_period(TimezonePeriod.new(DateTime.new(1941,9,1,0,0,0),DateTime.new(1941,12,30,23,40,0),0,1200,'GHST'))
-add_period(TimezonePeriod.new(DateTime.new(1941,12,30,23,40,0),DateTime.new(1942,9,1,0,0,0),0,0,'GMT'))
-add_period(TimezonePeriod.new(DateTime.new(1942,9,1,0,0,0),DateTime.new(1942,12,30,23,40,0),0,1200,'GHST'))
-add_period(TimezonePeriod.new(DateTime.new(1942,12,30,23,40,0),DateTime.new(2045,8,19,20,49,31),0,0,'GMT'))
-end
-@@instance = new
-def self.instance
-   @@instance
-end
+add_period(TimezonePeriod.new(nil,DateTime.new(1918,1,1,0,0,52),-52,0,:'LMT'))
+add_period(TimezonePeriod.new(DateTime.new(1918,1,1,0,0,52),DateTime.new(1936,9,1,0,0,0),0,0,:'Unknown'))
+add_period(TimezonePeriod.new(DateTime.new(1936,9,1,0,0,0),DateTime.new(1936,12,30,23,40,0),0,1200,:'GHST'))
+add_period(TimezonePeriod.new(DateTime.new(1936,12,30,23,40,0),DateTime.new(1937,9,1,0,0,0),0,0,:'GMT'))
+add_period(TimezonePeriod.new(DateTime.new(1937,9,1,0,0,0),DateTime.new(1937,12,30,23,40,0),0,1200,:'GHST'))
+add_period(TimezonePeriod.new(DateTime.new(1937,12,30,23,40,0),DateTime.new(1938,9,1,0,0,0),0,0,:'GMT'))
+add_period(TimezonePeriod.new(DateTime.new(1938,9,1,0,0,0),DateTime.new(1938,12,30,23,40,0),0,1200,:'GHST'))
+add_period(TimezonePeriod.new(DateTime.new(1938,12,30,23,40,0),DateTime.new(1939,9,1,0,0,0),0,0,:'GMT'))
+add_period(TimezonePeriod.new(DateTime.new(1939,9,1,0,0,0),DateTime.new(1939,12,30,23,40,0),0,1200,:'GHST'))
+add_period(TimezonePeriod.new(DateTime.new(1939,12,30,23,40,0),DateTime.new(1940,9,1,0,0,0),0,0,:'GMT'))
+add_period(TimezonePeriod.new(DateTime.new(1940,9,1,0,0,0),DateTime.new(1940,12,30,23,40,0),0,1200,:'GHST'))
+add_period(TimezonePeriod.new(DateTime.new(1940,12,30,23,40,0),DateTime.new(1941,9,1,0,0,0),0,0,:'GMT'))
+add_period(TimezonePeriod.new(DateTime.new(1941,9,1,0,0,0),DateTime.new(1941,12,30,23,40,0),0,1200,:'GHST'))
+add_period(TimezonePeriod.new(DateTime.new(1941,12,30,23,40,0),DateTime.new(1942,9,1,0,0,0),0,0,:'GMT'))
+add_period(TimezonePeriod.new(DateTime.new(1942,9,1,0,0,0),DateTime.new(1942,12,30,23,40,0),0,1200,:'GHST'))
+add_period(TimezonePeriod.new(DateTime.new(1942,12,30,23,40,0),DateTime.new(2045,9,3,22,38,11),0,0,:'GMT'))
 end
 end
 end

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

@@ -3,17 +3,11 @@ module TZInfo
 module Definitions #:nodoc:
 module Africa #:nodoc:
 class Addis_Ababa < Timezone #:nodoc:
-def initialize
-  super
+setup
 set_identifier('Africa/Addis_Ababa')
-add_period(TimezonePeriod.new(nil,DateTime.new(1869,12,31,21,25,12),9288,0,'LMT'))
-add_period(TimezonePeriod.new(DateTime.new(1869,12,31,21,25,12),DateTime.new(1936,5,4,21,24,40),9320,0,'ADMT'))
-add_period(TimezonePeriod.new(DateTime.new(1936,5,4,21,24,40),nil,10800,0,'EAT'))
-end
-@@instance = new
-def self.instance
-   @@instance
-end
+add_period(TimezonePeriod.new(nil,DateTime.new(1869,12,31,21,25,12),9288,0,:'LMT'))
+add_period(TimezonePeriod.new(DateTime.new(1869,12,31,21,25,12),DateTime.new(1936,5,4,21,24,40),9320,0,:'ADMT'))
+add_period(TimezonePeriod.new(DateTime.new(1936,5,4,21,24,40),nil,10800,0,:'EAT'))
 end
 end
 end

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

@@ -3,49 +3,43 @@ module TZInfo
 module Definitions #:nodoc:
 module Africa #:nodoc:
 class Algiers < Timezone #:nodoc:
-def initialize
-  super
+setup
 set_identifier('Africa/Algiers')
-add_period(TimezonePeriod.new(nil,DateTime.new(1891,3,14,23,48,48),732,0,'LMT'))
-add_period(TimezonePeriod.new(DateTime.new(1891,3,14,23,48,48),DateTime.new(1911,3,10,23,50,39),561,0,'PMT'))
-add_period(TimezonePeriod.new(DateTime.new(1911,3,10,23,50,39),DateTime.new(1916,6,14,23,0,0),0,0,'WET'))
-add_period(TimezonePeriod.new(DateTime.new(1916,6,14,23,0,0),DateTime.new(1916,10,1,23,0,0),0,3600,'WEST'))
-add_period(TimezonePeriod.new(DateTime.new(1916,10,1,23,0,0),DateTime.new(1917,3,24,23,0,0),0,0,'WET'))
-add_period(TimezonePeriod.new(DateTime.new(1917,3,24,23,0,0),DateTime.new(1917,10,7,23,0,0),0,3600,'WEST'))
-add_period(TimezonePeriod.new(DateTime.new(1917,10,7,23,0,0),DateTime.new(1918,3,9,23,0,0),0,0,'WET'))
-add_period(TimezonePeriod.new(DateTime.new(1918,3,9,23,0,0),DateTime.new(1918,10,6,23,0,0),0,3600,'WEST'))
-add_period(TimezonePeriod.new(DateTime.new(1918,10,6,23,0,0),DateTime.new(1919,3,1,23,0,0),0,0,'WET'))
-add_period(TimezonePeriod.new(DateTime.new(1919,3,1,23,0,0),DateTime.new(1919,10,5,23,0,0),0,3600,'WEST'))
-add_period(TimezonePeriod.new(DateTime.new(1919,10,5,23,0,0),DateTime.new(1920,2,14,23,0,0),0,0,'WET'))
-add_period(TimezonePeriod.new(DateTime.new(1920,2,14,23,0,0),DateTime.new(1920,10,23,23,0,0),0,3600,'WEST'))
-add_period(TimezonePeriod.new(DateTime.new(1920,10,23,23,0,0),DateTime.new(1921,3,14,23,0,0),0,0,'WET'))
-add_period(TimezonePeriod.new(DateTime.new(1921,3,14,23,0,0),DateTime.new(1921,6,21,23,0,0),0,3600,'WEST'))
-add_period(TimezonePeriod.new(DateTime.new(1921,6,21,23,0,0),DateTime.new(1939,9,11,23,0,0),0,0,'WET'))
-add_period(TimezonePeriod.new(DateTime.new(1939,9,11,23,0,0),DateTime.new(1939,11,19,0,0,0),0,3600,'WEST'))
-add_period(TimezonePeriod.new(DateTime.new(1939,11,19,0,0,0),DateTime.new(1940,2,25,2,0,0),0,0,'WET'))
-add_period(TimezonePeriod.new(DateTime.new(1940,2,25,2,0,0),DateTime.new(1944,4,3,1,0,0),3600,0,'CET'))
-add_period(TimezonePeriod.new(DateTime.new(1944,4,3,1,0,0),DateTime.new(1944,10,8,0,0,0),3600,3600,'CEST'))
-add_period(TimezonePeriod.new(DateTime.new(1944,10,8,0,0,0),DateTime.new(1945,4,2,1,0,0),3600,0,'CET'))
-add_period(TimezonePeriod.new(DateTime.new(1945,4,2,1,0,0),DateTime.new(1945,9,15,23,0,0),3600,3600,'CEST'))
-add_period(TimezonePeriod.new(DateTime.new(1945,9,15,23,0,0),DateTime.new(1946,10,6,23,0,0),3600,0,'CET'))
-add_period(TimezonePeriod.new(DateTime.new(1946,10,6,23,0,0),DateTime.new(1956,1,29,0,0,0),0,0,'WET'))
-add_period(TimezonePeriod.new(DateTime.new(1956,1,29,0,0,0),DateTime.new(1963,4,13,23,0,0),3600,0,'CET'))
-add_period(TimezonePeriod.new(DateTime.new(1963,4,13,23,0,0),DateTime.new(1971,4,25,23,0,0),0,0,'WET'))
-add_period(TimezonePeriod.new(DateTime.new(1971,4,25,23,0,0),DateTime.new(1971,9,26,23,0,0),0,3600,'WEST'))
-add_period(TimezonePeriod.new(DateTime.new(1971,9,26,23,0,0),DateTime.new(1977,5,6,0,0,0),0,0,'WET'))
-add_period(TimezonePeriod.new(DateTime.new(1977,5,6,0,0,0),DateTime.new(1977,10,20,23,0,0),0,3600,'WEST'))
-add_period(TimezonePeriod.new(DateTime.new(1977,10,20,23,0,0),DateTime.new(1978,3,24,0,0,0),3600,0,'CET'))
-add_period(TimezonePeriod.new(DateTime.new(1978,3,24,0,0,0),DateTime.new(1978,9,22,1,0,0),3600,3600,'CEST'))
-add_period(TimezonePeriod.new(DateTime.new(1978,9,22,1,0,0),DateTime.new(1979,10,25,23,0,0),3600,0,'CET'))
-add_period(TimezonePeriod.new(DateTime.new(1979,10,25,23,0,0),DateTime.new(1980,4,25,0,0,0),0,0,'WET'))
-add_period(TimezonePeriod.new(DateTime.new(1980,4,25,0,0,0),DateTime.new(1980,10,31,1,0,0),0,3600,'WEST'))
-add_period(TimezonePeriod.new(DateTime.new(1980,10,31,1,0,0),DateTime.new(1981,5,1,0,0,0),0,0,'WET'))
-add_period(TimezonePeriod.new(DateTime.new(1981,5,1,0,0,0),nil,3600,0,'CET'))
-end
-@@instance = new
-def self.instance
-   @@instance
-end
+add_period(TimezonePeriod.new(nil,DateTime.new(1891,3,14,23,48,48),732,0,:'LMT'))
+add_period(TimezonePeriod.new(DateTime.new(1891,3,14,23,48,48),DateTime.new(1911,3,10,23,50,39),561,0,:'PMT'))
+add_period(TimezonePeriod.new(DateTime.new(1911,3,10,23,50,39),DateTime.new(1916,6,14,23,0,0),0,0,:'WET'))
+add_period(TimezonePeriod.new(DateTime.new(1916,6,14,23,0,0),DateTime.new(1916,10,1,23,0,0),0,3600,:'WEST'))
+add_period(TimezonePeriod.new(DateTime.new(1916,10,1,23,0,0),DateTime.new(1917,3,24,23,0,0),0,0,:'WET'))
+add_period(TimezonePeriod.new(DateTime.new(1917,3,24,23,0,0),DateTime.new(1917,10,7,23,0,0),0,3600,:'WEST'))
+add_period(TimezonePeriod.new(DateTime.new(1917,10,7,23,0,0),DateTime.new(1918,3,9,23,0,0),0,0,:'WET'))
+add_period(TimezonePeriod.new(DateTime.new(1918,3,9,23,0,0),DateTime.new(1918,10,6,23,0,0),0,3600,:'WEST'))
+add_period(TimezonePeriod.new(DateTime.new(1918,10,6,23,0,0),DateTime.new(1919,3,1,23,0,0),0,0,:'WET'))
+add_period(TimezonePeriod.new(DateTime.new(1919,3,1,23,0,0),DateTime.new(1919,10,5,23,0,0),0,3600,:'WEST'))
+add_period(TimezonePeriod.new(DateTime.new(1919,10,5,23,0,0),DateTime.new(1920,2,14,23,0,0),0,0,:'WET'))
+add_period(TimezonePeriod.new(DateTime.new(1920,2,14,23,0,0),DateTime.new(1920,10,23,23,0,0),0,3600,:'WEST'))
+add_period(TimezonePeriod.new(DateTime.new(1920,10,23,23,0,0),DateTime.new(1921,3,14,23,0,0),0,0,:'WET'))
+add_period(TimezonePeriod.new(DateTime.new(1921,3,14,23,0,0),DateTime.new(1921,6,21,23,0,0),0,3600,:'WEST'))
+add_period(TimezonePeriod.new(DateTime.new(1921,6,21,23,0,0),DateTime.new(1939,9,11,23,0,0),0,0,:'WET'))
+add_period(TimezonePeriod.new(DateTime.new(1939,9,11,23,0,0),DateTime.new(1939,11,19,0,0,0),0,3600,:'WEST'))
+add_period(TimezonePeriod.new(DateTime.new(1939,11,19,0,0,0),DateTime.new(1940,2,25,2,0,0),0,0,:'WET'))
+add_period(TimezonePeriod.new(DateTime.new(1940,2,25,2,0,0),DateTime.new(1944,4,3,1,0,0),3600,0,:'CET'))
+add_period(TimezonePeriod.new(DateTime.new(1944,4,3,1,0,0),DateTime.new(1944,10,8,0,0,0),3600,3600,:'CEST'))
+add_period(TimezonePeriod.new(DateTime.new(1944,10,8,0,0,0),DateTime.new(1945,4,2,1,0,0),3600,0,:'CET'))
+add_period(TimezonePeriod.new(DateTime.new(1945,4,2,1,0,0),DateTime.new(1945,9,15,23,0,0),3600,3600,:'CEST'))
+add_period(TimezonePeriod.new(DateTime.new(1945,9,15,23,0,0),DateTime.new(1946,10,6,23,0,0),3600,0,:'CET'))
+add_period(TimezonePeriod.new(DateTime.new(1946,10,6,23,0,0),DateTime.new(1956,1,29,0,0,0),0,0,:'WET'))
+add_period(TimezonePeriod.new(DateTime.new(1956,1,29,0,0,0),DateTime.new(1963,4,13,23,0,0),3600,0,:'CET'))
+add_period(TimezonePeriod.new(DateTime.new(1963,4,13,23,0,0),DateTime.new(1971,4,25,23,0,0),0,0,:'WET'))
+add_period(TimezonePeriod.new(DateTime.new(1971,4,25,23,0,0),DateTime.new(1971,9,26,23,0,0),0,3600,:'WEST'))
+add_period(TimezonePeriod.new(DateTime.new(1971,9,26,23,0,0),DateTime.new(1977,5,6,0,0,0),0,0,:'WET'))
+add_period(TimezonePeriod.new(DateTime.new(1977,5,6,0,0,0),DateTime.new(1977,10,20,23,0,0),0,3600,:'WEST'))
+add_period(TimezonePeriod.new(DateTime.new(1977,10,20,23,0,0),DateTime.new(1978,3,24,0,0,0),3600,0,:'CET'))
+add_period(TimezonePeriod.new(DateTime.new(1978,3,24,0,0,0),DateTime.new(1978,9,22,1,0,0),3600,3600,:'CEST'))
+add_period(TimezonePeriod.new(DateTime.new(1978,9,22,1,0,0),DateTime.new(1979,10,25,23,0,0),3600,0,:'CET'))
+add_period(TimezonePeriod.new(DateTime.new(1979,10,25,23,0,0),DateTime.new(1980,4,25,0,0,0),0,0,:'WET'))
+add_period(TimezonePeriod.new(DateTime.new(1980,4,25,0,0,0),DateTime.new(1980,10,31,1,0,0),0,3600,:'WEST'))
+add_period(TimezonePeriod.new(DateTime.new(1980,10,31,1,0,0),DateTime.new(1981,5,1,0,0,0),0,0,:'WET'))
+add_period(TimezonePeriod.new(DateTime.new(1981,5,1,0,0,0),nil,3600,0,:'CET'))
 end
 end
 end

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

@@ -3,18 +3,12 @@ module TZInfo
 module Definitions #:nodoc:
 module Africa #:nodoc:
 class Asmera < Timezone #:nodoc:
-def initialize
-  super
+setup
 set_identifier('Africa/Asmera')
-add_period(TimezonePeriod.new(nil,DateTime.new(1869,12,31,21,24,28),9332,0,'LMT'))
-add_period(TimezonePeriod.new(DateTime.new(1869,12,31,21,24,28),DateTime.new(1889,12,31,21,24,28),9332,0,'AMT'))
-add_period(TimezonePeriod.new(DateTime.new(1889,12,31,21,24,28),DateTime.new(1936,5,4,21,24,40),9320,0,'ADMT'))
-add_period(TimezonePeriod.new(DateTime.new(1936,5,4,21,24,40),nil,10800,0,'EAT'))
-end
-@@instance = new
-def self.instance
-   @@instance
-end
+add_period(TimezonePeriod.new(nil,DateTime.new(1869,12,31,21,24,28),9332,0,:'LMT'))
+add_period(TimezonePeriod.new(DateTime.new(1869,12,31,21,24,28),DateTime.new(1889,12,31,21,24,28),9332,0,:'AMT'))
+add_period(TimezonePeriod.new(DateTime.new(1889,12,31,21,24,28),DateTime.new(1936,5,4,21,24,40),9320,0,:'ADMT'))
+add_period(TimezonePeriod.new(DateTime.new(1936,5,4,21,24,40),nil,10800,0,:'EAT'))
 end
 end
 end

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

@@ -3,18 +3,12 @@ module TZInfo
 module Definitions #:nodoc:
 module Africa #:nodoc:
 class Bamako < Timezone #:nodoc:
-def initialize
-  super
+setup
 set_identifier('Africa/Bamako')
-add_period(TimezonePeriod.new(nil,DateTime.new(1912,1,1,0,32,0),-1920,0,'LMT'))
-add_period(TimezonePeriod.new(DateTime.new(1912,1,1,0,32,0),DateTime.new(1934,2,26,0,0,0),0,0,'GMT'))
-add_period(TimezonePeriod.new(DateTime.new(1934,2,26,0,0,0),DateTime.new(1960,6,20,1,0,0),-3600,0,'WAT'))
-add_period(TimezonePeriod.new(DateTime.new(1960,6,20,1,0,0),nil,0,0,'GMT'))
-end
-@@instance = new
-def self.instance
-   @@instance
-end
+add_period(TimezonePeriod.new(nil,DateTime.new(1912,1,1,0,32,0),-1920,0,:'LMT'))
+add_period(TimezonePeriod.new(DateTime.new(1912,1,1,0,32,0),DateTime.new(1934,2,26,0,0,0),0,0,:'GMT'))
+add_period(TimezonePeriod.new(DateTime.new(1934,2,26,0,0,0),DateTime.new(1960,6,20,1,0,0),-3600,0,:'WAT'))
+add_period(TimezonePeriod.new(DateTime.new(1960,6,20,1,0,0),nil,0,0,:'GMT'))
 end
 end
 end

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

@@ -3,16 +3,10 @@ module TZInfo
 module Definitions #:nodoc:
 module Africa #:nodoc:
 class Bangui < Timezone #:nodoc:
-def initialize
-  super
+setup
 set_identifier('Africa/Bangui')
-add_period(TimezonePeriod.new(nil,DateTime.new(1911,12,31,22,45,40),4460,0,'LMT'))
-add_period(TimezonePeriod.new(DateTime.new(1911,12,31,22,45,40),nil,3600,0,'WAT'))
-end
-@@instance = new
-def self.instance
-   @@instance
-end
+add_period(TimezonePeriod.new(nil,DateTime.new(1911,12,31,22,45,40),4460,0,:'LMT'))
+add_period(TimezonePeriod.new(DateTime.new(1911,12,31,22,45,40),nil,3600,0,:'WAT'))
 end
 end
 end

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

@@ -3,18 +3,12 @@ module TZInfo
 module Definitions #:nodoc:
 module Africa #:nodoc:
 class Banjul < Timezone #:nodoc:
-def initialize
-  super
+setup
 set_identifier('Africa/Banjul')
-add_period(TimezonePeriod.new(nil,DateTime.new(1912,1,1,1,6,36),-3996,0,'LMT'))
-add_period(TimezonePeriod.new(DateTime.new(1912,1,1,1,6,36),DateTime.new(1935,1,1,1,6,36),-3996,0,'BMT'))
-add_period(TimezonePeriod.new(DateTime.new(1935,1,1,1,6,36),DateTime.new(1964,1,1,1,0,0),-3600,0,'WAT'))
-add_period(TimezonePeriod.new(DateTime.new(1964,1,1,1,0,0),nil,0,0,'GMT'))
-end
-@@instance = new
-def self.instance
-   @@instance
-end
+add_period(TimezonePeriod.new(nil,DateTime.new(1912,1,1,1,6,36),-3996,0,:'LMT'))
+add_period(TimezonePeriod.new(DateTime.new(1912,1,1,1,6,36),DateTime.new(1935,1,1,1,6,36),-3996,0,:'BMT'))
+add_period(TimezonePeriod.new(DateTime.new(1935,1,1,1,6,36),DateTime.new(1964,1,1,1,0,0),-3600,0,:'WAT'))
+add_period(TimezonePeriod.new(DateTime.new(1964,1,1,1,0,0),nil,0,0,:'GMT'))
 end
 end
 end