tzinfo 0.0.4 → 0.1.0

data/lib/tzinfo/timezone_period.rb

@@ -0,0 +1,175 @@
+#--
+# Copyright (c) 2005 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.
+#++
+
+module TZInfo
+  # A period of time in a timezone where the same offset from UTC applies.
+  class TimezonePeriod
+    
+    # A cache of pre-reduced Rationals for each half-hour between -12 and +12.
+    # This is used to save time when loading a TimezonePeriod.
+    @@rational_cache = {
+      -43200 => Rational.new!(-1,2),
+      -41400 => Rational.new!(-23,48),
+      -39600 => Rational.new!(-11,24),
+      -37800 => Rational.new!(-7,16),
+      -36000 => Rational.new!(-5,12),
+      -34200 => Rational.new!(-19,48),
+      -32400 => Rational.new!(-3,8),
+      -30600 => Rational.new!(-17,48),
+      -28800 => Rational.new!(-1,3),
+      -27000 => Rational.new!(-5,16),
+      -25200 => Rational.new!(-7,24),
+      -23400 => Rational.new!(-13,48),
+      -21600 => Rational.new!(-1,4),
+      -19800 => Rational.new!(-11,48),
+      -18000 => Rational.new!(-5,24),
+      -16200 => Rational.new!(-3,16),
+      -14400 => Rational.new!(-1,6),
+      -12600 => Rational.new!(-7,48),
+      -10800 => Rational.new!(-1,8),
+      -9000 =>  Rational.new!(-5,48),
+      -7200 =>  Rational.new!(-1,12),
+      -5400 =>  Rational.new!(-1,16),
+      -3600 =>  Rational.new!(-1,24),
+      -1800 =>  Rational.new!(-1,48),
+      0 =>      Rational.new!(0,1),
+      1800 =>   Rational.new!(1,48),
+      3600 =>   Rational.new!(1,24),
+      5400 =>   Rational.new!(1,16),
+      7200 =>   Rational.new!(1,12),
+      9000 =>   Rational.new!(5,48),
+      10800 =>  Rational.new!(1,8),
+      12600 =>  Rational.new!(7,48),
+      14400 =>  Rational.new!(1,6),
+      16200 =>  Rational.new!(3,16),
+      18000 =>  Rational.new!(5,24),
+      19800 =>  Rational.new!(11,48),
+      21600 =>  Rational.new!(1,4),
+      23400 =>  Rational.new!(13,48),
+      25200 =>  Rational.new!(7,24),
+      27000 =>  Rational.new!(5,16),
+      28800 =>  Rational.new!(1,3),
+      30600 =>  Rational.new!(17,48),
+      32400 =>  Rational.new!(3,8),
+      34200 =>  Rational.new!(19,48),
+      36000 =>  Rational.new!(5,12),
+      37800 =>  Rational.new!(7,16),
+      39600 =>  Rational.new!(11,24),
+      41400 =>  Rational.new!(23,48),
+      43200 =>  Rational.new!(1,2)}
+    
+    # Start time of the period (UTC). May be nil if unbounded.
+    attr_reader :utc_start
+    
+    # End time of the period (UTC). May be nil if unbounded.
+    attr_reader :utc_end
+    
+    # Base offset of the timezone from UTC (seconds).
+    attr_reader :utc_offset
+    
+    # Offset from the local time where daylight savings is in effect (seconds).
+    # E.g.: utc_offset could be -5 hours. Normally, std_offset would be 0. 
+    # During daylight savings, std_offset would become +1 hours.
+    attr_reader :std_offset
+    
+    # The identifier of this period, e.g. "GMT" (Greenwich Mean Time) or "BST"
+    # (British Summer Time) for "Europe/London". The returned identifier is a 
+    # symbol.
+    attr_reader :zone_identifier
+    
+    # Start time of the period (local time). May be nil if unbounded.
+    attr_reader :local_start
+    
+    # End time of the period (local time). May be nil if unbounded.
+    attr_reader :local_end
+    
+    # Initializes a new TimezonePeriod.
+    def initialize(utc_start, utc_end, utc_offset, std_offset, zone_identifier)
+      @utc_start = utc_start
+      @utc_end = utc_end
+      @utc_offset = utc_offset
+      @std_offset = std_offset
+      @zone_identifier = zone_identifier
+      @utc_total_offset = utc_offset + std_offset
+      @utc_total_offset_rational = @@rational_cache[utc_total_offset]
+      @utc_total_offset_rational = Rational(utc_total_offset, 86400) if @utc_total_offset_rational.nil?
+      
+      @local_start = utc_start.nil? ? nil : to_local(utc_start)
+      @local_end = utc_end.nil? ? nil : to_local(utc_end)             
+    end
+    
+    # Total offset from UTC (seconds). Equal to utc_offset + std_offset.
+    def utc_total_offset
+      @utc_total_offset
+    end
+    
+    # Total offset from UTC (days). Result is a Rational.
+    def utc_total_offset_rational
+      @utc_total_offset_rational
+    end
+    
+    # true if daylight savings is in effect for this period; otherwise false.
+    def dst?
+      std_offset != 0
+    end
+    
+    # true if this period is valid for the given utc DateTime; otherwise false.
+    def valid_for_utc?(utc)
+      utc_after_start?(utc) && utc_before_end?(utc) 
+    end
+    
+    # true if the given utc DateTime is after the start of the period (inclusive); otherwise false.
+    def utc_after_start?(utc)
+      @utc_start.nil? || @utc_start <= utc
+    end
+    
+    # true if the given utc DateTime is before the end of the period (exclusive); otherwise false.
+    def utc_before_end?(utc)
+      @utc_end.nil? || @utc_end > utc
+    end
+    
+    # true if this period is valid for the given local DateTime; otherwise false.
+    def valid_for_local?(local)
+      local_after_start?(local) && local_before_end?(local) 
+    end
+    
+    # true if the given local DateTime is after the start of the period (inclusive); otherwise false.
+    def local_after_start?(local)
+      @local_start.nil? || @local_start <= local
+    end
+    
+    # true if the given local DateTime is before the end of the period (exclusive); otherwise false.
+    def local_before_end?(local)
+      @local_end.nil? || @local_end > local
+    end
+    
+    # Converts a UTC DateTime to local time based on the offset of this period.
+    def to_local(utc)
+      utc + utc_total_offset_rational
+    end
+    
+    # Converts a local DateTime to UTC based on the offset of this period.
+    def to_utc(local)
+      local - utc_total_offset_rational
+    end
+  end
+end

data/lib/tzinfo/timezone_period_list.rb

@@ -0,0 +1,225 @@
+#--
+# Copyright (c) 2005 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_period'
+
+module TZInfo
+  # Thrown to indicate that no TimezonePeriod matching a given time could be found.
+  class PeriodNotFound < StandardError
+  end
+
+  # A list of TimezonePeriod instances defining a Timezone.
+  class TimezonePeriodList
+    # Initializes a new TimezonePeriodList
+    def initialize
+      @list = nil
+      @last_year = nil
+      @last_month = nil
+      @start_year = nil
+      @start_month = nil
+      @unbounded_start = nil
+    end
+    
+    # One unbounded start period can be defined. This must be set before any
+    # calls to add.
+    #
+    # ArgumentError will be thrown if add or add_unbounded_start has already
+    # been called.
+    def add_unbounded_start(&block)
+      raise ArgumentError, 'add_unbounded_start has already been called' if !@unbounded_start.nil?
+      raise ArgumentError, 'add has already been called' if !@list.nil?
+      @unbounded_start = block
+    end
+    
+    # Adds a new TimezonePeriod to the list. utc_start_year and utc_start_month
+    # are the year and month in which the period starts in UTC. A block must
+    # be passed in that will return the TimezonePeriod when called with no
+    # arguments.
+    #
+    # If the start year and month are less than the previously encountered
+    # year and month ArgumentError will be thrown.
+    #
+    # Blocks must be added in order of increasing UTC start date.
+    def add(utc_start_year, utc_start_month, &block)                 
+      if @list.nil?
+        @list = [block]
+        @start_year = utc_start_year
+        @start_month = utc_start_month
+      else
+        if utc_start_year < @last_year || (utc_start_year == @last_year && utc_start_month < @last_month)
+          raise ArgumentError, 'Calls to add must be in increasing start date order'
+        end
+                         
+        index = index_for_utc(utc_start_year, utc_start_month)
+        if @list[index].nil?
+          @list[index] = block
+        elsif @list[index].is_a?(Array)
+          @list[index] << block
+        else
+          @list[index] = [@list[index], block]
+        end
+      end
+        
+      @last_year = utc_start_year
+      @last_month = utc_start_month        
+    end
+    
+    # Returns the period for the given utc time. 
+    # If no period is found for the given time, PeriodNotFound is thrown.
+    def period_for_utc(utc)
+      raise PeriodNotFound, 'No periods defined' if @list.nil?
+      index = index_for_utc(utc.year, utc.mon)
+      index = 0 if index < 0
+      index = @list.length - 1 if index >= @list.length
+      
+      result = nil
+      index.downto(0) {|i|
+        contents = get_contents(i)
+        
+        if contents.is_a?(Array)
+          (contents.length - 1).downto(0) {|j|
+            if contents[j].valid_for_utc?(utc)
+              result = contents[j]
+              break
+            end
+          }
+          break unless result.nil?
+        elsif !contents.nil? && contents.valid_for_utc?(utc)
+          result = contents
+          break        
+        end
+      }
+      
+      if result.nil?
+        unbounded_start = get_unbounded_start
+        if !unbounded_start.nil? && unbounded_start.valid_for_utc?(utc)          
+          unbounded_start
+        else
+          raise PeriodNotFound, "No period found for utc: #{utc}"
+        end
+      else
+        result
+      end
+    end
+    
+    # Returns the set of periods for the given local time as an array.
+    # If no period is found for the given time, PeriodNotFound is thrown.
+    # Results returned are ordered by increasing UTC start date.    
+    def periods_for_local(local)
+      raise PeriodNotFound, 'No periods defined' if @list.nil?
+      
+      # add one to the index because the periods are indexed by UTC start
+      # and the period we are looking for could therefore be in the next
+      # half of the year
+      index = index_for_utc(local.year, local.mon) + 1
+      index = 0 if index < 0
+      index = @list.length - 1 if index >= @list.length
+      
+      result = []
+      
+      # found_first is used to avoid searching back to far
+      # the search will be limited at the next half year block after discovering
+      # the first match
+      found_first = nil
+      
+      index.downto(0) {|i|
+        contents = get_contents(i)
+        
+        if contents.is_a?(Array)
+          (contents.length - 1).downto(0) {|j|
+            if contents[j].valid_for_local?(local)
+              result << contents[j]
+              found_first = i if found_first.nil?
+            end
+          }
+          
+          if !found_first.nil? && i < found_first
+            # searched far enough
+            break
+          end
+        elsif !contents.nil? && contents.valid_for_local?(local)
+          result << contents                  
+        end
+      }
+                 
+      if result.empty? || found_first == 0
+        unbounded_start = get_unbounded_start
+        result << unbounded_start if !unbounded_start.nil? && unbounded_start.valid_for_local?(local)
+      end
+      
+      if result.empty?        
+        raise PeriodNotFound, "No period found for utc: #{local}"
+      else
+        result.reverse!
+        result
+      end
+    end
+    
+    private
+      # Returns the index into the @list array for a given utc year and month.
+      def index_for_utc(year, month)
+        index = (year - @start_year) * 2
+        index += 1 if month > 6
+        index -= 1 if @start_month > 6
+        index
+      end
+      
+      # Returns the contents of any 6 month period, exapanding any blocks to
+      # TimezonePeriods first.
+      def get_contents(index)
+        contents = @list[index]
+        if contents.nil?
+          nil
+        elsif contents.is_a?(TimezonePeriod)
+          contents
+        elsif contents.is_a?(Array)
+          if contents.first.is_a?(TimezonePeriod)
+            contents
+          else
+            contents = contents.collect {|proc|
+              proc.call
+            }
+            @list[index] = contents
+            contents       
+          end
+        elsif contents.is_a?(Proc)
+          contents = contents.call
+          @list[index] = contents
+          contents
+        end                
+      end
+      
+      # Expands unbounded_start if it is defined.
+      def get_unbounded_start
+        contents = @unbounded_start
+        if contents.nil?
+          nil
+        elsif contents.is_a?(TimezonePeriod)
+          contents
+        else
+          contents = contents.call
+          @unbounded_start = contents
+          contents
+        end
+      end
+  end
+end

data/lib/tzinfo/tzdataparser.rb

@@ -1,3 +1,26 @@
+#--
+# Copyright (c) 2005 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 'fileutils'
 
 module TZInfo
@@ -10,6 +33,33 @@ module TZInfo
   #
   # This process is extremely slow (optimization is required).
   class TZDataParser
+    # Whether to generate zone definitions (set to false to stop zones being
+    # generated).    
+    attr_accessor :generate_zones
+    
+    # Whether to generate country definitions (set to false to stop countries
+    # being generated).
+    attr_accessor :generate_countries
+    
+    # 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    
+    
     # 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).
@@ -21,6 +71,13 @@ module TZInfo
       @zones = {}
       @countries = {}
       @no_rules = TZDataNoRules.new
+      @generate_zones = true
+      @generate_countries = true
+      @only_zones = []
+      @only_countries = []
+      @exclude_zones = ['Asia/Riyadh87', 'Asia/Riyadh88', 'Asia/Riyadh89',
+        'Mideast/Riyadh87', 'Mideast/Riyadh88', 'Mideast/Ruyadh89']
+      @exclude_countries = []
     end
     
     # Reads the tzdata source and generates the classes. Takes a long time
@@ -40,15 +97,27 @@ module TZInfo
       
       load_countries
       
-      @zones.each_value {|zone|
-        zone.write_class(@output_dir)
-      }
+      if @generate_zones
+        if @only_zones.nil? || @only_zones.empty?
+          @zones.each_value {|zone|
+            zone.write_class(@output_dir) unless @exclude_zones.include?(zone.name)
+          }
+        else
+          @only_zones.each {|id| @zones[id].write_class(@output_dir) }
+        end
+      end
       
-      @countries.each_value {|country|
-        country.write_class(@output_dir)
-      }
+      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
       
-      write_countries_index      
+        write_countries_index
+      end
     end
     
     # Parses a month specified in the tz data and converts it to a number
@@ -243,7 +312,7 @@ module TZInfo
   end
   
   # Base class for all rule sets.
-  class TZDataRules
+  class TZDataRules #:nodoc:
     # Name of the rule set, e.g. EU.
     attr_reader :name
     
@@ -262,7 +331,11 @@ module TZInfo
           zone_id = 'Unknown'
         end
         
-        file.puts "add_period(TimezonePeriod.new(#{datetime_constructor(utc_start)},#{datetime_constructor(utc_end)},#{period.utc_offset.to_seconds},#{std_offset.to_seconds},:#{quote_str(zone_id)}))"
+        if utc_start.nil?
+          file.puts "add_unbounded_start_period {TimezonePeriod.new(nil,#{datetime_constructor(utc_end)},#{period.utc_offset.to_seconds},#{std_offset.to_seconds},:#{quote_str(zone_id)})}"
+        else
+          file.puts "add_period(#{utc_start.year},#{utc_start.mon}) {TimezonePeriod.new(#{datetime_constructor(utc_start)},#{datetime_constructor(utc_end)},#{period.utc_offset.to_seconds},#{std_offset.to_seconds},:#{quote_str(zone_id)})}"
+        end
         #puts "Period from #{utc_start} to #{utc_end}, utc_offset=#{period.utc_offset.to_seconds}, std_offset=#{std_offset.to_seconds}, name=#{period.format.expand(std_offset, letter)}"
       end
       
@@ -271,7 +344,7 @@ module TZInfo
         if datetime.nil? 
           'nil'
         else
-          "DateTime.new(#{datetime.year},#{datetime.mon},#{datetime.mday},#{datetime.hour},#{datetime.min},#{datetime.sec})"
+          "DateTime.new0(Rational.new!(#{datetime.ajd.numerator},#{datetime.ajd.denominator}),0,Date::ITALY)"          
         end
       end
       
@@ -281,7 +354,7 @@ module TZInfo
   end
   
   # Empty rule set with a fixed daylight savings (std) offset.
-  class TZDataFixedOffsetRules < TZDataRules
+  class TZDataFixedOffsetRules < TZDataRules #:nodoc:
     attr_reader :offset
     
     def initialize(offset)
@@ -302,7 +375,7 @@ module TZInfo
   end
   
   # An empty set of rules.
-  class TZDataNoRules < TZDataRules
+  class TZDataNoRules < TZDataRules #:nodoc:
     def initialize
       super('-')
     end
@@ -322,7 +395,7 @@ module TZInfo
   end
   
   # A rule set (as defined by Rule name in the tz data).
-  class TZDataRuleSet < TZDataRules        
+  class TZDataRuleSet < TZDataRules #:nodoc:       
     attr_reader :rules
     
     def initialize(name)
@@ -391,7 +464,7 @@ module TZInfo
         
         if earliest.nil?
           #puts 'found no earliest rule'
-          write_period(file, utc_current, utc_end, period, std_offset, letter)
+          write_period(file, utc_current, unbounded_end ? nil : utc_end, period, std_offset, letter)
           
           [utc_end, std_offset]
           break
@@ -441,7 +514,7 @@ module TZInfo
   end
   
   # A rule in a RuleSet (a single Rule line in the tz data).
-  class TZDataRule
+  class TZDataRule #:nodoc:
     attr_reader :from
     attr_reader :to
     attr_reader :type
@@ -593,7 +666,7 @@ module TZInfo
   end
   
   # Base class for Zones and Links.
-  class TZDataDefinition
+  class TZDataDefinition #:nodoc:
     attr_reader :name
     attr_reader :name_for_class
     
@@ -646,7 +719,7 @@ module TZInfo
   end
   
   # A tz data Link.
-  class TZDataLink < TZDataDefinition
+  class TZDataLink < TZDataDefinition #:nodoc:
     attr_reader :link_to
     
     def initialize(name, link_to)
@@ -676,7 +749,7 @@ module TZInfo
   end
   
   # A tz data Zone. Each line from the tz data is loaded as a TZDataPeriod.
-  class TZDataZone < TZDataDefinition    
+  class TZDataZone < TZDataDefinition #:nodoc:    
     attr_reader :periods
     
     def initialize(name)
@@ -719,7 +792,7 @@ module TZInfo
   end
   
   # A period within a zone.
-  class TZDataPeriod
+  class TZDataPeriod #:nodoc:
     attr_reader :utc_offset
     attr_reader :rule_set
     attr_reader :format
@@ -741,7 +814,7 @@ module TZInfo
   
   # A tz data time definition - an hour, minute, second and reference. Reference
   # is either :utc, :standard or :wall_clock.
-  class TZDataTime
+  class TZDataTime #:nodoc:
     attr_reader :hour
     attr_reader :minute
     attr_reader :second
@@ -774,7 +847,7 @@ module TZInfo
   end
   
   # A tz data offset.
-  class TZDataOffset     
+  class TZDataOffset #:nodoc:     
     attr_reader :hour
     attr_reader :minute
     attr_reader :second    
@@ -817,7 +890,7 @@ module TZInfo
   
   # A tz data day of the month reference. Can either be an absolute day,
   # a last week day or a week day >= or <= than a specific day of month.
-  class TZDataDayOfMonth
+  class TZDataDayOfMonth #:nodoc:
     attr_reader :type
     attr_reader :day_of_month
     attr_reader :day_of_week
@@ -896,7 +969,7 @@ module TZInfo
   end   
   
   # A tz data Zone until reference.
-  class TZDataUntil
+  class TZDataUntil #:nodoc:
     def initialize(spec)      
       parts = spec.split(/\s+/)      
       raise "Invalid until: #{spec}" if parts.length < 1
@@ -915,7 +988,7 @@ module TZInfo
   
   # A tz data Zone format string. Either alternate standard/daylight-savings
   # or substitution (%s) format.
-  class TZDataFormat        
+  class TZDataFormat #:nodoc:        
     def initialize(spec)
       if spec =~ /([A-z]+)\/([A-z]+)/
         @type = :alternate
@@ -942,7 +1015,7 @@ module TZInfo
   end
   
   # An ISO 3166 country.
-  class TZDataCountry
+  class TZDataCountry #:nodoc:
     attr_reader :code
     attr_reader :name
     attr_reader :zones
@@ -987,4 +1060,4 @@ module TZInfo
       }
     end
   end
-end
+end