tzinfo 0.0.1 → 0.0.2

data/lib/tzinfo/definitions/W__m__SU.rb

@@ -3,10 +3,7 @@ require 'tzinfo/definitions/Europe/Moscow'
 module TZInfo
 module Definitions #:nodoc:
 class W__m__SU < Definitions::Europe::Moscow #:nodoc:
-@@instance = new
-def self.instance
-   @@instance
-end
+set_identifier('W-SU')
 end
 end
 end

data/lib/tzinfo/definitions/Zulu.rb

@@ -3,10 +3,7 @@ require 'tzinfo/definitions/Etc/UTC'
 module TZInfo
 module Definitions #:nodoc:
 class Zulu < Definitions::Etc::UTC #:nodoc:
-@@instance = new
-def self.instance
-   @@instance
-end
+set_identifier('Zulu')
 end
 end
 end

data/lib/tzinfo/timezone.rb

@@ -1,3 +1,4 @@
+require 'tzinfo/country'
 
 module TZInfo
   class PeriodNotFound < StandardError
@@ -16,7 +17,7 @@ module TZInfo
   # (see http://www.twinsun.com/tz/tz-link.htm)
   class Timezone
     # Returns a timezone by its identifier (e.g. "Europe/London", 
-    # "America/Chicago" and "UTC").
+    # "America/Chicago" or "UTC").
     #
     # Raises an exception of the timezone couldn't be found.
     def self.get(identifier)
@@ -31,16 +32,69 @@ module TZInfo
       m.instance      
     end
     
-    # Initializes the timezone.
-    def initialize
-      super
-      @periods = []
-      @identifier = nil
+    # If identifier is nil calls super(), else calls get(identifier).
+    def self.new(identifier = nil)
+      if identifier
+        get(identifier)
+      else
+        super()
+      end
+    end
+    
+    # At the moment, returns the result of all_country_zones. May be changed
+    # in the future to return all the Timezone instances including
+    # non-country specific zones.
+    def self.all
+      all_country_zones
+    end
+    
+    # At the moment, returns the result of all_country_zone_identifiers. May be changed
+    # in the future to return all the zone identifiers including
+    # non-country specific zones.
+    def self.all_identifiers
+      all_country_zone_identifiers
+    end
+    
+    # Returns all the Timezones defined for all Countries. This is not the
+    # complete set of Timezones as some are not country specific (e.g. 
+    # 'Etc/GMT').
+    #
+    # This method will take a substantial time to return the first time it is
+    # called as all the Timezone classes will have to be loaded by Ruby. If 
+    # you just want the zone identifiers use all_country_zone_identifiers
+    # instead.    
+    def self.all_country_zones
+      Country.all_codes.inject([]) {|zones,country|
+        zones += Country.get(country).zones
+      }
+    end
+    
+    # Returns all the zone identifiers defined for all Countries. This is not the
+    # complete set of zone identifiers as some are not country specific (e.g. 
+    # 'Etc/GMT'). You can obtain a Timezone instance for a given identifier
+    # with the get method.
+    def self.all_country_zone_identifiers
+      Country.all_codes.inject([]) {|zones,country|
+        zones += Country.get(country).zone_identifiers
+      }
+    end
+    
+    # Returns all US Timezone instances. A shortcut for 
+    # TZInfo::Country.get('US').zones. If you only need the zone identifiers,
+    # use us_zone_identifiers instead.
+    def self.us_zones
+      Country.get('US').zones
+    end
+    
+    # Returns all US zone identifiers. A shortcut for 
+    # TZInfo::Country.get('US').zone_identifiers.
+    def self.us_zone_identifiers
+      Country.get('US').zone_identifiers
     end
     
     # The identifier of the timezone, e.g. "Europe/Paris".
     def identifier
-      @identifier
+      'Unknown'
     end
     
     # Returns the TimezonePeriod for the given UTC time. utc can either be
@@ -51,20 +105,20 @@ module TZInfo
     def period_for_utc(utc)
       run_on_datetime(utc) {|utc|
         # dumb search for now      
-        @periods.each {|period|
+        periods.each {|period|
           if period.valid_for_utc?(utc)
             return period          
           end
         }
           
         # if nothing found, assume the first and last periods are unbounded
-        if @periods.length > 0
+        if periods.length > 0
           
-          last = @periods[@periods.length - 1] 
+          last = periods[periods.length - 1] 
           if last.utc_after_start?(utc)
             last
           else
-            first = @periods[0]
+            first = periods[0]
             if first.utc_before_end?(utc)
               first
             else            
@@ -86,20 +140,20 @@ module TZInfo
     def period_for_local(local)  
       run_on_datetime(local) {|local|
         # dumb search for now      
-        @periods.each {|period|
+        periods.each {|period|
           if period.valid_for_local?(local)
             return period          
           end
         }
           
         # if nothing found, assume the first and last periods are unbounded
-        if @periods.length > 0
+        if periods.length > 0
           
-          last = @periods[@periods.length - 1] 
+          last = periods[periods.length - 1] 
           if last.local_after_start?(local)
             last
           else
-            first = @periods[0]
+            first = periods[0]
             if first.local_before_end?(local)
               first
             else
@@ -154,14 +208,33 @@ module TZInfo
     end
     
     protected
-      def add_period(period)
-        @periods << period
-      end
-      
-      def set_identifier(identifier)
-        @identifier = identifier
+      def self.setup
+        class_eval <<CODE
+            @@periods = []
+            def self.add_period(period)              
+              @@periods << period
+            end
+            
+            def self.set_identifier(identifier)
+              @@identifier = identifier
+            end
+                        
+            def periods
+              @@periods
+            end
+            protected :periods
+            
+            def identifier
+              @@identifier
+            end
+            
+            @@instance = new
+            def self.instance
+              @@instance
+            end          
+CODE
       end
-      
+    
     private
       # Executes a block with a DateTime. If datetime is a Time it will be
       # converted to a DateTime before yielding to the block and the result of
@@ -176,7 +249,7 @@ module TZInfo
         else
           yield datetime
         end
-      end
+      end            
   end 
   
   # A period of time in a timezone where the same offset from UTC applies.
@@ -196,7 +269,8 @@ module TZInfo
     attr_reader :std_offset
     
     # The identifier of this period, e.g. "GMT" (Greenwich Mean Time) or "BST"
-    # (British Summer Time) for "Europe/London".
+    # (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.

data/lib/tzinfo/tzdataparser.rb

@@ -39,7 +39,7 @@ module TZInfo
       }
       
       load_countries
-            
+      
       @zones.each_value {|zone|
         zone.write_class(@output_dir)
       }
@@ -254,8 +254,16 @@ module TZInfo
     protected
       # Writes a period of time with the same utc and std offsets to the file.
       def write_period(file, utc_start, utc_end, period, std_offset, letter)
-        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(period.format.expand(std_offset, letter))}))"
-        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)}"
+        # The tzdata neglects to define the identifier for certain periods
+        # These have %s as the Zone format, but don't start with at the same
+        # time as a rule is defined to fill in %s.
+        zone_id = period.format.expand(std_offset, letter)
+        if zone_id.empty?
+          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)}))"
+        #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
       
     private
@@ -616,10 +624,10 @@ module TZInfo
       
         yield file
         
-        file.puts('@@instance = new')
-        file.puts('def self.instance')
-        file.puts('   @@instance')
-        file.puts('end')        
+        #file.puts('@@instance = new')
+        #file.puts('def self.instance')
+        #file.puts('   @@instance')
+        #file.puts('end')        
         
         file.puts('end') # end class
         
@@ -662,6 +670,7 @@ module TZInfo
       puts "writing link #{name}"
       
       create_file(output_dir) {|file|
+        file.puts("set_identifier('#{@name.gsub(/'/, '\\\'')}')")
       }
     end
   end
@@ -691,8 +700,7 @@ module TZInfo
       
       create_file(output_dir) {|file|        
                
-        file.puts('def initialize')
-        file.puts('  super')
+        file.puts('setup')
         file.puts("set_identifier('#{@name.gsub(/'/, '\\\'')}')")
         
         utc_start = nil
@@ -705,9 +713,7 @@ module TZInfo
           utc_start = result[0]
           std_offset = result[1]
           last_utc_offset = period.utc_offset
-        }
-        
-        file.puts('end')                
+        }                                
       }      
     end
   end
@@ -962,23 +968,16 @@ module TZInfo
         
         file.puts("class #{@code} < Country #:nodoc:")
       
-        file.puts('def initialize')
-        file.puts('  super')
-        file.puts("  set_code('#{code.gsub(/'/, '\\\'')}')")
-        file.puts("  set_name('#{name.gsub(/'/, '\\\'')}')")
+        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("add_zone('#{zone.name.gsub(/'/, '\\\'')}')")
         }
         
-        file.puts('  zones_added')
-        
-        file.puts('end')
-        
-        file.puts('@@instance = new')
-        file.puts('def self.instance')
-        file.puts('   @@instance')
-        file.puts('end')        
+        file.puts('zones_added')
+                
         
         file.puts('end') # end class
         

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: tzinfo
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2005-08-30
+  version: 0.0.2
+date: 2005-09-13
 summary: Daylight-savings aware timezone library
 require_paths: 
   - lib