barometer 0.7.3 → 0.8.0

data/lib/barometer/weather_services/weather_bug.rb

@@ -1,3 +1,5 @@
+require 'crack'
+
 module Barometer
   #
   # = WeatherBug
@@ -34,7 +36,7 @@ module Barometer
   #   are specific to WeatherBug and un-supported by Barometer
   #
   class WeatherService::WeatherBug < WeatherService
-    
+
     @@api_code = nil
 
     def self.keys=(keys)
@@ -65,7 +67,7 @@ module Barometer
       codes = [0,2,3,4,7,26,31,64,65,75]
       codes.collect {|c| c.to_s}
     end
-    
+
     def self._build_extra(measurement, result, metric=true)
       #raise ArgumentError unless measurement.is_a?(Data::Measurement)
       #raise ArgumentError unless query.is_a?(Barometer::Query)
@@ -76,7 +78,7 @@ module Barometer
           forecast.sun = measurement.current.sun
         end
       end
-      
+
       measurement
     end
 
@@ -121,26 +123,26 @@ module Barometer
 
       current
     end
-    
+
     def self._build_forecast(data, metric=true)
       raise ArgumentError unless data.is_a?(Hash)
       forecasts = Measurement::ResultArray.new
       # go through each forecast and create an instance
-      if data && data["aws:forecast"]
+      if data && data["forecast"]
         start_date = Date.strptime(data['date'], "%m/%d/%Y %H:%M:%S %p")
         i = 0
-        data["aws:forecast"].each do |forecast|
+        data["forecast"].each do |forecast|
           forecast_measurement = Measurement::Result.new
-          icon_match = forecast['aws:image'].match(/cond(\d*)\.gif$/)
+          icon_match = forecast['image']['icon'].match(/cond(\d*)\.gif$/)
           forecast_measurement.icon = icon_match[1].to_i.to_s if icon_match
           forecast_measurement.date = start_date + i
-          forecast_measurement.condition = forecast['aws:short_prediction']
+          forecast_measurement.condition = forecast['short_prediction']
 
           forecast_measurement.high = Data::Temperature.new(metric)
-          forecast_measurement.high << forecast['aws:high']
+          forecast_measurement.high << forecast['high']['__content__']
 
           forecast_measurement.low = Data::Temperature.new(metric)
-          forecast_measurement.low << forecast['aws:low']
+          forecast_measurement.low << forecast['low']['__content__']
 
           forecasts << forecast_measurement
           i += 1
@@ -148,7 +150,7 @@ module Barometer
       end
       forecasts
     end
-    
+
     def self._build_location(data, geo=nil)
       raise ArgumentError unless data.is_a?(Hash)
       raise ArgumentError unless (geo.nil? || geo.is_a?(Data::Geo))
@@ -162,15 +164,15 @@ module Barometer
         location.latitude = geo.latitude
         location.longitude = geo.longitude
       else
-        if data && data['aws:location']
-          location.city = data['aws:location']['aws:city']
-          location.state_code = data['aws:location']['aws:state']
-          location.zip_code = data['aws:location']['aws:zip']
+        if data && data['location']
+          location.city = data['location']['city']
+          location.state_code = data['location']['state']
+          location.zip_code = data['location']['zip']
         end
       end
       location
     end
-    
+
     def self._build_station(data)
       raise ArgumentError unless data.is_a?(Hash)
       station = Data::Location.new
@@ -184,7 +186,7 @@ module Barometer
       station.longitude = data['aws:longitude']
       station
     end
-    
+
     def self._build_sun(data)
       raise ArgumentError unless data.is_a?(Hash)
       sun = nil
@@ -218,16 +220,16 @@ module Barometer
       result << _fetch_forecast(query,metric)
       result
     end
-    
+
     # use HTTParty to get the current weather
     #
     def self._fetch_current(query, metric=true)
       puts "fetch weatherbug current: #{query.q}" if Barometer::debug?
-      
+
       q = ( query.format.to_sym == :short_zipcode ?
         { :zipCode => query.q } :
         { :lat => query.q.split(',')[0], :long => query.q.split(',')[1] })
-      
+
       # httparty and the xml builder it uses miss some information
       # 1st - get the raw response
       # 2nd - manually get the missing information
@@ -240,36 +242,36 @@ module Barometer
         }.merge(q),
         :format => :plain,
         :timeout => Barometer.timeout
-      )  
-      
+      )
+
       # get icon
       icon_match = response.match(/cond(\d*)\.gif/)
       icon = icon_match[1] if icon_match
-      
+
       # get station zipcode
       zip_match = response.match(/zipcode=\"(\d*)\"/)
       zipcode = zip_match[1] if zip_match
-      
+
       # build xml
-      output = Crack::XML.parse(response)
+      output = ::Crack::XML.parse(response)
       output = output["aws:weather"]["aws:ob"]
-      
+
       # add missing data
       output["aws:icon"] = icon
       output["aws:station_zipcode"] = zipcode
-      
+
       output
     end
-    
+
     # use HTTParty to get the current weather
     #
     def self._fetch_forecast(query, metric=true)
       puts "fetch weatherbug forecast: #{query.q}" if Barometer::debug?
-      
+
       q = ( query.format.to_sym == :short_zipcode ?
         { :zipCode => query.q } :
         { :lat => query.q.split(',')[0], :long => query.q.split(',')[1] })
-      
+
       self.get(
         "http://#{@@api_code}.api.wxbug.net/getForecastRSS.aspx",
         :query => { :ACode => @@api_code,
@@ -277,9 +279,9 @@ module Barometer
         }.merge(q),
         :format => :xml,
         :timeout => Barometer.timeout
-      )["aws:weather"]["aws:forecasts"]
+      )["weather"]["forecasts"]
     end
-    
+
     # since we have two sets of data, override these calls to choose the
     # right set of data
     #
@@ -292,4 +294,4 @@ module Barometer
     def self._time_result(data=nil); data[0]; end
 
   end
-end
+end

data/lib/barometer/weather_services/wunderground.rb

@@ -45,17 +45,17 @@ module Barometer
   # Unable to locate.
   #
   class WeatherService::Wunderground < WeatherService
-    
+
     #########################################################################
     # PRIVATE
     # If class methods could be private, the remaining methods would be.
     #
-    
+
     def self._source_name; :wunderground; end
     def self._accepted_formats
       [:zipcode, :postalcode, :icao, :coordinates, :geocode]
     end
-    
+
     # these are the icon codes that indicate "wet", used by wet? function
     def self._wet_icon_codes
       %w(flurries rain sleet snow tstorms nt_flurries nt_rain nt_sleet nt_snow nt_tstorms chancerain chancetstorms)
@@ -75,7 +75,7 @@ module Barometer
           forecast.sun = measurement.current.sun
         end
       end
-      
+
       measurement
     end
 
@@ -90,7 +90,7 @@ module Barometer
         )
       end
     end
-    
+
     def self._build_links(data)
       links = {}
       if data["credit"] && data["credit_URL"]
@@ -101,63 +101,65 @@ module Barometer
 
     def self._build_current(data, metric=true)
       raise ArgumentError unless data.is_a?(Hash)
-      
+
       current = Measurement::Result.new
-      current.updated_at = Data::LocalDateTime.parse(data['observation_time']) if data['observation_time']
+      if data['observation_time'] && data['observation_time'].match(/\d/)
+        current.updated_at = Data::LocalDateTime.parse(data['observation_time'])
+      end
       current.humidity = data['relative_humidity'].to_i
       current.icon = data['icon'] if data['icon']
-      
+
       current.temperature = Data::Temperature.new(metric)
       current.temperature << [data['temp_c'], data['temp_f']]
-      
+
       current.wind = Data::Speed.new(metric)
       current.wind.mph = data['wind_mph'].to_f
       current.wind.degrees = data['wind_degrees'].to_i
       current.wind.direction = data['wind_dir']
-      
+
       current.pressure = Data::Pressure.new(metric)
       current.pressure << [data['pressure_mb'], data['pressure_in']]
-      
+
       current.dew_point = Data::Temperature.new(metric)
       current.dew_point << [data['dewpoint_c'], data['dewpoint_f']]
-      
+
       current.heat_index = Data::Temperature.new(metric)
       current.heat_index << [data['heat_index_c'], data['heat_index_f']]
-      
+
       current.wind_chill = Data::Temperature.new(metric)
       current.wind_chill << [data['windchill_c'], data['windchill_f']]
-      
+
       current.visibility = Data::Distance.new(metric)
       current.visibility << [data['visibility_km'], data['visibility_mi']]
-      
+
       current
     end
-    
+
     def self._build_forecast(data, metric=true)
       raise ArgumentError unless data.is_a?(Hash)
       forecasts = Measurement::ResultArray.new
       # go through each forecast and create an instance
       if data && data['simpleforecast'] &&
          data['simpleforecast']['forecastday']
-         
+
         data['simpleforecast']['forecastday'].each do |forecast|
           forecast_measurement = Measurement::Result.new
           forecast_measurement.icon = forecast['icon']
           forecast_measurement.date = Date.parse(forecast['date']['pretty'])
           forecast_measurement.pop = forecast['pop'].to_i
-          
+
           forecast_measurement.high = Data::Temperature.new(metric)
           forecast_measurement.high << [forecast['high']['celsius'],forecast['high']['fahrenheit']]
-          
+
           forecast_measurement.low = Data::Temperature.new(metric)
           forecast_measurement.low << [forecast['low']['celsius'],forecast['low']['fahrenheit']]
-          
+
           forecasts << forecast_measurement
         end
       end
       forecasts
     end
-    
+
     def self._build_location(data, geo=nil)
       raise ArgumentError unless data.is_a?(Hash)
       location = Data::Location.new
@@ -173,7 +175,7 @@ module Barometer
       end
       location
     end
-    
+
     def self._build_station(data)
       raise ArgumentError unless data.is_a?(Hash)
       station = Data::Location.new
@@ -190,7 +192,7 @@ module Barometer
       end
       station
     end
-    
+
     def self._build_sun(data)
       raise ArgumentError unless data.is_a?(Hash)
       sun = nil
@@ -209,7 +211,7 @@ module Barometer
       end
       sun || Data::Sun.new
     end
-    
+
     # override default _fetch behavior
     # this service requires TWO seperate http requests (one for current
     # and one for forecasted weather) ... combine the results
@@ -220,7 +222,7 @@ module Barometer
       result << _fetch_forecast(query)
       result
     end
-    
+
     # use HTTParty to get the current weather
     #
     def self._fetch_current(query)
@@ -233,7 +235,7 @@ module Barometer
        :timeout => Barometer.timeout
        )['current_observation']
     end
-    
+
     # use HTTParty to get the forecasted weather
     #
     def self._fetch_forecast(query)
@@ -246,7 +248,7 @@ module Barometer
         :timeout => Barometer.timeout
       )['forecast']
     end
-    
+
     # since we have two sets of data, override these calls to choose the
     # right set of data
     #
@@ -257,6 +259,6 @@ module Barometer
     def self._links_result(data=nil); data[0]; end
     def self._sun_result(data=nil); data[1]; end
     def self._timezone_result(data=nil); data[1]; end
-    
+
   end
-end
+end

data/lib/barometer/weather_services/yahoo.rb

@@ -46,16 +46,16 @@ module Barometer
   # - the Yahoo! WOEID is only used by Yahoo!, and is a 32-bit number. Unfortunately
   #   this number confilcts with US Zipcodes (ie the zipcode=90210 and the
   #   WOEID=90210 cannot be destinguished and do not mean the same thing).  To
-  #   solve this, any 5 digit number will be dtected as a ZIPCODE.  To have a 
+  #   solve this, any 5 digit number will be dtected as a ZIPCODE.  To have a
   #   5 digit query be detected as a WOEID, prepend it with a 'w' (ie: w90210).
   #
   class WeatherService::Yahoo < WeatherService
-    
+
     #########################################################################
     # PRIVATE
     # If class methods could be private, the remaining methods would be.
     #
-    
+
     def self._source_name; :yahoo; end
     def self._accepted_formats; [:zipcode, :weather_id, :woe_id]; end
 
@@ -67,11 +67,11 @@ module Barometer
       codes = (29..34).to_a + [36]
       codes.collect {|c| c.to_s}
     end
-  
+
    def self._build_extra(measurement, result, metric=true)
      #raise ArgumentError unless measurement.is_a?(Data::Measurement)
      #raise ArgumentError unless query.is_a?(Barometer::Query)
-     
+
      # use todays sun data for all future days
      if measurement.forecast && measurement.current.sun
        measurement.forecast.each do |forecast|
@@ -80,14 +80,14 @@ module Barometer
      end
      measurement
    end
-   
+
     def self._build_timezone(data)
       if data && data['item'] && data['item']['pubDate']
         zone_match = data['item']['pubDate'].match(/ ([A-Z]*)$/)
         Data::Zone.new(zone_match[1]) if zone_match
       end
     end
-    
+
     def self._build_links(data)
       links = {}
       if data["title"] && data["link"]
@@ -95,29 +95,29 @@ module Barometer
       end
       links
     end
-    
+
     def self._build_current(data, metric=true)
       raise ArgumentError unless data.is_a?(Hash)
       current = Measurement::Result.new(metric)
       if data
-        if data['item'] && data['item']['yweather:condition']
-          condition_result = data['item']['yweather:condition']
+        if data['item'] && data['item']['condition']
+          condition_result = data['item']['condition']
           current.updated_at = Data::LocalDateTime.parse(condition_result['date'])
           current.icon = condition_result['code']
           current.condition = condition_result['text']
           current.temperature = Data::Temperature.new(metric)
           current.temperature << condition_result['temp']
         end
-        if data['yweather:atmosphere']
-          atmosphere_result = data['yweather:atmosphere']
+        if data['atmosphere']
+          atmosphere_result = data['atmosphere']
           current.humidity = atmosphere_result['humidity'].to_i
           current.pressure = Data::Pressure.new(metric)
           current.pressure << atmosphere_result['pressure']
           current.visibility = Data::Distance.new(metric)
           current.visibility << atmosphere_result['visibility']
         end
-        if data['yweather:wind']
-          wind_result = data['yweather:wind']
+        if data['wind']
+          wind_result = data['wind']
           current.wind = Data::Speed.new(metric)
           current.wind << wind_result['speed']
           current.wind.degrees = wind_result['degrees'].to_f
@@ -127,14 +127,14 @@ module Barometer
       end
       current
     end
-    
+
     def self._build_forecast(data, metric=true)
       raise ArgumentError unless data.is_a?(Hash)
       forecasts = Measurement::ResultArray.new
-      
-      if data && data['item'] && data['item']['yweather:forecast']
-         forecast_result = data['item']['yweather:forecast']
-         
+
+      if data && data['item'] && data['item']['forecast']
+         forecast_result = data['item']['forecast']
+
         forecast_result.each do |forecast|
           forecast_measurement = Measurement::Result.new
           forecast_measurement.icon = forecast['code']
@@ -149,7 +149,7 @@ module Barometer
       end
       forecasts
     end
-    
+
     def self._build_location(data, geo=nil)
       raise ArgumentError unless data.is_a?(Hash)
       raise ArgumentError unless (geo.nil? || geo.is_a?(Data::Geo))
@@ -163,30 +163,30 @@ module Barometer
         location.latitude = geo.latitude
         location.longitude = geo.longitude
       else
-        if data && data['yweather:location']
-          location.city = data['yweather:location']['city']
-          location.state_code = data['yweather:location']['region']
-          location.country_code = data['yweather:location']['country']
+        if data && data['location']
+          location.city = data['location']['city']
+          location.state_code = data['location']['region']
+          location.country_code = data['location']['country']
           if data['item']
-            location.latitude = data['item']['geo:lat']
-            location.longitude = data['item']['geo:long']
+            location.latitude = data['item']['lat']
+            location.longitude = data['item']['long']
           end
         end
       end
       location
     end
-    
+
     def self._build_sun(data)
       raise ArgumentError unless data.is_a?(Hash)
       sun = nil
-      if data && data['yweather:astronomy'] && data['item']
-        local_rise = Data::LocalTime.parse(data['yweather:astronomy']['sunrise'])
-        local_set = Data::LocalTime.parse(data['yweather:astronomy']['sunset'])
+      if data && data['astronomy'] && data['item']
+        local_rise = Data::LocalTime.parse(data['astronomy']['sunrise'])
+        local_set = Data::LocalTime.parse(data['astronomy']['sunset'])
         sun = Data::Sun.new(local_rise, local_set)
       end
       sun || Data::Sun.new
     end
-    
+
     # use HTTParty to get the current weather
     def self._fetch(query, metric=true)
       return unless query
@@ -196,13 +196,14 @@ module Barometer
         :w => query.format == :woe_id ? query.q : nil,
         :u => (metric ? 'c' : 'f')
       }.delete_if {|k,v| v.nil? }
-      self.get(
+      r = self.get(
         "http://weather.yahooapis.com/forecastrss",
         :query => options,
         :format => :xml,
         :timeout => Barometer.timeout
-      )['rss']['channel']
+      )
+      r['rss']['channel']
     end
-    
+
   end
-end
+end