tzinfo 0.2.2 → 0.3.0

data/lib/tzinfo/timezone_proxy.rb

@@ -0,0 +1,85 @@
+#--
+# Copyright (c) 2005-2006 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
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+require 'tzinfo/timezone'
+
+module TZInfo
+
+  # A proxy class representing a timezone with a given identifier. TimezoneProxy
+  # inherits from Timezone and can be treated like any Timezone loaded with
+  # Timezone.get.
+  #
+  # The first time an attempt is made to access the data for the timezone, the 
+  # real Timezone is loaded. If the proxy's identifier was not valid, then an 
+  # exception will be raised at this point.  
+  class TimezoneProxy < Timezone
+    # Construct a new TimezoneProxy for the given identifier. The identifier
+    # is not checked when constructing the proxy. It will be validated on the
+    # when the real Timezone is loaded.
+    def self.new(identifier)
+      # Need to override new to undo the behaviour introduced in Timezone#new.
+      tzp = super()
+      tzp.send(:setup, identifier)
+      tzp
+    end
+        
+    # The identifier of the timezone, e.g. "Europe/Paris".
+    def identifier
+      @real_timezone ? @real_timezone.identifier : @identifier
+    end
+    
+    # Returns the TimezonePeriod for the given UTC time. utc can either be
+    # a DateTime, Time or integer timestamp (Time.to_i). Any timezone 
+    # information in utc is ignored (it is treated as a UTC time).        
+    def period_for_utc(utc)            
+      real_timezone.period_for_utc(utc)            
+    end
+    
+    # Returns the set of TimezonePeriod instances that are valid for the given
+    # local time as an array. If you just want a single period, use 
+    # period_for_local instead and specify how abiguities should be resolved.
+    # Returns an empty array if no periods are found for the given time.
+    def periods_for_local(local)
+      real_timezone.periods_for_local(local)
+    end
+    
+    # Dumps this TimezoneProxy for marshalling.
+    def _dump(limit)
+      identifier
+    end
+    
+    # Loads a marshalled TimezoneProxy.
+    def self._load(data)
+      TimezoneProxy.new(data)
+    end
+    
+    private
+      def setup(identifier)
+        @identifier = identifier
+        @real_timezone = nil
+      end  
+    
+      def real_timezone
+        @real_timezone ||= Timezone.get(@identifier)
+      end     
+  end 
+end

data/lib/tzinfo/timezone_transition_info.rb

@@ -0,0 +1,127 @@
+#--
+# Copyright (c) 2006 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
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
+
+require 'date'
+require 'tzinfo/time_or_datetime'
+
+module TZInfo
+  # Represents an offset defined in a Timezone data file.
+  class TimezoneTransitionInfo #:nodoc:
+    # The offset this transition changes to (a TimezoneOffsetInfo instance).
+    attr_reader :offset
+    
+    # The offset this transition changes from (a TimezoneOffsetInfo instance).
+    attr_reader :previous_offset
+    
+    # The numerator of the DateTime if the transition time is defined as a 
+    # DateTime, otherwise the transition time as a timestamp.
+    attr_reader :numerator_or_time
+    protected :numerator_or_time
+    
+    # Either the denominotor of the DateTime if the transition time is defined
+    # as a DateTime, otherwise nil. 
+    attr_reader :denominator
+    protected :denominator
+    
+    # Creates a new TimezoneTransitionInfo with the given offset, 
+    # previous_offset (both TimezoneOffsetInfo instances) and UTC time. 
+    # if denominator is nil, numerator_or_time is treated as a number of 
+    # seconds since the epoch. If denominator is specified numerator_or_time
+    # and denominator are used to create a DateTime as follows:
+    # 
+    #  DateTime.new0(Rational.new!(numerator_or_time, denominator), 0, Date::ITALY)
+    #
+    # For performance reasons, the numerator and denominator must be specified
+    # in their lowest form.
+    def initialize(offset, previous_offset, numerator_or_time, denominator = nil)
+      @offset = offset
+      @previous_offset = previous_offset
+      @numerator_or_time = numerator_or_time
+      @denominator = denominator
+      
+      @at = nil
+      @local_end = nil
+      @local_start = nil
+    end
+    
+    # A TimeOrDateTime instance representing the UTC time when this transition
+    # occurs.
+    def at
+      unless @at
+        unless @denominator 
+          @at = TimeOrDateTime.new(@numerator_or_time)
+        else
+          @at = TimeOrDateTime.new(DateTime.new0(Rational.new!(@numerator_or_time, @denominator), 0, Date::ITALY))
+        end
+      end
+      
+      @at
+    end
+    
+    # A TimeOrDateTime instance representing the local time when this transition
+    # causes the previous observance to end (calculated from at using 
+    # previous_offset).
+    def local_end
+      @local_end = at.add_with_convert(@previous_offset.utc_total_offset) unless @local_end      
+      @local_end
+    end
+    
+    # A TimeOrDateTime instance representing the local time when this transition
+    # causes the next observance to start (calculated from at using offset).
+    def local_start
+      @local_start = at.add_with_convert(@offset.utc_total_offset) unless @local_start
+      @local_start
+    end
+    
+    # Returns true if this TimezoneTransitionInfo is equal to the given
+    # TimezoneTransitionInfo. Two TimezoneTransitionInfo instances are 
+    # considered to be equal by == if offset, previous_offset and at are all 
+    # equal.
+    def ==(tti)
+      tti.respond_to?(:offset) && tti.respond_to?(:previous_offset) && tti.respond_to?(:at) &&
+        offset == tti.offset && previous_offset == tti.previous_offset && at == tti.at
+    end
+    
+    # Returns true if this TimezoneTransitionInfo is equal to the given
+    # TimezoneTransitionInfo. Two TimezoneTransitionInfo instances are 
+    # considered to be equal by eql? if offset, previous_offset, 
+    # numerator_or_time and denominator are all equal. This is stronger than ==,
+    # which just requires the at times to be equal regardless of how they were
+    # originally specified.
+    def eql?(tti)
+      tti.respond_to?(:offset) && tti.respond_to?(:previous_offset) &&
+        tti.respond_to?(:numerator_or_time) && tti.respond_to?(:denominator) &&
+        offset == tti.offset && previous_offset == tti.previous_offset &&
+        numerator_or_time == tti.numerator_or_time && denominator == tti.denominator        
+    end
+    
+    # Returns a hash of this TimezoneTransitionInfo instance.
+    def hash
+      @offset.hash ^ @previous_offset.hash ^ @numerator_or_time.hash ^ @denominator.hash
+    end
+    
+    # Returns internal object state as a programmer-readable string.
+    def inspect
+      "#<#{self.class}: #{at.inspect},#{@offset.inspect}>"      
+    end
+  end
+end

data/lib/tzinfo/tzdataparser.rb

@@ -26,12 +26,10 @@ require 'fileutils'
 module TZInfo
   
   # Parses tzdata from ftp://elsie.nci.nih.gov/pub/ and transforms it into 
-  # a set of Ruby classes that can be used through Timezone and Country.
+  # a set of Ruby modules that can be used through Timezone and Country.
   # 
-  # Normally, this class wouldn't be used. It is only run to create a new
-  # tzinfo version for a new version of the tzdata data.
-  #
-  # This process is extremely slow (optimization is required).
+  # Normally, this class wouldn't be used. It is only run to update the 
+  # timezone data and index modules.
   class TZDataParser    
     # Minimum year that will be considered.
     MIN_YEAR = 1800
@@ -50,25 +48,14 @@ module TZInfo
     # Limit the set of zones to generate (set to an array containing zone
     # identifiers).
     attr_accessor :only_zones
-    
-    # Limit the set of countries to generate (set to an array containing
-    # country codes).
-    attr_accessor :only_countries
-  
+        
     # Zones to exclude from generation when not using only_zones (set to an
-    # array containing zone identifiers). Defaults to:
-    #
-    #   ['Asia/Riyadh87', 'Asia/Riyadh88', 'Asia/Riyadh89',
-    #    'Mideast/Riyadh87', 'Mideast/Riyadh88', 'Mideast/Ruyadh89']
-    attr_accessor :exclude_zones
-    
-    # Countries to exclude from generation when not using only_countries (set
-    # to an array containing country codes).
-    attr_accessor :exclude_countries    
+    # array containing zone identifiers).
+    attr_accessor :exclude_zones            
     
     # Initializes a new TZDataParser. input_dir must contain the extracted
-    # tzdata tarball. output_dir is the location to output the classes
-    # (in countries and definitions directories).
+    # tzdata tarball. output_dir is the location to output the modules
+    # (in definitions and indexes directories).
     def initialize(input_dir, output_dir)
       super()
       @input_dir = input_dir
@@ -79,10 +66,8 @@ module TZInfo
       @no_rules = TZDataNoRules.new
       @generate_zones = true
       @generate_countries = true
-      @only_zones = []
-      @only_countries = []
-      @exclude_zones = []
-      @exclude_countries = []
+      @only_zones = []      
+      @exclude_zones = []      
     end
     
     # Reads the tzdata source and generates the classes. Takes a long time
@@ -103,24 +88,23 @@ module TZInfo
       load_countries
       
       if @generate_zones
+        modules = []
+        
         if @only_zones.nil? || @only_zones.empty?
           @zones.each_value {|zone|
-            zone.write_class(@output_dir) unless @exclude_zones.include?(zone.name)
+            zone.write_module(@output_dir) unless @exclude_zones.include?(zone.name)
           }
         else
-          @only_zones.each {|id| @zones[id].write_class(@output_dir) }
+          @only_zones.each {|id|
+            zone = @zones[id]
+            zone.write_module(@output_dir)            
+          }          
         end
+        
+        write_timezones_index
       end
       
-      if @generate_countries
-        if @only_countries.nil? || @only_countries.empty?          
-          @countries.each_value {|country|
-            country.write_class(@output_dir) unless @exclude_countries.include?(country.code)
-          }
-        else
-          @only_countries.each {|code| @countries[code].write_class(@output_dir) }
-        end
-      
+      if @generate_countries        
         write_countries_index
       end
     end
@@ -177,6 +161,12 @@ module TZInfo
       seconds
     end
     
+    # Encloses the string in single quotes and escapes any single quotes in
+    # the content.
+    def self.quote_str(str)
+      "'#{str.gsub('\'', '\\\\\'')}'"
+    end
+        
     private
       # Loads all the Rule definitions from the tz data and stores them in
       # @rule_sets.
@@ -270,69 +260,88 @@ module TZInfo
       def load_countries
         puts 'load_countries'
         
-        IO.foreach(@input_dir + File::SEPARATOR + 'iso3166.tab') {|line|
-          line = line.gsub(/#.*$/, '')
-          line = line.gsub(/\s+$/, '')
-          
-          if line =~ /^([A-Z]{2})\s+(.*)$/
+        IO.foreach(@input_dir + File::SEPARATOR + 'iso3166.tab') {|line|          
+          if line =~ /^([A-Z]{2})\t(.*)$/
             code = $1
-            name = $2            
+            name = $2
             @countries[code] = TZDataCountry.new(code, name)
           end
         }
         
-        IO.foreach(@input_dir + File::SEPARATOR + 'zone.tab') {|line|
-          line = line.gsub(/#.*$/, '')
-          line = line.gsub(/\s+$/, '')
-          
-          if line =~ /^([A-Z]{2})\s+([^\s]+)\s+([^\s]+)(\s+(.*))?$/
+        IO.foreach(@input_dir + File::SEPARATOR + 'zone.tab') {|line|          
+          line.chomp!          
+
+          if line =~ /^([A-Z]{2})\t([^\t]+)\t([^\t]+)(\t(.*))?$/
             code = $1
-            zone_name = $3            
-            
+            location_str = $2
+            zone_name = $3
+            description = $5
+
             country = @countries[code]
             raise "Country not found: #{code}" if country.nil?
             
+            location = TZDataLocation.new(location_str)
+            
             zone = @zones[zone_name]
             raise "Zone not found: #{zone_name}" if zone.nil?                        
             
-            country.add_zone(zone)
+            description = nil if description == ''
+            
+            country.add_zone(TZDataCountryTimezone.new(zone, description, location))
           end
         }
       end
       
       # Writes a country index file.
       def write_countries_index
-        dir = @output_dir + File::SEPARATOR + 'countries'      
+        dir = @output_dir + File::SEPARATOR + 'indexes'      
         FileUtils.mkdir_p(dir)
         
-        File.open(dir + File::SEPARATOR + 'Index.rb', 'w') {|file|        
-          file.puts('require \'tzinfo/country\'')        
+        File.open(dir + File::SEPARATOR + 'countries.rb', 'w') {|file|
+          file.binmode        
+               
+          file.puts('require \'tzinfo/country_index_definition\'')
+          file.puts('')
           file.puts('module TZInfo')
-          file.puts('module Countries')
-                             
-          file.puts('class Index #:nodoc:')
-        
-          file.puts('@@all_codes = [')
+          file.puts('  module Indexes')
+          file.puts('    module Countries')
+          file.puts('      include CountryIndexDefinition')
+          file.puts('')
           
-          @countries.each_value {|country|
-            file.puts("'#{country.code.gsub(/'/, '\\\'')}',")
-          }
-          
-          file.puts(']')
-          file.puts('@@all_codes.freeze')
-          
-          file.puts('def self.all_codes')
-          file.puts('  @@all_codes')
-          file.puts('end')           
+          countries = @countries.values.sort {|c1,c2| c1.code <=> c2.code}  
+          countries.each {|country| country.write_index_record(file)}
+                    
+          file.puts('    end') # end module Countries                    
+          file.puts('  end') # end module Indexes
+          file.puts('end') # end module TZInfo
+        }                      
+      end
+      
+      # Writes a timezone index file.
+      def write_timezones_index
+        dir = File.join(@output_dir, 'indexes')
+        FileUtils.mkdir_p(dir)
+        
+        File.open(File.join(dir, 'timezones.rb'), 'w') do |file|
+          file.binmode
           
-          file.puts('end') # end class
+          file.puts('require \'tzinfo/timezone_index_definition\'')
+          file.puts('')
+          file.puts('module TZInfo')
+          file.puts('  module Indexes')
+          file.puts('    module Timezones')
+          file.puts('      include TimezoneIndexDefinition')
+          file.puts('')
           
+          zones = @zones.values.sort {|t1,t2| t1.name <=> t2.name}
+          zones.each {|zone| zone.write_index_record(file)}
           
-          file.puts('end') # end module Countries
+          file.puts('    end') # end module Timezones
+          file.puts('  end') # end module Indexes
           file.puts('end') # end module TZInfo
-        }                      
+        end
+        
       end
-    
   end
   
   # Base class for all rule sets.
@@ -473,50 +482,67 @@ module TZInfo
   # Base class for Zones and Links.
   class TZDataDefinition #:nodoc:
     attr_reader :name
-    attr_reader :name_for_class
+    attr_reader :name_elements
+    attr_reader :path_elements
     
     def initialize(name)
       @name = name
       
       # + and - aren't allowed in class names
-      @name_for_class = name.gsub(/-/, '__m__').gsub(/\+/, '__p__')
+      @name_elements = name.gsub(/-/, '__m__').gsub(/\+/, '__p__').split(/\//)
+      @path_elements = @name_elements.clone
+      @path_elements.pop
     end        
     
     # Creates necessary directories, the file, writes the class header and footer
     # and yields to a block to write the content.    
-    def create_file(output_dir)      
-      modules = @name_for_class.split(/\//)
-      class_name = modules.pop            
-      dir = output_dir + File::SEPARATOR + 'definitions' + File::SEPARATOR + modules.join(File::SEPARATOR)      
+    def create_file(output_dir)        
+      dir = output_dir + File::SEPARATOR + 'definitions' + File::SEPARATOR + @path_elements.join(File::SEPARATOR)      
       FileUtils.mkdir_p(dir)
       
-      File.open(output_dir + File::SEPARATOR + 'definitions' + File::SEPARATOR + @name_for_class.gsub(/\//, File::SEPARATOR) + '.rb', 'w') {|file|
+      File.open(output_dir + File::SEPARATOR + 'definitions' + File::SEPARATOR + @name_elements.join(File::SEPARATOR) + '.rb', 'w') {|file|
         file.binmode
-        write_requires(file)        
+        
+        def file.indent(by)
+          if @tz_indent
+            @tz_indent += by
+          else
+            @tz_indent = by
+          end
+        end
+        
+        def file.puts(s)
+          super("#{' ' * (@tz_indent || 0)}#{s}")
+        end
+        
+        file.puts('require \'tzinfo/timezone_definition\'')
+        file.puts('')        
+        
         file.puts('module TZInfo')
-        file.puts('module Definitions #:nodoc:')
-        modules.each do |part| 
-          file.puts("module #{part} #:nodoc:")
+        file.indent(2)
+        file.puts('module Definitions')
+        file.indent(2)                
+        
+        @name_elements.each do |part| 
+          file.puts("module #{part}")
+          file.indent(2)
         end
         
-        file.puts("class #{class_name} < #{superclass} #:nodoc:")
-      
-        yield file
-                
-        file.puts('end') # end class
+        file.puts('include TimezoneDefinition')
+        file.puts('')
         
-        modules.each do
-          file.puts('end')
+        yield file
+                        
+        @name_elements.each do
+          file.indent(-2)  
+          file.puts('end')          
         end
+        file.indent(-2)
         file.puts('end') # end module Definitions
+        file.indent(-2)        
         file.puts('end') # end module TZInfo
       }
-    end
-    
-    # Called to write any requires into the file. Called by create_file.
-    def write_requires(file)
-      file.puts('require \'tzinfo/timezone\'')
-    end
+    end    
   end
   
   # A tz data Link.
@@ -527,27 +553,20 @@ module TZInfo
       super(name)
       @link_to = link_to
     end
-    
-    # Called to write any requires into the file. Called by create_file.
-    def write_requires(file)
-      super
-      file.puts("require 'tzinfo/definitions/#{link_to.name_for_class}'")
-    end
-    
-    # Superclass of this class (the class we are linking to).
-    def superclass
-      'Definitions::' + link_to.name_for_class.gsub(/\//, '::')
-    end
-    
-    # Writes a class for this link.
-    def write_class(output_dir)
+                
+    # Writes a module for this link.
+    def write_module(output_dir)
       puts "writing link #{name}"
-      
+            
       create_file(output_dir) {|file|
-        file.puts('setup_linked')
-        file.puts("set_identifier('#{@name.gsub(/'/, '\\\'')}')")
+        file.puts("linked_timezone #{TZDataParser.quote_str(@name)}, #{TZDataParser.quote_str(@link_to.name)}")        
       }
     end
+    
+    # Writes an index record for this link.    
+    def write_index_record(file)
+      file.puts("      linked_timezone #{TZDataParser.quote_str(@name)}")
+    end
   end
   
   # A tz data Zone. Each line from the tz data is loaded as a TZDataObservance.
@@ -561,28 +580,31 @@ module TZInfo
     
     def add_observance(observance)      
       @observances << observance
-    end        
+    end                
     
-    # Superclass is a Timezone. Called by create_file.
-    def superclass
-      'Timezone'
-    end
-    
-    # Writes the class for the zone. Iterates all the periods and asks them
+    # Writes the module for the zone. Iterates all the periods and asks them
     # to write all periods in the timezone.
-    def write_class(output_dir) 
+    def write_module(output_dir) 
       puts "writing zone #{name}"
       
       create_file(output_dir) {|file|        
-               
-        file.puts('setup')
-        file.puts("set_identifier('#{@name.gsub(/'/, '\\\'')}')")
         
+        file.puts("timezone #{TZDataParser.quote_str(@name)} do |tz|")
+        file.indent(2)
+              
         transitions = find_transitions
-        transitions.output_class(file)                
+        transitions.output_module(file)
+        
+        file.indent(-2)
+        file.puts('end')
       }      
     end
     
+    # Writes an index record for this zone.    
+    def write_index_record(file)
+      file.puts("      timezone #{TZDataParser.quote_str(@name)}")
+    end
+    
     private
       def find_transitions
         transitions = TZDataTransitions.new
@@ -711,7 +733,7 @@ module TZInfo
       @transitions << transition
     end 
     
-    def output_class(file)
+    def output_module(file)
       optimize
       
       # Try and end on a transition to std if one happens in the last year.
@@ -725,34 +747,12 @@ module TZInfo
         transitions = @transitions
       end
       
-      previous = nil
-      transitions.each {|transition|
-        if previous.nil?
-          # first transition
-          # if it has a time, need to work out what the unbounded start before
-          # it should have been
-          
-          if transition.std_offset == 0
-            # treat the start time as nil
-            previous = transition.clone_with_at(nil)             
-          else
-            first_std = @transitions.find {|t| t.std_offset == 0}
-            
-            if first_std.nil?
-              previous = transition.clone_with_at(nil)
-            else              
-              first_std.clone_with_at(nil).write_period(file, transition.at_utc)
-              previous = transition
-            end            
-          end
-        else
-          raise 'Only the first transition can have a nil start time' if transition.at_utc.nil?        
-          previous.write_period(file, transition.at_utc)
-          previous = transition
-        end                
-      }
+      process_offsets(file)
+      file.puts('')
       
-      previous.write_period(file, nil) unless previous.nil?        
+      transitions.each do |t|        
+        t.write(file)
+      end            
     end
     
     private
@@ -779,7 +779,8 @@ module TZInfo
           # Shuffle transitions up, eliminating any redundant transitions 
           # along the way.
           if to_i == 0 ||
-              @transitions[to_i - 1].total_offset != @transitions[from_i].total_offset ||
+              @transitions[to_i - 1].utc_offset != @transitions[from_i].utc_offset ||
+              @transitions[to_i - 1].std_offset != @transitions[from_i].std_offset ||
               @transitions[to_i - 1].zone_id != @transitions[from_i].zone_id
                       
             @transitions[to_i] = @transitions[from_i]
@@ -794,7 +795,65 @@ module TZInfo
         else
           @transitions = []
         end                
-      end            
+      end
+      
+      def quote_zone_id(zone_id)     
+        if zone_id =~ %r{[\-+']}
+          ":#{TZDataParser.quote_str(zone_id)}"          
+        else
+          ":#{zone_id}"
+        end
+      end  
+      
+      def process_offsets(file)
+        # A bit of a hack at the moment. The offset used to be output with
+        # each period (pair of transitions). They are now separated from the
+        # transition data. The code should probably be changed at some point to
+        # setup the offsets at an earlier stage.   
+        
+        # Assume that when this is called, the first transition is the Local
+        # Mean Time initial rule or a transition with no time that defines the
+        # offset for the entire zone.
+        
+        offsets = []
+        
+        # Find the first std offset. Timezones always start in std.
+        @transitions.each do |t|
+          if t.std_offset == 0
+            offset = {:utc_offset => t.utc_offset, 
+              :std_offset => t.std_offset,
+              :zone_id => t.zone_id,
+              :name => 'o0'}
+              
+            offsets << offset
+            break
+          end
+        end
+        
+        @transitions.each do |t|
+          offset = offsets.find do |o| 
+            o[:utc_offset] == t.utc_offset &&
+              o[:std_offset] == t.std_offset &&
+              o[:zone_id] == t.zone_id
+          end
+        
+          unless offset
+            offset = {:utc_offset => t.utc_offset, 
+              :std_offset => t.std_offset,
+              :zone_id => t.zone_id,
+              :name => "o#{offsets.length}"}
+                                       
+            offsets << offset
+          end
+          
+          t.offset_name = offset[:name]
+        end
+        
+        offsets.each do |offset|
+          file.puts("tz.offset :#{offset[:name]}, #{offset[:utc_offset]}, #{offset[:std_offset]}, #{quote_zone_id(offset[:zone_id])}")
+        end
+        
+      end
   end
   
   # A transition that will be used to write the periods in a zone class.
@@ -805,12 +864,14 @@ module TZInfo
     attr_reader :utc_offset
     attr_reader :std_offset
     attr_reader :zone_id
+    attr_accessor :offset_name
     
     def initialize(at_utc, utc_offset, std_offset, zone_id)
       @at_utc = at_utc
       @utc_offset = utc_offset
       @std_offset = std_offset
       @zone_id = zone_id
+      @offset_name = nil
     end
     
     def to_s
@@ -837,32 +898,20 @@ module TZInfo
       TZDataTransition.new(at_utc, @utc_offset, @std_offset, @zone_id)
     end
         
-    def write_period(file, utc_end)        
-      if @at_utc.nil?
-        file.puts "add_unbounded_start_period {TimezonePeriod.new(nil,#{datetime_constructor(utc_end)},#{@utc_offset},#{@std_offset},:#{quote_str(@zone_id)})}"
-      else
-        file.puts "add_period(#{@at_utc.year},#{@at_utc.mon}) {TimezonePeriod.new(#{datetime_constructor(@at_utc)},#{datetime_constructor(utc_end)},#{@utc_offset},#{@std_offset},:#{quote_str(@zone_id)})}"
+    def write(file)        
+      if @at_utc
+        file.puts "tz.transition #{@at_utc.year}, #{@at_utc.mon}, :#{@offset_name}, #{datetime_constructor(@at_utc)}" 
       end        
     end
      
     private
-      def datetime_constructor(datetime)
-        if datetime.nil? 
-          'nil'
-        elsif (1970..2037).include?(datetime.year)
+      def datetime_constructor(datetime)      
+        if (1970..2037).include?(datetime.year)
           "#{Time.utc(datetime.year, datetime.mon, datetime.mday, datetime.hour, datetime.min, datetime.sec).to_i}"
         else
-          "DateTime.new0(Rational.new!(#{datetime.ajd.numerator},#{datetime.ajd.denominator}),0,Date::ITALY)"          
+          "#{datetime.ajd.numerator}, #{datetime.ajd.denominator}"                    
         end
       end
-      
-      def quote_str(str)     
-        if str =~ %r{[\-+']}
-          "'#{str.gsub(/'/, '\\\'')}'"        
-        else
-          str
-        end
-      end      
   end
    
   # An instance of a rule for a year.
@@ -1067,6 +1116,32 @@ module TZInfo
     end
   end
   
+  # A location (latitude + longitude)
+  class TZDataLocation #:nodoc:
+    attr_reader :latitude
+    attr_reader :longitude
+    
+    # Constructs a new TZDataLocation from a string in ISO 6709 
+    # sign-degrees-minutes-seconds format, either +-DDMM+-DDDMM 
+    # or +-DDMMSS+-DDDMMSS, first latitude (+ is north), 
+    # then longitude (+ is east).
+    def initialize(coordinates)
+      if coordinates !~ /^([+\-])([0-9]{2})([0-9]{2})([0-9]{2})?([+\-])([0-9]{3})([0-9]{2})([0-9]{2})?$/
+        raise "Invalid coordinates: #{coordinates}"
+      end
+      
+      @latitude = Rational($2.to_i) + Rational($3.to_i, 60)
+      @latitude += Rational($4.to_i, 3600) unless $4.nil?
+      @latitude = -@latitude if $1 == '-'
+      
+      @longitude = Rational($6.to_i) + Rational($7.to_i, 60)
+      @longitude += Rational($8.to_i, 3600) unless $8.nil?
+      @longitude = -@longitude if $5 == '-'
+    end
+  end  
+  
+  TZDataCountryTimezone = Struct.new(:timezone, :description, :location)  
+  
   # An ISO 3166 country.
   class TZDataCountry #:nodoc:
     attr_reader :code
@@ -1076,42 +1151,25 @@ module TZInfo
     def initialize(code, name)
       @code = code
       @name = name
-      @zones = {}
+      @zones = []
     end
     
+    # Adds a TZDataCountryTimezone
     def add_zone(zone)      
-      @zones[zone.name] = zone      
-    end
+      @zones << zone      
+    end  
     
-    def write_class(output_dir)      
-      dir = output_dir + File::SEPARATOR + 'countries'      
-      FileUtils.mkdir_p(dir)
+    def write_index_record(file)
+      s = "      country #{TZDataParser.quote_str(@code)}, #{TZDataParser.quote_str(@name)}"      
+      s << ' do |c|' if @zones.length > 0
       
-      File.open(dir + File::SEPARATOR + @code + '.rb', 'w') {|file|
-        file.binmode
-        file.puts('require \'tzinfo/country\'')        
-        file.puts('module TZInfo #:nodoc:')
-        file.puts('module Countries #:nodoc:')
-        
-        file.puts("class #{@code} < Country #:nodoc:")
+      file.puts s
       
-        file.puts('setup')
-        file.puts("set_code('#{code.gsub(/'/, '\\\'')}')")
-        file.puts("set_name('#{name.gsub(/'/, '\\\'')}')")
-        
-        @zones.each_value {|zone|          
-          file.puts("add_zone('#{zone.name.gsub(/'/, '\\\'')}')")
-        }
-        
-        file.puts('zones_added')
-                
-        
-        file.puts('end') # end class
-        
-        
-        file.puts('end') # end module Countries
-        file.puts('end') # end module TZInfo
-      }
+      @zones.each do |zone|
+        file.puts "        c.timezone #{TZDataParser.quote_str(zone.timezone.name)}, #{zone.location.latitude.numerator}, #{zone.location.latitude.denominator}, #{zone.location.longitude.numerator}, #{zone.location.longitude.denominator}#{zone.description.nil? ? '' : ', ' + TZDataParser.quote_str(zone.description)}" 
+      end
+      
+      file.puts '      end' if @zones.length > 0
     end
   end
 end