barometer 0.7.3 → 0.8.0

data/lib/barometer/measurements/result_array.rb

@@ -7,16 +7,16 @@ module Barometer
   # with methods for insertion and searching
   #
   class Measurement::ResultArray < Array
-    
+
     def <<(forecast)
       raise ArgumentError unless forecast.is_a?(Measurement::Result)
       super(forecast)
     end
-    
+
     def [](index)
       index.is_a?(Fixnum) ? super(index) : self.for(index)
     end
-    
+
     #
     # Returns a forecast for a day given by a Date, DateTime,
     # Time, or a string that can be parsed to a Data::LocalDateTime
@@ -24,9 +24,9 @@ module Barometer
     # credit: http://github.com/jdpace/weatherman/
     #
     def for(datetime)
-    
+
       return nil unless self.size > 0
-      
+
       # Format date into a Date class
       datetime = case datetime.class.name
       when 'Date'
@@ -41,35 +41,35 @@ module Barometer
       when 'DateTime'
         Data::LocalDateTime.parse(datetime)
       end
-      
+
       day = nil
       self.each do |f|
         day = f if f.for_datetime?(datetime)
       end
       return day
     end
-    
+
     #
     # answer simple questions
     #
-    
+
     def windy?(datetime, threshold=10)
       (forecast = self[datetime]) ? forecast.windy?(threshold) : nil
     end
-    
+
     def day?(datetime)
       local_time = Data::LocalTime.parse(datetime)
       (forecast = self[datetime]) ? forecast.day?(local_time) : nil
     end
-    
+
     def sunny?(datetime, sunny_icons=nil)
       local_time = Data::LocalTime.parse(datetime)
       (forecast = self[datetime]) ? forecast.sunny?(local_time, sunny_icons) : nil
     end
-    
+
     def wet?(datetime, wet_icons=nil, pop_threshold=50, humidity_threshold=99)
       (forecast = self[datetime]) ? forecast.wet?(wet_icons,pop_threshold,humidity_threshold) : nil
     end
-    
+
   end
 end

data/lib/barometer/query.rb

@@ -17,7 +17,7 @@ module Barometer
   #   not accept the query string.
   #
   class Query
-    
+
     # This array defines the order to check a query for the format
     #
     FORMATS = %w(
@@ -29,18 +29,18 @@ module Barometer
       :coordinates => "Coordinates", :icao => "Icao",
       :woe_id => "WoeID", :geocode => "Geocode"
     }
-    
+
     attr_writer :q
     attr_accessor :format, :country_code
     attr_accessor :geo, :timezone, :conversions
-    
+
     def initialize(query=nil)
       return unless query
       @q = query
       self.analyze!
       @conversions = {}
     end
-    
+
     def q
       format ? Barometer::Query::Format.const_get(FORMAT_MAP[format.to_sym].to_s).convert_query(@q) : @q
     end
@@ -59,14 +59,14 @@ module Barometer
         end
       end
     end
-    
+
     # take a list of acceptable (and ordered by preference) formats and convert
     # the current query (q) into the most preferred and acceptable format. a
     # side effect of the conversions may reveal the country_code, if so save it
     #
     def convert!(preferred_formats=nil)
       raise ArgumentError unless (preferred_formats && preferred_formats.size > 0)
-      
+
       # why convert if we are already there?
       # (except in the case that the serivce excepts coordinates and we have a
       # a geocode ... the google geocode results are superior)
@@ -79,7 +79,7 @@ module Barometer
           converted_query = self.dup
         end
       end
-      
+
       unless skip_conversion
         # go through each acceptable format and try to convert to that
         converted = false
@@ -94,7 +94,7 @@ module Barometer
           unless converted
             unless converted_query = get_conversion(preferred_format)
               converted_query = Query::Format.const_get(klass.to_s).to(self)
-            end  
+            end
             converted = true if converted_query
           end
           if converted
@@ -104,7 +104,7 @@ module Barometer
           end
         end
       end
-      
+
       # force geocode?, unless we already did
       #
       if Barometer.force_geocode && !@geo
@@ -117,7 +117,7 @@ module Barometer
           converted_query.geo = @geo.dup
         end
       end
-      
+
       # enhance timezone?, unless we already did
       #
       if Barometer.enhance_timezone && !@timezone
@@ -129,10 +129,10 @@ module Barometer
           converted_query.timezone = @timezone.dup
         end
       end
-      
+
       converted_query
     end
-    
+
 # save the important parts of the conversion ... by saving conversion we
 # can avoid doing the same conversion multiple times
 #
@@ -162,11 +162,11 @@ end
     return nil unless self.format == Query::Format::Coordinates.format
     Query::Format::Coordinates.parse_latitude(self.q)
   end
-  
+
   def longitude
     return nil unless self.format == Query::Format::Coordinates.format
     Query::Format::Coordinates.parse_longitude(self.q)
   end
-    
+
   end
-end  
+end

data/lib/barometer/services.rb

@@ -4,10 +4,9 @@ $:.unshift(File.dirname(__FILE__))
 #
 require 'weather_services/service'
 require 'weather_services/wunderground'
-require 'weather_services/google'
 require 'weather_services/yahoo'
-require 'weather_services/weather_dot_com'
 require 'weather_services/weather_bug'
+require 'weather_services/noaa'
 
 #
 # web services (non weather)
@@ -16,4 +15,5 @@ require 'web_services/web_service'
 require 'web_services/geocode'
 require 'web_services/weather_id'
 require 'web_services/timezone'
-require 'web_services/placemaker'
+require 'web_services/placemaker'
+require 'web_services/noaa_station_id'

data/lib/barometer/translations/icao_country_codes.yml

@@ -11,18 +11,18 @@ one_letter:
     U : RU
     Y : AU
     Z : CN
-    
+
 two_letter:
     # A - Western South Pacific
     AG : SB
     AN : NR
     AY : PG
-    
+
     # B - Iceland/Greenland and Kosovo
     BG : GL
     BI : IS
     #BK : Kosovo (also LY Serbia (RS) because of disputes)
-    
+
     # D - West Africa
     DA : DZ
     DB : BJ
@@ -33,7 +33,7 @@ two_letter:
     DR : NE
     DT : TN
     # DX : Togolese Republic
-    
+
     # E - Northern Europe
     EB : BE
     ED : DE
@@ -50,7 +50,7 @@ two_letter:
     ET : DE
     EV : LV
     EY : LT
-    
+
     # F - Southern Africa
     FA : ZA
     FB : BW
@@ -75,7 +75,7 @@ two_letter:
     FX : LS
     FY : NA
     FZ : CD
-    
+
     # G - Northwestern Africa
     GA : ML
     GB : GM
@@ -90,7 +90,7 @@ two_letter:
     GS : EH
     GU : GN
     GV : CV
-    
+
     # H - Northeastern Africa
     HA : ET
     HB : BI
@@ -105,7 +105,7 @@ two_letter:
     HS : SD
     HT : TZ
     HU : UG
-    
+
     # L - Southern Europe,Israel and Turkey
     LA : AL
     LB : BG
@@ -133,7 +133,7 @@ two_letter:
     LX : GI
     #LY : Serbia (RS) and Montenegro (ME)
     LZ : SK
-    
+
     # M - Central America and Mexico
     MB : TC
     MD : DO
@@ -150,7 +150,7 @@ two_letter:
     MW : KY
     MY : BS
     MZ : BZ
-    
+
     # N - South Pacific
     NC : CK
     # NF : Fiji (FJ), Tonga (TO)
@@ -162,7 +162,7 @@ two_letter:
     NV : VU
     NW : NC
     # NZ : New Zealand (NZ), Antarctica (AQ)
-    
+
     # O - Southwest Asia (excluding Israel and Turkey), Afghanistan and Pakistan
     OA : AF
     OB : BH
@@ -178,7 +178,7 @@ two_letter:
     OS : SY
     OT : QA
     OY : YE
-    
+
     # P - Eastern North Pacific
     PA : US
     # PB : Baker Island
@@ -194,14 +194,14 @@ two_letter:
     PP : US
     # PT : Federated States of Micronesia (FM), Palau (PW)
     # PW : Wake Island
-    
+
     # R - Western North Pacific
     RC : TW
     RJ : JP
     RK : KR
     RO : JP
     RP : PH
-    
+
     # S - South America
     SA : AR
     SB : BR
@@ -221,7 +221,7 @@ two_letter:
     SV : VE
     SW : BR
     SY : GY
-    
+
     # T - Caribbean
     TA : AG
     TB : BB
@@ -239,7 +239,7 @@ two_letter:
     TU : VG
     TV : VC
     TX : BM
-    
+
     # U - Russia and former Soviet States
     UA : KZ
     UB : AZ
@@ -248,7 +248,7 @@ two_letter:
     UK : UA
     UM : BY
     #UT    Tajikistan (TJ), Turkmenistan (TM), Uzbekistan (UZ)
-    
+
     # V - South Asia (except Afghanistan and Pakistan) and mainland Southeast Asia
     VA : IN
     VC : LK
@@ -266,7 +266,7 @@ two_letter:
     VT : TH
     VV : VN
     VY : MM
-    
+
     # W - Maritime Southeast Asia (except the Philippines)
     WA : ID
     # WB : Malaysia (MY), Brunei (BN)
@@ -276,7 +276,7 @@ two_letter:
     WQ : ID
     WR : ID
     WS : SG
-    
+
     # Z - China, Mongolia and North Korea
     ZK : KP
-    ZM : MN
+    ZM : MN

data/lib/barometer/translations/weather_country_codes.yml

@@ -197,4 +197,4 @@ ZI : ZW
 ### Marshall Islands USMH : MH
 ### American Samoa USAS : AS
 ### Palau USPW : PW
-### Guam USGU : GU
+### Guam USGU : GU

data/lib/barometer/translations/zone_codes.yml

@@ -265,7 +265,7 @@ SLST : -3
 SRT : -3
 SST : -11
 SYST : 3
-SWT : 1
+SWT : 1
 SYT : 2
 
 T : -7
@@ -357,4 +357,4 @@ YEKST : 6
 YEKT : 5
 YST : -9
 
-Z : 0
+Z : 0

data/lib/barometer/version.rb

@@ -0,0 +1,3 @@
+module Barometer
+  VERSION = '0.8.0'
+end

data/lib/barometer/weather.rb

@@ -6,19 +6,19 @@ module Barometer
   # methods to interact with the data
   #
   class Weather
-    
+
     attr_accessor :measurements
     attr_accessor :start_at, :end_at
-    
+
     def initialize; @measurements = []; end
-    
+
     # the default measurement is the first successful measurement
     #
     def default
       return nil unless self.sources
       self.source(self.sources.first)
     end
-    
+
     # find the measurement for the given source, if it exists
     #
     def source(source)
@@ -28,32 +28,32 @@ module Barometer
       end
       nil
     end
-    
+
     # list successful sources
     #
     def sources
       @measurements.collect {|m| m.source.to_sym if m.success?}.compact
     end
-    
+
     #
     # Quick access methods
     #
-    
+
     def metric?; self.default ? self.default.metric? : true; end
     def current; (default = self.default) ? default.current : nil; end
     def forecast; (default = self.default) ? default.forecast : nil; end
     def now; self.current; end
-    
+
     def today
       default = self.default
       default && default.forecast ? default.forecast[0] : nil
     end
-    
+
     def tomorrow
       default = self.default
       default && default.forecast ? default.forecast[1] : nil
     end
-    
+
     # measurement search
     # this will search the default measurements forecasts looking for
     # the matching date
@@ -62,19 +62,19 @@ module Barometer
       default = self.default
       default && default.forecast ? default.for(query) : nil
     end
-    
-    
+
+
     #
     # helper methods
     #
     # these are handy methods that can average values for successful weather
     # sources, or answer a simple question (ie: weather.windy?)
     #
-    
+
     #
     # averages
     #
-    
+
     # this assumes calculating for current, and that "to_f" for a value
     # will return the value needed
     # value_name = the name of the value we are averaging
@@ -97,7 +97,7 @@ module Barometer
       return nil unless values && values.size > 0
       values.inject(0.0) { |sum,v| sum += v if v } / values.size
     end
-    
+
     def average(value_name, do_average=true, class_name=nil)
       if class_name
         if do_average
@@ -111,7 +111,7 @@ module Barometer
       end
       avg
     end
-      
+
     # average of all values
     #
     def humidity(do_average=true); average("humidity",do_average); end
@@ -122,29 +122,29 @@ module Barometer
     def heat_index(do_average=true); average("heat_index",do_average,"Temperature"); end
     def wind_chill(do_average=true); average("wind_chill",do_average,"Temperature"); end
     def visibility(do_average=true); average("visibility",do_average,"Distance"); end
-    
+
     #
     # quick access methods
     #
-    
+
     # what is the current local time and date?
     # def time
     # end
-    
+
     # def icon
     #   self.current.icon
     # end
-    
+
     #
     # simple questions
     # pass the question on to each successful measurement until we get an answer
     #
-    
+
     def windy?(time_string=nil, threshold=10)
       local_datetime = Data::LocalDateTime.parse(time_string)
       raise ArgumentError unless (threshold.is_a?(Fixnum) || threshold.is_a?(Float))
       raise ArgumentError unless (local_datetime.nil? || local_datetime.is_a?(Data::LocalDateTime))
-      
+
       is_windy = nil
       @measurements.each do |measurement|
         if measurement.success?
@@ -159,7 +159,7 @@ module Barometer
       local_datetime = Data::LocalDateTime.parse(time_string)
       raise ArgumentError unless (threshold.is_a?(Fixnum) || threshold.is_a?(Float))
       raise ArgumentError unless (local_datetime.nil? || local_datetime.is_a?(Data::LocalDateTime))
-      
+
       is_wet = nil
       @measurements.each do |measurement|
         if measurement.success?
@@ -173,7 +173,7 @@ module Barometer
     def day?(time_string=nil)
       local_datetime = Data::LocalDateTime.parse(time_string)
       raise ArgumentError unless (local_datetime.nil? || local_datetime.is_a?(Data::LocalDateTime))
-      
+
       is_day = nil
       @measurements.each do |measurement|
         if measurement.success?
@@ -194,7 +194,7 @@ module Barometer
     def sunny?(time_string=nil)
       local_datetime = Data::LocalDateTime.parse(time_string)
       raise ArgumentError unless (local_datetime.nil? || local_datetime.is_a?(Data::LocalDateTime))
-      
+
       is_sunny = nil
       @measurements.each do |measurement|
         if measurement.success?
@@ -207,5 +207,5 @@ module Barometer
     end
 
   end
-  
-end
+
+end