barometer 0.5.0 → 0.6.1

data/README.rdoc

@@ -10,25 +10,22 @@ unavailable.
 
 Barometer handles all conversions of the supplied query, so that the
 same query can be used for all (or most) services, even if they don't
-support the query directly.
-
-For example, Yahoo! only accepts US Zip Code or Weather.com ID.  With Barometer
-you can query Yahoo! with a simple location (ie: Paris) and it will return the
-weather.
+support the query directly. See the "Query" section for more information on
+this.
 
 == version
 
-Version 0.5.0 is the current release of this gem.
+Version 0.6.0 is the current release of this gem.
 The gem is available from github (attack-barometer) or rubyforge (barometer).
-It is fully functional (for four weather service APIs).
+It is fully functional (for five weather service APIs).
 
 == status
 
 Currently this project is in development and will only work for a few weather
-services (wunderground, google, yahoo, weather.com).
+services (wunderground, google, yahoo, weather.com, weather_bug).
 
 Features to be added next:
-- even more weather service drivers (noaa, weatherbug)
+- even more weather service drivers (noaa)
 - icon support
 
 = dependencies
@@ -59,6 +56,11 @@ eg. weather.com
     partner: YOUR_PARTNER_KEY
     license: YOUR_LICENSE_KEY
 
+eg. weatherbug.com
+
+  weather_bug:
+    code: YOUR_API_CODE
+
 == HTTParty
 
 Why? HTTParty was created and designed specifically for consuming web services.
@@ -74,6 +76,45 @@ This information doesn't mean that much if it can't be converted to times
 that don't correspond to the applicable timezone.
 Tzinfo handles this time zone manipulation.
 
+= queries
+
+The query handling is one of the most beneficial and powerful features of
+Barometer.  Every weather service accepts a different set of possible
+queries, so it usually the case that the same query can only be used
+for a couple weather services.
+
+Barometer will allow the use of all query formats for all services
+(mostly).  It does this by first determining the original query format,
+then converting the query to a compatible format for each specific
+weather service.
+
+For example, Yahoo! only accepts US Zip Code or Weather.com ID.  With Barometer
+you can query Yahoo! with a simple location (ie: Paris) or even an Airport
+code (ICAO) and it will return the weather as expected.
+
+== acceptable formats
+
+- zipcode
+- icao (international airport code)
+- coordinates (latitude and longitude)
+- postal code
+- weather.com ID
+- location name (ie address, city, state, landmark, etc.)
+
+* if the query is of the formats zipcode or postal code it may not
+  support conversion to other formats.
+  
+== conversion caching
+
+Barometer has internal conversion caching.  No conversion will be
+repeated during a measurement, thus limiting the number of web queries
+needed.
+
+Example: If you configure Barometer to use both Yahoo and Weather.com,
+then use a query like "denver", this will require a conversion from
+"denver" to its weather.com weather_id.  This conversion is needed for
+both web services but will only happen once and be cached.
+
 = usage
 
 You can use barometer right out of the box, as it is configured to use one
@@ -99,6 +140,7 @@ The available sources are:
   Yahoo! Weather (:yahoo)
   Google Weather (:google)
   Weather.com (:weather_dot_com)
+  WeatherBug.com (:weather_bug)
   
 == source configuration
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 0
+:patch: 1
 :major: 0
-:minor: 5
+:minor: 6

data/bin/barometer

@@ -29,12 +29,14 @@
 #   -V, --verbose       Verbose output
 #   -t, --timeout       seconds until service queries will timeout
 #   -g, --geocode       Force Geocoding of query
+#   -z, --timezone      Enhance Timezone
 #   -m, --metric        measure in metric
 #   -i, --imperial      measure in imperial
 #   --wunderground      add wunderground as a source
 #   --yahoo             add yahoo as a source
 #   --google            add google as a source
 #   --weather           add weather.com as a source
+#   --bug               add weather_bug as a source
 #   -p, --pop           pop threshold used to determine wet?
 #   -s, --wind          wind speed threshold used to determine windy?
 #   -a, --at            time/date used to determine when to calculate summary
@@ -64,7 +66,7 @@ require 'yaml'
 
 # file where API keys are stored
 KEY_FILE = File.expand_path(File.join('~', '.barometer'))
-BAROMETER_VERSION = '0.5.0'
+BAROMETER_VERSION = '0.6.0'
 
 class App
   
@@ -77,6 +79,7 @@ class App
     @options = OpenStruct.new
     @options.timeout = 15
     @options.geocode = false
+    @options.timezone = false
     @options.metric = true
     @options.sources = []
     @options.verbode = false
@@ -120,12 +123,14 @@ class App
       opt.on('-a n', '--at n')     {|n| @options.at = Time.parse(n.to_s) }
       opt.on('-t n', '--timeout n') {|n| @options.timeout = n }
       opt.on('-g', '--geocode')    { @options.geocode = true }
+      opt.on('-z', '--timezone')   { @options.timezone = true }
       opt.on('-m', '--metric')     { @options.metric = true }
       opt.on('-i', '--imperial')   { @options.metric = false }
       opt.on('--wunderground')     { @options.sources << :wunderground; @options.default = false }
       opt.on('--yahoo')            { @options.sources << :yahoo; @options.default = false }
       opt.on('--google')           { @options.sources << :google; @options.default = false }
       opt.on('--weather')          { @options.sources << :weather_dot_com; @options.default = false }
+      opt.on('--bug')              { @options.sources << :weather_bug; @options.default = false }
       opt.on('-p n', '--pop n')    {|n| @options.pop = n.to_i || 50 }
       opt.on('-s n', '--wind n')   {|n| @options.metric ? @options.windy_m = n.to_f || 10 : @options.windy_i = n.to_f || 7 }
       
@@ -157,16 +162,38 @@ class App
       end
       { :weather_dot_com => { :keys => { :partner => partner_key, :license => license_key } } }
     end
+    
+    def config_weather_bug
+      if File.exists?(KEY_FILE)
+      	keys = YAML.load_file(KEY_FILE)
+      	if keys["weather_bug"] && keys["weather_bug"]["code"]
+      	  code = keys["weather_bug"]["code"].to_s
+        else
+          bug_key_message
+          exit
+        end
+      else
+        File.open(KEY_FILE, 'w') {|f| f << "\nweather_bug:\n  code: API_CODE" }
+        bug_key_message
+        exit
+      end
+      { :weather_bug => { :keys => { :code => code } } }
+    end
 
     # Performs post-parse processing on options
     def process_options
       @options.sources << :wunderground if @options.default
       @options.sources = @options.sources.uniq
       Barometer.force_geocode =  @options.geocode
+      Barometer.enhance_timezone =  @options.timezone
       if @options.sources.include?(:weather_dot_com)
         @options.sources.delete(:weather_dot_com)
         @options.sources << config_weather_dot_com
       end
+      if @options.sources.include?(:weather_bug)
+        @options.sources.delete(:weather_bug)
+        @options.sources << config_weather_bug
+      end
       Barometer.config = { 1 => @options.sources }
       Barometer.timeout = @options.timeout
     end
@@ -206,12 +233,14 @@ class App
       puts "  -V, --verbose       Verbose output"
       puts "  -t, --timeout       seconds until service queries will timeout"
       puts "  -g, --geocode       Force Geocoding of query"
+      puts "  -z, --timezone      Force timezone query"
       puts "  -m, --metric        measure in metric"
       puts "  -i, --imperial      measure in imperial"
       puts "  --wunderground      add wunderground as a source"
       puts "  --yahoo             add yahoo as a source"
       puts "  --google            add google as a source"
       puts "  --weather           add weather.com as a source"
+      puts "  --bug               add weather_bug as a source"
       puts "  -p, --pop           pop threshold used to determine wet?"
       puts "  -s, --wind          wind speed threshold used to determine windy?"
       puts "  -a, --at            time/date used to determine when to calculate summary"
@@ -232,7 +261,14 @@ class App
       else
         barometer = Barometer.new(@arguments.join(" "))
         begin
+          if @options.verbose
+            Barometer::debug!
+            div(char="*")
+            puts "DEBUG LOG"
+            blank
+          end
           barometer.measure(@options.metric) if barometer
+          blank if @options.verbose
           pretty_output(barometer) if barometer.weather
         rescue Barometer::OutOfSources
           puts
@@ -292,8 +328,8 @@ def pretty_summary(s)
   section("SUMMARY#{ " (@ #{@options.at})" if @options.at }") do
     pretty_hash({
       "day?" => s.day?(@options.at), "sunny?" => s.sunny?(@options.at),
-      "windy?" => s.windy?(@options.metric ? @options.windy_m : @options.windy_i, @options.at),
-      "wet?" => s.wet?(@options.pop,@options.at) })
+      "windy?" => s.windy?(@options.at, @options.metric ? @options.windy_m : @options.windy_i),
+      "wet?" => s.wet?(@options.at, @options.pop) })
   end
 end
 
@@ -342,7 +378,8 @@ end
 def pretty_timezone(t)
   return unless t
   section("TIMEZONE", 2) do
-    pretty_hash({ "Long" => t.timezone, "Code" => t.code,"DST?" => t.dst? })
+    pretty_hash({ "Long" => t.full, "Code" => t.code, "DST?" => t.dst?,
+      "Now" => t.now(true), "Today" => t.today })
   end
 end
 
@@ -401,7 +438,8 @@ def pretty_measurement(m)
     pretty_hash({
       "Measured At" => m.measured_at,
       "Source" => m.source, "Time Stamp" => m.utc_time_stamp,
-      "Metric" => m.metric?, "Success" => m.success? })
+      "Metric" => m.metric?, "Success" => m.success?,
+      "Service Time" => "#{(m.end_at - m.start_at)} s" })
   end
   section("MODIFIED QUERY", 2) do
     pretty_hash({ "Query" => m.query, "Format" => m.format })
@@ -423,10 +461,11 @@ def pretty_measurements(w)
   end
 end
 
-def pretty_info
+def pretty_info(w)
   title("INFO", 1)
   value("GitHub", "http://github.com/attack/barometer")
   value("Barometer Version", BAROMETER_VERSION)
+  value("Total Time", "#{(w.end_at - w.start_at)} s")
 end
 
 def pretty_output(barometer)
@@ -441,7 +480,7 @@ def pretty_output(barometer)
     pretty_summary(weather)
     pretty_query(barometer.query)
     pretty_measurements(weather)
-    pretty_info
+    pretty_info(weather)
     div("-")
   end
 end
@@ -481,6 +520,17 @@ def weather_key_message
   puts
 end
 
+def bug_key_message
+  puts
+  puts "MISSING KEYS !!!"
+  puts "Please update the key_file '#{KEY_FILE}' with your weather_bug api key"
+  puts "Get it here: ???"
+  puts "Then, add these lines to the file:"
+  puts "weather_bug:"
+  puts "  code: API_CODE"
+  puts
+end
+
 # set API keys
 if File.exists?(KEY_FILE)
 	keys = YAML.load_file(KEY_FILE)

data/lib/barometer.rb

@@ -9,6 +9,12 @@ require 'barometer/formats'
  
 module Barometer
   
+  @@debug_mode = false
+  def self.debug; @@debug_mode; end;
+  def self.debug=(value); @@debug_mode = value; end;
+  def self.debug!; @@debug_mode = true; end;
+  def self.debug?; @@debug_mode; end;
+  
   @@google_geocode_key = nil
   def self.google_geocode_key; @@google_geocode_key; end;
   def self.google_geocode_key=(key); @@google_geocode_key = key; end;
@@ -25,6 +31,11 @@ module Barometer
   def self.force_geocode=(value); @@force_geocode = value; end;
   def self.force_geocode!; @@force_geocode = true; end;
   
+  @@enhance_timezone = false
+  def self.enhance_timezone; @@enhance_timezone; end;
+  def self.enhance_timezone=(value); @@enhance_timezone = value; end;
+  def self.enhance_timezone!; @@enhance_timezone = true; end;
+  
   # adjust the timeout used when interactind with external web services
   #
   @@timeout = 15

data/lib/barometer/base.rb

@@ -22,6 +22,7 @@ module Barometer
     #
     def measure(metric=nil)
       return nil unless @query
+      @weather.start_at = Time.now.utc
 
       level = 1
       until self.success?
@@ -32,6 +33,8 @@ module Barometer
         end
         level += 1
       end
+      
+      @weather.end_at = Time.now.utc
       @weather
     end
     

data/lib/barometer/data.rb

@@ -1,11 +1,7 @@
 $:.unshift(File.dirname(__FILE__))
 
-# measurements and units
+# units
 #
-require 'data/measurement'
-require 'data/current'
-require 'data/forecast'
-require 'data/night'
 require 'data/zone'
 require 'data/sun'
 require 'data/geo'
@@ -16,4 +12,13 @@ require 'data/distance'
 require 'data/speed'
 require 'data/pressure'
 require 'data/local_time'
-require 'data/local_datetime'
+require 'data/local_datetime'
+
+# measurements
+#
+require 'measurements/measurement'
+require 'measurements/common'
+require 'measurements/current'
+require 'measurements/forecast_array'
+require 'measurements/forecast'
+require 'measurements/night'

data/lib/barometer/data/sun.rb

@@ -18,6 +18,16 @@ module Barometer
     def nil?
       (@rise || @set) ? false : true
     end
+   
+    def after_rise?(time)
+      raise ArgumentError unless time.is_a?(Data::LocalTime)
+      time >= @rise
+    end
     
+    def before_set?(time)
+      raise ArgumentError unless time.is_a?(Data::LocalTime)
+      time <= @set
+    end
+   
   end
 end

data/lib/barometer/data/zone.rb

@@ -11,19 +11,49 @@ module Barometer
   #
   class Data::Zone
     
-    attr_accessor :timezone, :tz
+    @@zone_codes_file = File.expand_path(
+      File.join(File.dirname(__FILE__), '..', 'translations', 'zone_codes.yml'))
+    @@zone_codes = nil
+
+    attr_accessor :zone_full, :zone_code, :zone_offset, :tz
+    
+    def initialize(zone)
+      if Data::Zone.is_zone_full?(zone)
+        @zone_full = zone
+        @tz = TZInfo::Timezone.get(zone)
+      elsif Data::Zone.is_zone_offset?(zone)
+        @zone_offset = zone
+      elsif Data::Zone.is_zone_code?(zone)
+        @zone_code = zone
+      else
+        raise(ArgumentError, "invalid time zone")
+      end
+    end
     
-    def initialize(timezone)
-      @timezone = timezone
-      @tz = TZInfo::Timezone.get(timezone)
+    def current
+      @zone_full || @zone_offset || @zone_code
     end
     
     # what is the Timezone Short Code for the current timezone
     def code
-      return "" unless @tz
+      return @zone_code if @zone_code
+      return nil unless @tz
       @tz.period_for_utc(Time.now.utc).zone_identifier.to_s
     end
     
+    def full
+      @zone_full || nil
+    end
+    
+    def offset
+      if @zone_offset
+        @zone_offset.to_f * 60 * 60
+      elsif @zone_code
+        Data::Zone.zone_to_offset(@zone_code)
+      elsif @zone_full
+      end
+    end
+    
     # is the current timezone in daylights savings mode?
     def dst?
       return nil unless @tz
@@ -31,98 +61,59 @@ module Barometer
     end
     
     # return Time.now.utc for the set timezone
-    def now
-      Data::Zone.now(@timezone)
+    def now(convert=false)
+      if @zone_full
+        now = @tz.utc_to_local(Time.now.utc)
+      elsif @zone_offset || @zone_code
+        now = Time.now.utc + self.offset
+      end
+      convert ? Data::LocalTime.parse(now) : now
     end
     
     # return Date.today for the set timezone
     def today
-      Data::Zone.today(@timezone)
+      now = self.now
+      Date.new(now.year, now.month, now.day)
     end
     
     def local_to_utc(local_time)
-      @tz.local_to_utc(local_time)
+      if @zone_full
+        @tz.local_to_utc(local_time)
+      elsif @zone_offset || @zone_code
+        local_time -= self.offset
+        Time.utc(local_time.year,local_time.month,local_time.day,
+          local_time.hour,local_time.min,local_time.sec)
+      end
     end
     
     def utc_to_local(utc_time)
-      @tz.utc_to_local(utc_time)
+      if @zone_full
+        @tz.utc_to_local(utc_time)
+      elsif @zone_offset || @zone_code
+        utc_time + self.offset
+      end
     end
     
     #
     # Class Methods
     #
     
-    # return the local current time, providing a timezone
-    # (ie 'Europe/Paris') will give the local time for the
-    # timezone, otherwise it will be Time.now
-    def self.now(timezone=nil)
-      if timezone
-        utc = Time.now.utc
-        tz = TZInfo::Timezone.get(timezone)
-        tz.utc_to_local(utc)
-      else
-        Time.now
-      end
+    def self.is_zone_code?(zone)
+      return false unless (zone && zone.is_a?(String))
+      _load_zone_codes unless @@zone_codes
+      Time.zone_offset(zone) || (@@zone_codes && @@zone_codes.has_key?(zone))
     end
     
-    # return the local current date, providing a timezone
-    # (ie 'Europe/Paris') will give the local date for the
-    # timezone, otherwise it will be Date.today
-    def self.today(timezone=nil)
-      if timezone
-        utc = Time.now.utc
-        tz = TZInfo::Timezone.get(timezone)
-        now = tz.utc_to_local(utc)
-        Date.new(now.year, now.month, now.day)
-      else
-        Date.today
-      end
+    def self.is_zone_full?(zone)
+      return false unless (zone && zone.is_a?(String))
+      zone.match(/[A-Za-z]+\/[A-Za-z]+/) ? true : false
     end
     
-    # takes a time (any timezone), and a TimeZone Short Code (ie PST) or
-    # the number of hours offset from UTC time and
-    # converts the time to UTC according to that time_zone
-    # NOTE: No Tests
-    def self.code_to_utc(time, timezone)
-      raise ArgumentError unless time.is_a?(Time)
-      
-      offset = self.zone_to_offset(timezone)
-      
-      Time.utc(
-        time.year, time.month, time.day,
-        time.hour, time.min, time.sec, time.usec
-      ) - offset
-    end
-    
-    # takes a string with TIME only information and merges it with a string that
-    # has DATE only information and creates a UTC TIME object with time and date
-    # info.  if you supply the timezone code (ie PST), it will apply the timezone
-    # offset to the final time
-    def self.merge(time, date, timezone_code=nil)
-      raise ArgumentError unless (time.is_a?(Time) || time.is_a?(String))
-      raise ArgumentError unless (date.is_a?(Time) || date.is_a?(Date) || date.is_a?(String))
-      
-      if time.is_a?(String)
-        reference_time = Time.parse(time)
-      elsif time.is_a?(Time)
-        reference_time = time
-      end
-      
-      if date.is_a?(String)
-        reference_date = Date.parse(date)
-      elsif date.is_a?(Time)
-        reference_date = Date.new(date.year, date.month, date.day)
-      elsif date.is_a?(Date)
-        reference_date = date
-      end
-      
-      new_time = Time.utc(
-        reference_date.year, reference_date.month, reference_date.day,
-        reference_time.hour, reference_time.min, reference_time.sec
-      )
-      timezone_code ? Data::Zone.code_to_utc(new_time,timezone_code) : new_time
+    def self.is_zone_offset?(zone)
+      return false unless (zone && (zone.is_a?(Fixnum) || zone.is_a?(Float)))
+      zone.to_f.abs <= 14
     end
-    
+
     #
     # Known conflicts
     # IRT (ireland and india)
@@ -131,119 +122,19 @@ module Barometer
     def self.zone_to_offset(timezone)
       offset = 0
       seconds_in_hour = 60*60
-      # do we have a short_timezone code, or an offset?
-      if timezone.is_a?(Fixnum) || 
-         (timezone.is_a?(String) && timezone.to_i.to_s == timezone)
-        # we have an offset, convert to second
-        offset = timezone.to_i * seconds_in_hour
-      else
-        # try to use Time
-        unless offset = Time.zone_offset(timezone)
-          # that would have been too easy, do it manually
-          # http://www.timeanddate.com/library/abbreviations/timezones/
-          # http://www.worldtimezone.com/wtz-names/timezonenames.html
-          zone_offsets = {
-            :A => 1, :ACDT => 10.5, :ACST => 9.5, :ADT => -3, :AEDT => 11,
-            :AEST => 10, :AFT => 4.5, :AHDT => -9, :AHST => -10, :AKDT => -8,
-            :AKST => -9, :AMST => 5, :AMT => 4, :ANAST => 13, :ANAT => 12,
-            :ART => -3, :AST => -4, :AT => -1, :AWDT => 9, :AWST => 8,
-            :AZOST => 0, :AZOT => -1, :AZST => 5, :AZT => 4,
-            
-            :B => 2, :BADT => 4, :BAT => 6, :BDST => 2, :BDT => 6, :BET => -11,
-            :BNT => 8, :BORT => 8, :BOT => -4, :BRA => -3, :BST => 1, :BT => 6,
-            :BTT => 6,
-            
-            :C => 3, :CAT => 2, :CCT => 8, :CEST => 2, :CET => 1, :CHADT => 13.75,
-            :CHAST => 12.75, :CHST => 10, :CKT => -10, :CLST => -3, :CLT => -4,
-            :COT => -5, :CUT => 0, :CVT => -1, :CWT => 8.75, :CXT => 7, :CEDT => 2,
-            
-            :D => 4, :DAVT => 7, :DDUT => 10, :DNT => 1, :DST => 2,
-            
-            :E => 5, :EASST => -5, :EAST => -6, :EAT => 3, :ECT => -5, :EEST => 3,
-            :EET => 2, :EGST => 0, :EGT => -1, :EMT => 1, :EEDT => 3,
-            
-            :F => 6, :FDT => -1, :FJST => 13, :FJT => 12, :FKST => -3, :FKT => -4,
-            :FST => 2, :FWT => 1,
-            
-            :G => 7, :GALT => -6, :GAMT => -9, :GEST => 5, :GET => 4, :GFT => -3,
-            :GILT => 12, :GST => 4, :GT => 0, :GYT => -4, :GZ => 0,
-            
-            :H => 8, :HAA => -3, :HAC => -5, :HADT => -9, :HAE => -4, :HAP => -7,
-            :HAR => -6, :HAST => -10, :HAT => -2.5, :HAY => -8, :HDT => -9.5,
-            :HFE => 2, :HFH => 1, :HG => 0, :HKT => 8, :HNA => -4, :HNC => -6,
-            :HNE => -5, :HNP => -8, :HNR => -7, :HNT => -3.5, :HNY => -9,
-            :HOE => 1, :HST => -10,
-            
-            :I => 9, :ICT => 4, :IDLE => 12, :IDLW => -12, :IDT => 1, :IOT => 5,
-            :IRDT => 4.5, :IRKST => 9, :IRKT => 8, :IRST => 3.5, :IRT => 3.5,
-            :IST => 1, :IT => 3.5, :ITA => 1,
-            
-            :JAVT => 7, :JAYT => 9, :JFDT => -3, :JFST => -4, :JST => 9, :JT => 7,
-            
-            :K => 10, :KDT => 10, :KGST => 6, :KGT => 5, :KOST => 12, :KOVT => 7,
-            :KOVST => 8, :KRAST => 8, :KRAT => 7, :KST => 9,
-            
-            :L => 11, :LHDT => 11, :LHST => 10.5, :LIGT => 10, :LINT => 14, :LKT => 6,
-            :LST => 1,
-            
-            :M => 12, :MAGST => 12, :MAGT => 11, :MAL => 8, :MART => -9.5, :MAT => 3,
-            :MAWT => 6, :MBT => 8, :MED => 2, :MEDST => 2, :MEST => 2, :MESZ => 2,
-            :MET => 1, :MEWT => 1, :MEX => -6, :MEZ => 1, :MHT => 12, :MIT => 9.5,
-            :MMT => 6.5, :MNT => 8, :MNST => 9, :MPT => 10, :MSD => 4, :MSK => 3,
-            :MSKS => 4, :MT => 8.5, :MUT => 4, :MUST => 5, :MVT => 5, :MYT => 8,
-            :MFPT => -10,
-            
-            :N => -1, :NCT => 11, :NDT => -2.5, :NFT => 11.5, :NOR => 1, :NOVST => 7,
-            :NOVT => 6, :NPT => 5.75, :NRT => 12, :NST => -3.5, :NSUT => 6.5,
-            :NT => -11, :NUT => -11, :NZDT => 13, :NZST => 12, :NZT => 12,
-            
-            :O => -2, :OESZ => 3, :OEZ => 2, :OMSK => 7, :OMSST => 7, :OMST => 6,
-            
-            :P => -3, :PET => -5, :PETST => 13, :PETT => 12, :PGT => 10, :PHOT => 13,
-            :PHT => 8, :PIT => 8, :PKT => 5, :PKST => 6, :PMDT => -2, :PMST => -3,
-            :PMT => -3, :PNT => -8.5, :PONT => 11, :PYST => -3, :PYT => -4, :PWT => 9,
-            
-            :Q => -4,
-            
-            :R => -5, :R1T => 2, :R2T => 3, :RET => 4, :ROK => 9, :ROTT => -3,
-            
-            :S => -6, :SADT => 10.5, :SAMST => 5, :SAMT => 4, :SAST => 2, :SBT => 11,
-            :SCT => 4, :SCDT => 13, :SCST => 12, :SET => 1, :SGT => 8, :SIT => 8,
-            :SLT => -4, :SLST => -3, :SRT => -3, :SST => -11, :SYST => 3, :SWT => 1,
-            :SYT => 2,
-            
-            :T => -7, :TAHT => -10, :TFT => 5, :THA => 7, :THAT => -10, :TJT => 5,
-            :TKT => -10, :TMT => 5, :TOT => 13, :TRUK => 10, :TPT => 9, :TRUT => 10,
-            :TST => 3, :TUC => 0, :TVT => 12, :TWT => 8,
-            
-            :U => -8, :ULAST => 9, :ULAT => 8, :USZ1 => 2, :USZ1S => 3, :USZ3 => 4,
-            :USZ3S => 5, :USZ4 => 5, :USZ4S => 6, :USZ5 => 6, :USZ5S => 7, :USZ6 => 7,
-            :USZ6S => 8, :USZ7 => 8, :USZ7S => 9, :USZ8 => 9, :USZ8S => 10, :USZ9 => 10,
-            :USZ9S => 11, :UTZ => -3, :UYT => -3, :UYST => -2, :UZ10 => 11, :UZ10S => 12,
-            :UZ11 => 12, :UZ11S => 13, :UZ12 => 12, :UZ12S => 13, :UZT => 5,
-            
-            :V => -9, :VET => -4.5, :VLAST => 11, :VLAT => 10, :VOST => 6, :VST => -4.5,
-            :VTZ => -2, :VUT => 11,
-            
-            :W => -10, :WAKT => 12, :WAST => 2, :WAT => 1, :WCT => 8.75, :WEST => 1,
-            :WESZ => 1, :WET => 0, :WEZ => 0, :WFT => 12, :WGST => -2, :WGT => -3,
-            :WIB => 7, :WITA => 8, :WIT => 9, :WST => 8, :WKST => 5, :WTZ => -1,
-            :WUT => 1, :WEDT => 1, :WDT => 9,
-            
-            :X => -11,
-
-            :Y => -12, :YAKST => 10, :YAKT => 9, :YAPT => 10, :YDT => -8, :YEKST => 6,
-            :YEKT => 5, :YST => -9,
-
-            :Z => 0         
-          }  
-          # unknown
-          # :HL => X, :LST => X, :LT => X, :OZ => X :SZ => X :TAI => X :UT => X :WZ => X
-          
-          offset = (zone_offsets[timezone.to_s.upcase.to_sym] || 0) * seconds_in_hour
-        end
+      # try to use Time
+      unless offset = Time.zone_offset(timezone)
+        # that would have been too easy, do it manually
+        # http://www.timeanddate.com/library/abbreviations/timezones/
+        # http://www.worldtimezone.com/wtz-names/timezonenames.html
+        offset = (@@zone_codes[timezone.to_s.upcase] || 0) * seconds_in_hour
       end
-      return offset
+      offset
+    end
+    
+    def self._load_zone_codes
+      $:.unshift(File.dirname(__FILE__))
+      @@zone_codes ||= YAML.load_file(@@zone_codes_file)
     end
     
   end