weather_report 0.0.1 → 0.0.2

data/History.txt

@@ -2,3 +2,11 @@
 
 * 1 major enhancement:
   * Initial release
+
+== 0.0.2 2009-07-16
+	
+* 4 bug fixes
+  * Added accessors for description on observation and description, advance_days, image_url on forecasts
+  * Change Backstage url string
+  * Throw a FormatException if there is no data from the Backstage service
+  * Added simple webpage

data/README.rdoc

@@ -65,12 +65,14 @@ The full set of attributes is:
  londonWeather.observation.pressure_state
  londonWeather.observation.visibility
  londonWeather.observation.humidity
+ londonWeather.observation.description
  
  londonWeather.forecast.reading_date
  londonWeather.forecast.name 
  londonWeather.forecast.country
  londonWeather.forecast.latitude
  londonWeather.forecast.longtitude
+ londonWeather.forecast.image_url
  londonWeather.forecast.for_today.date
  londonWeather.forecast.for_today.max_temperature
  londonWeather.forecast.for_today.min_temperature
@@ -80,10 +82,12 @@ The full set of attributes is:
  londonWeather.forecast.for_today.pressure
  londonWeather.forecast.for_today.visibility
  londonWeather.forecast.for_today.humidity
+ londonWeather.forecast.for_today.description
+ londonWeather.forecast.for_today.advance_days
  
 == REQUIREMENTS:
 
-The only external dependencies are REXML and net/http which are include as part of most Ruby installations.
+The only external dependencies are REXML and net/http which are included as part of most Ruby installations.
 
 == INSTALL:
 
@@ -91,13 +95,13 @@ The weather_report library is distributed itself as a RubyGem and is available i
 
   sudo gem install weather_report
 
-Alternately, download the gem and install manually.
+Alternately, download the gem here[http://www.cordinc.com/projects/weather_report/download/weather_report-0.0.2.gem] or the tgz here[http://www.cordinc.com/projects/weather_report/download/weather_report-0.0.2.tgz] and install manually.
 
 == LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2009 FIXME full name
+Copyright (c) 2009 Charles Cordingley
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

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.1'
+  VERSION = '0.0.2'
   
   # The id is the number (1..9999) the BBC uses to identify cities for weather reports 
   attr_reader :id
@@ -53,12 +53,12 @@ class WeatherReport
   
   # The url for getting current weather observations from BBC Backstage
   def observation_url() 
-    "http://news.bbc.co.uk/weather/forecast/#{@id}/ObservationsRSS.rss"
+    "http://newsrss.bbc.co.uk/weather/forecast/#{@id}/ObservationsRSS.xml"
   end
     
   # The url for getting weather forecasts from BBC Backstage
   def forecast_url() 
-    "http://news.bbc.co.uk/weather/forecast/#{@id}/Next3DaysRSS.rss"
+    "http://newsrss.bbc.co.uk/weather/forecast/#{@id}/Next3DaysRSS.xml"
   end
   
 end
@@ -90,7 +90,7 @@ class WeatherReportObservation
   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
+  attr_reader :temperature, :wind_direction, :wind_speed, :visibility, :pressure, :pressure_state, :humidity, :reading_date, :description
 
   # Constructs the weather observation from an XML string or file containing the XML in BBC Backstage weather format
   def initialize(document)
@@ -103,7 +103,9 @@ class WeatherReportObservation
       @description = md[3]
     }
       
+    hasDesc = false
     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]
@@ -113,6 +115,7 @@ class WeatherReportObservation
       @pressure_state = md[8]
       @visibility = md[9]
     }
+    raise WeatherReport::FormatError unless hasDesc
     
     rescue
       raise WeatherReport::FormatError
@@ -124,7 +127,7 @@ end
 class WeatherReportForecasts < Array
   include Location
   
-  attr_reader :reading_date
+  attr_reader :reading_date, :image_url
   
   # Constructs the weather forecasts from an XML string or file containing the XML in BBC Backstage weather format
   def initialize(document)
@@ -137,6 +140,8 @@ class WeatherReportForecasts < Array
       self << WeatherReportForecast.new(element)
     }
     
+    raise WeatherReport::FormatError if length == 0
+    
     rescue
       raise WeatherReport::FormatError
   end
@@ -178,16 +183,16 @@ class WeatherReportForecasts < Array
     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
 
-    attr_reader :max_temperature, :min_temperature, :wind_direction, :wind_speed, :visibility, :pressure, :humidity, :date
+    attr_reader :max_temperature, :min_temperature, :wind_direction, :wind_speed, :visibility, :pressure, :humidity, :date, :description, :advance_days
 
     # Constructs the single day forecast from an REXML element containing the forecast in BBC Backstage weather format
     def initialize(item)
       item.elements.each("title[1]") { |element| 
         md = SUMMARY.match(element.text)
         @description = md[2]
-        diff = day_diff(md[1])
-        raise(WeatherReport::FormatError, "WeatherReport Error: Day mismatch.") if diff.nil?
-        @date = Date.today+diff 
+        @advance_days = day_diff(md[1])
+        raise(WeatherReport::FormatError, "WeatherReport Error: Day mismatch.") if @advance_days.nil?
+        @date = Date.today+@advance_days 
       }
         
       item.elements.each("description[1]") { |element| 

data/test/test_weather_report.rb

@@ -51,6 +51,14 @@ class TestWeatherReport < Test::Unit::TestCase
     assert_raise(WeatherReport::FormatError) { WeatherReportForecasts.new(File.read(File.dirname(__FILE__) + '/error.rss'))}
   end
   
+  def test_moved_forecast
+    assert_raise(WeatherReport::FormatError) { WeatherReportForecasts.new(File.read(File.dirname(__FILE__) + '/moved.rss'))}
+  end
+  
+  def test_moved_observation
+    assert_raise(WeatherReport::FormatError) { WeatherReportObservation.new(File.read(File.dirname(__FILE__) + '/moved.rss'))}
+  end
+  
   def test_current_forecast
     doc = File.read(File.dirname(__FILE__) + '/BBC_Next3DaysRSS.rss')
     doc = doc.gsub("<TODAY>", Date::DAYNAMES[Date.today.wday]).gsub("<TOMORROW>", Date::DAYNAMES[(Date.today+1).wday]).gsub("<DAY_AFTER_TOMORROW>", Date::DAYNAMES[(Date.today+2).wday])

metadata

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