weather_report 0.0.3 → 0.0.4

data/History.txt

@@ -14,4 +14,9 @@
 == 0.0.3 2009-07-18
 
 * 1 bug fix
-  * Modify namespace to avoid clashes
+  * Modify namespace to avoid clashes
+  
+== 0.0.4 2009-07-19
+
+* 1 bug fix
+  * Use more inclusive Backstage feed

data/lib/weather_report.rb

@@ -7,7 +7,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 # Class containing weather observations and forecasts for the location specified by id in the constructor.
 class WeatherReport
   
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
   
   # The id is the number (1..9999) the BBC uses to identify cities for weather reports 
   attr_reader :id
@@ -53,12 +53,14 @@ class WeatherReport
   
   # The url for getting current weather observations from BBC Backstage
   def observation_url() 
-    "http://newsrss.bbc.co.uk/weather/forecast/#{@id}/ObservationsRSS.xml"
+    "http://feeds.bbc.co.uk/weather/feeds/rss/obs/world/#{@id}.xml"
+    #"http://newsrss.bbc.co.uk/weather/forecast/#{@id}/ObservationsRSS.xml"
   end
     
   # The url for getting weather forecasts from BBC Backstage
   def forecast_url() 
-    "http://newsrss.bbc.co.uk/weather/forecast/#{@id}/Next3DaysRSS.xml"
+    "http://feeds.bbc.co.uk/weather/feeds/rss/5day/world/#{@id}.xml"
+    #"http://newsrss.bbc.co.uk/weather/forecast/#{@id}/Next3DaysRSS.xml"
   end
   
 end
@@ -87,7 +89,7 @@ end
 class WeatherReportObservation
   include WeatherReportLocation
 
-  DESCRIPTION = /Temperature: ([-\d\.]+|N\/A|NA|\(none\))(.+)Wind Direction: ([\w -\/\(\)]*), Wind Speed: ([-\d\.]+|N\/A|NA|\(none\))mph, Relative Humidity: ([\d\.]+|N\/A|NA|\(none\))(.*), Pressure: ([\d\.]+|N\/A|NA|\(none\))mB, ([\w -\/]+), Visibility: ([\w -\/]+)/
+  DESCRIPTION = /(.*)Temperature: ([-\d\.]+|N\/A|NA|\(none\))(.+)Wind Direction: ([\w -\/\(\)]*), Wind Speed: ([-\d\.]+|N\/A|NA|\(none\))([ ]*)mph, Relative Humidity: ([\d\.]+|N\/A|NA|\(none\))(.*), Pressure: ([\d\.]+|N\/A|NA|\(none\))mB, ([\w -\/]+), Visibility: ([\w -\/]+)/
   SUMMARY = /(.+):(\W+)([\w -\/\(\)]+). (.+)/m
   
   attr_reader :temperature, :wind_direction, :wind_speed, :visibility, :pressure, :pressure_state, :humidity, :reading_date, :description
@@ -107,13 +109,13 @@ class WeatherReportObservation
     doc.elements.each("rss/channel/item[1]/description[1]") { |element| 
       hasDesc = true
       md = DESCRIPTION.match(element.text)
-      @temperature = md[1].to_f
-      @wind_direction = md[3]
-      @wind_speed = md[4].to_f * 1.61
-      @humidity = md[5].to_f
-      @pressure = md[7].to_f
-      @pressure_state = md[8]
-      @visibility = md[9]
+      @temperature = md[2].to_f
+      @wind_direction = md[4]
+      @wind_speed = md[5].to_f * 1.61
+      @humidity = md[7].to_f
+      @pressure = md[9].to_f
+      @pressure_state = md[10]
+      @visibility = md[11]
     }
     raise WeatherReport::WeatherReportFormatError unless hasDesc
     
@@ -181,7 +183,7 @@ class WeatherReportForecasts < Array
   class WeatherReportForecast 
     
     SUMMARY = /([\w -\/]+): ([\w -]+|N\/A|NA|\(none\)), Max Temp: (.*)/m
-    DESCRIPTION = /Max Temp: ([-\d\.]+|N\/A|NA|\(none\))(.+)Min Temp: ([-\d\.]+|N\/A|NA|\(none\))(.+)Wind Direction: ([\w -\/\(\)]*), Wind Speed: ([-\d\.]+|N\/A|NA|\(none\))mph, Visibility: ([\w -\/]+), Pressure: ([\d\.]+|N\/A|NA|\(none\))mB, Humidity: ([\d\.]+|N\/A|NA|\(none\))(.*), (.+)/m
+    DESCRIPTION = /Max Temp: ([-\d\.]+|N\/A|NA|\(none\))(.+)Min Temp: ([-\d\.]+|N\/A|NA|\(none\))(.+)Wind Direction: ([\w -\/\(\)]*), Wind Speed: ([-\d\.]+|N\/A|NA|\(none\))mph, Visibility: ([\w -\/]+), Pressure: ([\d\.]+|N\/A|NA|\(none\))m([bB]), Humidity: ([\d\.]+|N\/A|NA|\(none\))(.*), (.+)/m
 
     attr_reader :max_temperature, :min_temperature, :wind_direction, :wind_speed, :visibility, :pressure, :humidity, :date, :description, :advance_days
 
@@ -203,7 +205,7 @@ class WeatherReportForecasts < Array
         @wind_speed = md[6].to_f * 1.61
         @visibility = md[7]
         @pressure = md[8].to_f
-        @humidity = md[9].to_f
+        @humidity = md[10].to_f
       }
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: weather_report
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Charles Cordingley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-18 00:00:00 +01:00
+date: 2009-07-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency