national-rail 0.4.10 → 0.4.11

data/lib/national-rail.rb

@@ -1,3 +1,4 @@
+require 'national-rail/version'
 require 'national-rail/journey_planner'
 require 'national-rail/live_departure_boards'
 require 'national-rail/station_list'

data/lib/national-rail/version.rb

@@ -0,0 +1,3 @@
+module NationalRail
+  VERSION = "0.4.11".freeze
+end

data/lib/national-rail/virgin_live_departure_boards.rb

@@ -98,21 +98,32 @@ module NationalRail
       @agent.get("http://realtime.nationalrail.co.uk/virgintrains/#{filename}") do |page|
         VirginLiveDepartureBoards.capture(page, filename)
         encoding = 'UTF-8'
-        summary_rows = ((page.doc/"table#TrainTable tbody tr")[2..-1] || []).map do |tr|
+        tbody = page.doc/"table#TrainTable tbody"
+        columns = (((tbody/"tr")[1])/"th").map { |th| th.inner_text.gsub(/\s+/, ' ') }
+        summary_rows = []
+        ((tbody/"tr")[2..-1] || []).each do |tr|
           tds = tr/"td"
-          details_href = (tds[0]/"a").first["href"]
+          from = tds[columns.index("From")]
+          if from.inner_text.match(/circular route/i)
+            summary_rows.last.attributes[:circular_route] = true if summary_rows.any?
+            next
+          end
+          details_href = (from/"a").first["href"]
           details_link = page.links.detect { |l| l.attributes["href"] == details_href }
-          SummaryRow.new(@agent, details_link, {
-            :from => (tds[0]/"a").inner_text.gsub(/\s+/, ' '),
-            :timetabled_arrival => time_parser.parse(cell_text(tds[1])),
-            :expected_arrival => time_parser.parse(cell_text(tds[2])),
-            :platform => parse_integer(cell_text(tds[3])),
-            :to => (tds[4]/"a").inner_text.gsub(/\s+/, ' '),
-            :timetabled_departure => time_parser.parse(cell_text(tds[5])),
-            :expected_departure => time_parser.parse(cell_text(tds[6])),
-            :operator => (tds[7]/"a").inner_text.gsub(/\s+/, ' '),
+          attributes = {
+            :from => (tds[columns.index("From")]/"a").inner_text.gsub(/\s+/, ' '),
+            :timetabled_arrival => time_parser.parse(cell_text(tds[columns.index("Timetabled Arrival")])),
+            :expected_arrival => time_parser.parse(cell_text(tds[columns.index("Expected Arrival")])),
+            :to => (tds[columns.index("To")]/"a").inner_text.gsub(/\s+/, ' '),
+            :timetabled_departure => time_parser.parse(cell_text(tds[columns.index("Timetabled Departure")])),
+            :expected_departure => time_parser.parse(cell_text(tds[columns.index("Expected Departure")])),
+            :operator => (tds[columns.index("Operator")]/"a").inner_text.gsub(/\s+/, ' '),
             :details_url => "http://realtime.nationalrail.co.uk/virgintrains/#{details_href}"
-          })
+          }
+          if platform_index = columns.index("Platform")
+            attributes[:platform] = parse_integer(cell_text(tds[platform_index]))
+          end
+          summary_rows << SummaryRow.new(@agent, details_link, attributes)
         end
       end
       summary_rows

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: national-rail
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 4
-  - 10
-  version: 0.4.10
+  - 11
+  version: 0.4.11
 platform: ruby
 authors: 
 - James Mead
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 +01:00
+date: 2011-04-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -209,6 +209,7 @@ files:
 - lib/national-rail/live_departure_boards.rb
 - lib/national-rail/station_list.rb
 - lib/national-rail/stations.kml
+- lib/national-rail/version.rb
 - lib/national-rail/virgin_live_departure_boards.rb
 - lib/national-rail/virgin_live_departure_boards/details_page_parser.rb
 has_rdoc: true